Format and format

3 files changed, 47 insertions, 40 deletions

diff --git a/home-modules/apps/desktop/default.nix b/home-modules/apps/desktop/default.nix
index a732ded..5472dad 100644
--- a/home-modules/apps/desktop/default.nix
+++ b/home-modules/apps/desktop/default.nix
@@ -67,14 +67,17 @@ in
         ];
       })
       (lib.mkIf cfg.note-taking.enable {
-        home.packages = with pkgs; [ 
-          obsidian 
-          kdePackages.kdepim-runtime
-          ] ++ (with pkgs.kdePackages; [ 
-          zanshin 
-          kdepim-runtime 
-          akonadi-calendar
-        ]);
+        home.packages =
+          with pkgs;
+          [
+            obsidian
+            kdePackages.kdepim-runtime
+          ]
+          ++ (with pkgs.kdePackages; [
+            zanshin
+            kdepim-runtime
+            akonadi-calendar
+          ]);
         # Todo force synthing to be on here
       })
       (lib.mkIf cfg.art.enable {
diff --git a/home-modules/desktop/hyprland.nix b/home-modules/desktop/hyprland.nix
index 442910e..3a5864a 100644
--- a/home-modules/desktop/hyprland.nix
+++ b/home-modules/desktop/hyprland.nix
@@ -22,7 +22,7 @@ with lib;
 
     homeprogs.waybar.enable = true;
     homeprogs.mako.enable = true;
-    homeprogs.mako.systemdWantedBy = [ "hyprland-session.target" ]; 
+    homeprogs.mako.systemdWantedBy = [ "hyprland-session.target" ];
     # Environment variables for hyprland.
     # This can be used to configure wayland/hyprland-specific things
     home.file.".config/uwsm/env-hyprland".text = ''
@@ -254,7 +254,7 @@ with lib;
     };
 
     systemd.user.services.hyprpaper = {
-      Install.WantedBy = [ "hyprland-session.target"];
+      Install.WantedBy = lib.mkForce [ "hyprland-session.target" ];
     };
     services.hyprpaper = {
       enable = true;
@@ -305,33 +305,36 @@ with lib;
     };
     services.hyprsunset = {
       enable = true;
-      systemdTarget = "hyprland-session.target"; 
+      systemdTarget = "hyprland-session.target";
       settings = {
         max-gamma = 140;
         profile = [
-          { # Morning 
+          {
+            # Morning
             time = "07:00";
-            identity = true; 
+            identity = true;
             # temperature = 6500;
             gamme = 1;
           }
-          { # Evening 
+          {
+            # Evening
             time = "19:00";
-            temperature = 4000; 
+            temperature = 4000;
             gamma = 0.6;
           }
-          { # Night 
+          {
+            # Night
             time = "22:00";
-            temperature = 3000; 
+            temperature = 3000;
             gamma = 0.4;
           }
         ];
       };
     };
 
-    services.hypridle = { 
+    services.hypridle = {
       enable = true;
-      systemdTarget = "hyprland-session.target"; 
+      systemdTarget = "hyprland-session.target";
       settings = {
         general = {
           lock_cmd = "pidof hyprlock || hyprlock";
diff --git a/home-modules/desktop/wayland/mako.nix b/home-modules/desktop/wayland/mako.nix
index 9b13e77..99987db 100644
--- a/home-modules/desktop/wayland/mako.nix
+++ b/home-modules/desktop/wayland/mako.nix
@@ -1,47 +1,48 @@
 {
-  pkgs, 
+  pkgs,
   config,
   lib,
   ...
 }:
 let
-   cfg = config.homeprogs.mako; 
-in 
+  cfg = config.homeprogs.mako;
+in
 {
-  options.homeprogs.mako = { 
+  options.homeprogs.mako = {
     enable = lib.mkEnableOption "Enable Mako notification manager";
     systemdWantedBy = lib.mkOption {
       description = "SystemD targets where mako should start for.";
-      default = [ "graphical-session.target"]; 
-      example = [ "hyprland-session.target" ]; 
-      type = lib.types.listOf lib.types.str; 
-    };  
+      # TODO: Put a null here, so that we can add a non-persistent default
+      default = [ ];
+      example = [ "hyprland-session.target" ];
+      type = lib.types.listOf lib.types.str;
+    };
     package = lib.mkOption {
       description = "mako package to use";
-      default = pkgs.mako; 
-      example = pkgs.mako; 
-      type = lib.types.package; 
+      default = pkgs.mako;
+      example = pkgs.mako;
+      type = lib.types.package;
     };
-  }; 
+  };
   config = lib.mkIf config.homeprogs.mako.enable ({
-    home.packages = [ pkgs.mako ]; 
-    xdg.configFile."mako/config" = { 
+    home.packages = [ pkgs.mako ];
+    xdg.configFile."mako/config" = {
       onChange = "${pkgs.mako}/bin/makoctl reload || true";
       source = ./mako.ini;
     };
-     systemd.user.services.mako = {
+    systemd.user.services.mako = {
       Install.WantedBy = config.homeprogs.mako.systemdWantedBy;
       Unit = {
         Description = "Lightweight Wayland notification daemon";
-        Documentation="man:mako(1)"; 
-        After= "graphical-session.target";
-      } ;
+        Documentation = "man:mako(1)";
+        After = "graphical-session.target";
+      };
       Service = {
         Type = "dbus";
         BusName = "org.freedesktop.Notifications";
-        ExecCondition="/bin/sh -c '[ -n \"$WAYLAND_DISPLAY\" ]'";
-        ExecStart="${cfg.package}/bin/mako";
-        ExecReload="${cfg.package}/bin/makoctl reload"; 
+        ExecCondition = "/bin/sh -c '[ -n \"$WAYLAND_DISPLAY\" ]'";
+        ExecStart = "${cfg.package}/bin/mako";
+        ExecReload = "${cfg.package}/bin/makoctl reload";
       };
     };
   });