♻️💄 Cleanup and Theme updates

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743217966,
+        "lastModified": 1744375180,
-        "narHash": "sha256-S9Q/Pl0U/kdwz8LBt1JjE1Qay3CY0pk1gHHvRosWlUI=",
+        "narHash": "sha256-s2FmOufSMIz6H0UrGOHJ7RrQfqvhCjUIvk54J8LlZFA=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "c41c89f69fcdc8bd78bbc95123eef280575f1df8",
+        "rev": "75c26f52a685291fedfd3a9c93f5cbe80a5d3321",
         "type": "github"
       },
       "original": {
@@ -131,11 +131,11 @@
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1743191728,
+        "lastModified": 1744328787,
-        "narHash": "sha256-LrQd2IkfcmHdBh+pwPEPXzcosBerIEFzz/DbVNzBqig=",
+        "narHash": "sha256-VFOTTlWGZ9GWGGrz6F6ihXrsmm5IiGEKCmgfpM9+Y4E=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "1067cd3d8a061eb5b23bc1a4c46ca10af4481941",
+        "rev": "b16324ef0be8c5eeef4c0eb23b9972fdb2fa50d5",
         "type": "github"
       },
       "original": {
@@ -146,11 +146,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1743167577,
+        "lastModified": 1744366945,
-        "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=",
+        "narHash": "sha256-OuLhysErPHl53BBifhesrRumJNhrlSgQDfYOTXfgIMg=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42",
+        "rev": "1fe3cc2bc5d2dc9c81cb4e63d2f67c1543340df1",
         "type": "github"
       },
       "original": {
@@ -167,11 +167,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743267068,
+        "lastModified": 1744377435,
-        "narHash": "sha256-G7866vbO5jgqMcYJzgbxej40O6mBGQMGt6gM0himjoA=",
+        "narHash": "sha256-zT3zbkZjeKsjMktV7MAdruXQWpzpM7iVWHuhknYOuwY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b431496538b0e294fbe44a1441b24ae8195c63f0",
+        "rev": "6bccb54a4f98408f22d2e45921bb401f393f2174",
         "type": "github"
       },
       "original": {
@@ -199,18 +199,16 @@
     "nixcord": {
       "inputs": {
         "flake-compat": "flake-compat_2",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs",
-          "nixpkgs"
-        ],
         "systems": "systems_2",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1743170370,
+        "lastModified": 1744308772,
-        "narHash": "sha256-v8ZdXs0fj0LG2jH0NJvfeMt0b+qJYxbN+fnto4kqdyM=",
+        "narHash": "sha256-gUOclfwgw/bSo3VMNmHrNXzIpaOgh1Yq9a3D3Dj/wgM=",
         "owner": "kaylorben",
         "repo": "nixcord",
-        "rev": "b969aa7b1e1925935eda22da01ffbf028c7c2a51",
+        "rev": "76c3b99646d12437ec7183939eca911549e4d18f",
         "type": "github"
       },
       "original": {
@@ -221,15 +219,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1743076231,
+        "lastModified": 1742800061,
-        "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=",
+        "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6c5963357f3c1c840201eda129a99d455074db04",
+        "rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
         "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -267,6 +265,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1744868846,
+        "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "catppuccin": "catppuccin",
@@ -275,7 +289,7 @@
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
         "nixcord": "nixcord",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "snowfall-lib": "snowfall-lib",
         "sops-nix": "sops-nix"
       }
@@ -309,11 +323,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742700801,
+        "lastModified": 1744103455,
-        "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=",
+        "narHash": "sha256-SR6+qjkPjGQG+8eM4dCcVtss8r9bre/LAxFMPJpaZeU=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852",
+        "rev": "69d5a5a4635c27dae5a742f36108beccc506c1ba",
         "type": "github"
       },
       "original": {
@@ -436,8 +450,8 @@
       },
       "original": {
         "owner": "jcollie",
-        "ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
         "repo": "zon2nix",
+        "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
         "type": "github"
       }
     }

flake.nix

@@ -40,7 +40,6 @@
 
     nixcord = {
       url = "github:kaylorben/nixcord";
-      inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
@@ -86,7 +85,7 @@
       # Apply some home-manager modules globally.
       homes.modules = with inputs; [
         nix-flatpak.homeManagerModules.nix-flatpak
-        catppuccin.homeManagerModules.catppuccin
+        catppuccin.homeModules.catppuccin
         sops-nix.homeManagerModules.sops
       ];
     };

homes/x86_64-linux/jo@puzzlevision/default.nix

@@ -1,6 +1,5 @@
 {
   pkgs,
-  lib,
   inputs,
   ...
 }: {
@@ -13,13 +12,9 @@
       gtk.enable = true;
     };
 
-    apps.nushell.enable = false;
-    apps.vscodium.enable = true;
     apps.zed.enable = true;
   };
 
-  home.file."~/.local/share/fonts/Unknown\ Vendor/qwerasd205/AnnotationMono/AnnotationMono-VF.ttf".source = lib.snowfall.fs.get-file "resources/fonts/AnnotationMono/variable/AnnotationMono-VF.ttf";
-
   home.file."~/.config/Yubico/u2f_keys".text = ''
     jo:gtKwCQKVw5O4IkWg8J8o7vHIo3hStmOqVcnmk97E335DwHnPUMIDTMnD46qEn/1tucTZlYfGABfzVVG+iYeUOA==,fVRFZb9iBiqjOXvk5Gm9ygO/O4huEUR1Uq3DGBlnS1RtqqK0shif8aOlNLkmn8Xe9+x4HYIeNEX4fc8Z7Y2Hgw==,es256,+presence
   '';
@@ -28,15 +23,6 @@
     age.keyFile = "/home/jo/sops-nix/key.txt";
   };
 
-  # Flatpak configuration.
-  services.flatpak = {
-    enable = true;
-    update.auto.enable = true;
-    uninstallUnmanaged = true;
-
-    packages = [];
-  };
-
   programs = {
     # TODO: look at git-sync for syncing stuff like obsidian vaults.
     git-credential-oauth.enable = true;
@@ -55,10 +41,7 @@
   # Declare user packages.
   home.packages = with pkgs; [
     ### General
-    qflipper
-    labymod-launcher
     steam
-    youtube-music
     ungoogled-chromium
     firefox
 
@@ -69,10 +52,9 @@
     git
     bun
     devenv
-    python39
     nixd
-    bruno
     deno
+    nh
 
     ### Work
     teams-for-linux
@@ -80,10 +62,7 @@
 
     ### Notes & Organisation
     obsidian
-
-    ### Virtual Reality
-    sidequest
   ];
 
-  home.stateVersion = "24.05";
+  home.stateVersion = "25.05";
 }

modules/home/desktop/gnome/default.nix

@@ -42,7 +42,7 @@ in {
         enable-blur = mkOpt bool false "Whether to enable blur-my-shell application blur.";
       };
     };
-    wallpaper = mkOpt str (builtins.toString ./wallpapers/retro/snowy-map.png) "Specify the path of your prefered Gnome wallpaper.";
+    wallpaper = mkOpt str (builtins.toString ./wallpapers/mountain_tower_sunset.jpg) "Specify the path of your prefered Gnome wallpaper.";
   };
 
   config = mkIf osConfig.${namespace}.desktop.gnome.enable {

modules/home/themes/catppuccin/gnome/default.nix

@@ -26,9 +26,9 @@
       @define-color error_color ${config.palette.red.hex};
       @define-color error_bg_color ${config.palette.red.hex};
       @define-color error_fg_color ${config.palette.base.hex};
-      @define-color window_bg_color ${config.palette.base.hex};
+      @define-color window_bg_color ${config.palette.mantle.hex};
       @define-color window_fg_color ${config.palette.text.hex};
-      @define-color view_bg_color ${config.palette.base.hex};
+      @define-color view_bg_color ${config.palette.mantle.hex};
       @define-color view_fg_color ${config.palette.text.hex};
       @define-color headerbar_bg_color ${config.palette.mantle.hex};
       @define-color headerbar_fg_color ${config.palette.text.hex};
@@ -36,7 +36,7 @@
       @define-color headerbar_backdrop_color @window_bg_color;
       @define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
       @define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
-      @define-color sidebar_bg_color ${config.palette.mantle.hex};
+      @define-color sidebar_bg_color ${config.palette.base.hex};
       @define-color sidebar_fg_color ${config.palette.text.hex};
       @define-color sidebar_backdrop_color @window_bg_color;
       @define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
@@ -44,7 +44,7 @@
       @define-color secondary_sidebar_fg_color @sidebar_fg_color;
       @define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
       @define-color secondary_sidebar_shade_color @sidebar_shade_color;
-      @define-color card_bg_color ${config.palette.mantle.hex};
+      @define-color card_bg_color ${config.palette.base.hex};
       @define-color card_fg_color ${config.palette.text.hex};
       @define-color card_shade_color rgba(0, 0, 0, 0.07);
       @define-color dialog_bg_color ${config.palette.mantle.hex};

systems/x86_64-linux/puzzlevision/default.nix

@@ -12,6 +12,9 @@
     inputs.hardware.nixosModules.common-pc-laptop-ssd
   ];
 
+  # Configure SWAP
+  swapDevices = [{ device = "/swapfile"; size = 8 * 1024; }]; # 8 GB swap partition
+
   # Configure Sops
   sops.defaultSopsFile = lib.snowfall.fs.get-file "secrets/default.yaml";
   sops.age.keyFile = "/var/lib/sops-nix/key.txt"; # The main AGE key is expected in this location, it is only needed for this system.
@@ -63,15 +66,10 @@
   # Set trusted users (Primarily used for cachix)
   nix.settings.trusted-users = ["root" "jo"];
 
-  # Configure additional groups
-  users.groups.www-data = {
-    gid = 33;
-  };
-
   # Configure users.
   snowfallorg.users.jo.admin = true;
   users.users.jo.isNormalUser = true;
-  users.users.jo.extraGroups = ["dialout" "docker" "www-data"];
+  users.users.jo.extraGroups = ["dialout" "docker"];
   users.users.jo.hashedPasswordFile = config.sops.secrets."user/jo/password_hash".path;
 
   # Configure home-manager
@@ -91,5 +89,5 @@
     gnupg
   ];
 
-  system.stateVersion = "23.05";
+  system.stateVersion = "25.05";
 }