Format and format

13 files changed, 87 insertions, 78 deletions

diff --git a/flake.lock b/flake.lock
index a155bf4..8c8a7e6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -40,11 +40,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767702900,
-        "narHash": "sha256-xMzHmNytl7JgFRov2jHf2GYsLVp/sAfYO0JvbZt0uDo=",
+        "lastModified": 1769289524,
+        "narHash": "sha256-6Cwtvzrw79cOk1lCzN2aKSVrpgSOSQoYhyMmhXXZjTA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "38e187fd2f9efac197e03be0c25f3ee215974144",
+        "rev": "2539eba97a6df237d75617c25cd2dbef92df3d5b",
         "type": "github"
       },
       "original": {
@@ -55,11 +55,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1767640445,
-        "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=",
+        "lastModified": 1769170682,
+        "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5",
+        "rev": "c5296fdd05cfa2c187990dd909864da9658df755",
         "type": "github"
       },
       "original": {
@@ -71,11 +71,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1767051569,
-        "narHash": "sha256-0MnuWoN+n1UYaGBIpqpPs9I9ZHW4kynits4mrnh1Pk4=",
+        "lastModified": 1767313136,
+        "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "40ee5e1944bebdd128f9fbada44faefddfde29bd",
+        "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
         "type": "github"
       },
       "original": {
@@ -102,11 +102,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767499857,
-        "narHash": "sha256-0zUU/PW09d6oBaR8x8vMHcAhg1MOvo3CwoXgHijzzNE=",
+        "lastModified": 1769314333,
+        "narHash": "sha256-+Uvq9h2eGsbhacXpuS7irYO7fFlz514nrhPCSTkASlw=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "ecc41505948ec2ab0325f14c9862a4329c2b4190",
+        "rev": "2eb9eed7ef48908e0f02985919f7eb9d33fa758f",
         "type": "github"
       },
       "original": {
@@ -160,11 +160,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767468822,
-        "narHash": "sha256-MpffQxHxmjVKMiQd0Tg2IM/bSjjdQAM+NDcX6yxj7rE=",
+        "lastModified": 1769353635,
+        "narHash": "sha256-J0G1ACrUK29M0THPAsz429eZX07GmR9Bs/b0pB3N0dQ=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "d56486eb9493ad9c4777c65932618e9c2d0468fc",
+        "rev": "f46bb205f239b415309f58166f8df6919fa88377",
         "type": "github"
       },
       "original": {
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";
       };
     };
   });
diff --git a/hosts/apocalypse/default.nix b/hosts/apocalypse/default.nix
index 8149611..b2eddc4 100644
--- a/hosts/apocalypse/default.nix
+++ b/hosts/apocalypse/default.nix
@@ -14,7 +14,7 @@
   addons = {
     desktop.hyprland.enable = true;
     desktop.xfce.enable = true;
-    desktop.cosmic.enable = true; 
+    desktop.cosmic.enable = true;
     steam.enable = true;
 
     virtualisation.guest = false;
diff --git a/hosts/apocalypse/firewall.nix b/hosts/apocalypse/firewall.nix
index 05feacf..df99c8d 100644
--- a/hosts/apocalypse/firewall.nix
+++ b/hosts/apocalypse/firewall.nix
@@ -44,7 +44,7 @@ in
 {
   networking.nftables.enable = true;
   networking.firewall = {
-    enable = true;
+    enable = false;
     checkReversePath = false;
     allowedTCPPorts = baseTCP;
     allowedUDPPorts = baseUDP;
diff --git a/hosts/apocalypse/hardware-configuration.nix b/hosts/apocalypse/hardware-configuration.nix
index a644cd9..d007508 100644
--- a/hosts/apocalypse/hardware-configuration.nix
+++ b/hosts/apocalypse/hardware-configuration.nix
@@ -144,7 +144,7 @@
 
   # Copied from nix wiki to save on battery life.
   services.tlp = {
-     enable = false;
+    enable = false;
   };
   #   settings = {
   #     CPU_SCALING_GOVERNOR_ON_AC = "performance";
diff --git a/modules/default.nix b/modules/default.nix
index 774b40d..9ded08a 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -60,9 +60,9 @@
   #   options = "--delete-older-than 30d";
   # };
   zramSwap = {
-    enable = true; 
+    enable = true;
     algorithm = "lz4";
-    memoryPercent = 50; 
+    memoryPercent = 50;
   };
   systemd.services.nix-daemon.serviceConfig = {
     MemoryAccounting = true;
diff --git a/modules/desktop/akonadi.nix b/modules/desktop/akonadi.nix
index 93006b2..d97f859 100644
--- a/modules/desktop/akonadi.nix
+++ b/modules/desktop/akonadi.nix
@@ -1,8 +1,9 @@
-{pkgs, config, ...}: {
+{ ... }:
+{
   programs.kde-pim = {
-    enable = true; 
-    kmail = false; 
-    merkuro = false; 
-    kontact = false; 
-  }; 
+    enable = true;
+    kmail = false;
+    merkuro = false;
+    kontact = false;
+  };
 }
diff --git a/modules/desktop/wayland.nix b/modules/desktop/wayland.nix
index 457a7f0..0a6a0e5 100644
--- a/modules/desktop/wayland.nix
+++ b/modules/desktop/wayland.nix
@@ -1,5 +1,4 @@
 {
-  pkgs,
   lib,
   config,
   ...
diff --git a/modules/desktop/wms/cosmic.nix b/modules/desktop/wms/cosmic.nix
index 6f7c29e..d2929f1 100644
--- a/modules/desktop/wms/cosmic.nix
+++ b/modules/desktop/wms/cosmic.nix
@@ -1,18 +1,20 @@
-{pkgs, config, lib, ... }: let 
-  cfg = config.addons.desktop.cosmic; 
-in {
+{ config, lib, ... }:
+let
+  cfg = config.addons.desktop.cosmic;
+in
+{
   options.addons.desktop.cosmic = {
-    enable = lib.mkEnableOption "Enable Cosmic WM"; 
+    enable = lib.mkEnableOption "Enable Cosmic WM";
     enableScheduler = lib.mkEnableOption "Enable the special scheduler from system76";
-  }; 
+  };
 
   config = lib.mkIf cfg.enable (
     lib.mkMerge [
       (import ../../../utils/makeWm.nix "Cosmic WM" "wayland")
       {
-        services.desktopManager.cosmic.enable = true; 
-        services.system76-scheduler.enable = cfg.enableScheduler; 
+        services.desktopManager.cosmic.enable = true;
+        services.system76-scheduler.enable = cfg.enableScheduler;
       }
     ]
-  ); 
+  );
 }
diff --git a/overlays/stable_overrides.nix b/overlays/stable_overrides.nix
index f32cae2..ed1f6fe 100644
--- a/overlays/stable_overrides.nix
+++ b/overlays/stable_overrides.nix
@@ -1,4 +1,4 @@
-{ nixpkgs-stable, ... }:
-(_final: prev: {
+{ ... }:
+(_final: _prev: {
 
 })
diff --git a/users/user-common.nix b/users/user-common.nix
index b9f246f..b021a12 100644
--- a/users/user-common.nix
+++ b/users/user-common.nix
@@ -7,7 +7,7 @@
   # Pass host config to HM (Common config)
   # TODO: Move this somewhere else.
   home-manager = {
-    useUserPackages = true;
+    #useUserPackages = true;
     useGlobalPkgs = true;
     backupFileExtension = "bak";