flake.in.nix

@@ -22,6 +22,7 @@
   in {
     agenix = mkInput "ryantm/agenix";
     catppuccin = mkInput "catppuccin/nix";
+
     chaotic = mkInput "chaotic-cx/nyx/nyxpkgs-unstable";
     emacs = mkCustomUrl "git+https://git.pupbrained.xyz/pupbrained/nixmacs.git";
     hyprland = mkWithSubmodules "https://github.com/hyprwm/Hyprland";
@@ -32,8 +33,6 @@
     nix-super = mkCustomUrl "git+https://git.privatevoid.net/max/nix-super.git";
     nixvim = mkInput "pupbrained/nvim-config";
     treefmt-nix = mkInput "numtide/treefmt-nix";
-    xmonad-contrib = mkInput "xmonad/xmonad-contrib";
-    zen-browser = mkInput "fufexan/zen-browser-flake";
 
     cosmic = mkFollowingNixpkgs "lilyinstarlight/nixos-cosmic";
     darwin = mkFollowingNixpkgs "LnL7/nix-darwin/master";
@@ -62,15 +61,13 @@
           home-manager.useGlobalPkgs = true;
         };
 
-        systems.modules.nixos =
+        systems.modules.nixos = [
-          [
           agenix.nixosModules.default
           catppuccin.nixosModules.catppuccin
           chaotic.nixosModules.default
           cosmic.nixosModules.default
           impermanence.nixosModules.impermanence
-          ]
+        ];
-          ++ xmonad-contrib.nixosModules;
 
         systems.modules.darwin = [
           "${home-manager}/nix-darwin"

flake.lock

@@ -41,11 +41,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727261104,
+        "lastModified": 1726665257,
-        "narHash": "sha256-rxDI7WrxIRV9it9mDCHcLa7xQykf1JloXnoXr5xQ8zI=",
+        "narHash": "sha256-rEzEZtd3iyVo5RJ1OGujOlnywNf3gsrOnjAn1NLciD4=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "b82fdaff917582a9d568969e15e61b398c71e990",
+        "rev": "752d0fbd141fabb5a1e7f865199b80e6e76f8d8e",
         "type": "github"
       },
       "original": {
@@ -94,11 +94,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1727292492,
+        "lastModified": 1727125297,
-        "narHash": "sha256-vKkVoZJB35xOb1kmAH6i74ziuP0ZGKnzM6+NVi/OhD8=",
+        "narHash": "sha256-bsQPbe1v0Q+QSNvSTn+w7bQcjsj9NebS8zrx2JB2k4c=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "9b30ea4a39c8c5a2b6a6519f85da38f72b7f29f0",
+        "rev": "a803a24630c8d6108d88f2e35cf6c6d801c187b6",
         "type": "github"
       },
       "original": {
@@ -114,11 +114,11 @@
         "nixpkgs": "nixpkgs_9"
       },
       "locked": {
-        "lastModified": 1727497393,
+        "lastModified": 1727068561,
-        "narHash": "sha256-AHL2qezvAAZtOP61cHtnB0RtqPej4LqtGkvXNOAESNw=",
+        "narHash": "sha256-7VRjA4H07E4BNf3ODDtJo7ujfuSddsWCSqTqz5rVgMw=",
         "owner": "jcdickinson",
         "repo": "codeium.nvim",
-        "rev": "17bbefff02be8fd66931f366bd4ed76a76e4a57e",
+        "rev": "aa06fa21dd518a81b84aa468e2f52051cbd45f12",
         "type": "github"
       },
       "original": {
@@ -130,6 +130,7 @@
     "cosmic": {
       "inputs": {
         "flake-compat": "flake-compat",
+        "nix-update": "nix-update",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -137,11 +138,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1727574072,
+        "lastModified": 1727141746,
-        "narHash": "sha256-HuQnfjvImOoHbwzrKV9bJM8/2zDf9Wk5FfsmHUuzyI8=",
+        "narHash": "sha256-4QPbRdvBy1MDJ5sVztFQsAl3nG3zYcVdb7IQSLmNaXs=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "db8f40db093bfc1fffd5e891625ae7cea1322db2",
+        "rev": "738a6c45f23096b8e9cd6036e547955fa81f960d",
         "type": "github"
       },
       "original": {
@@ -179,11 +180,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727507295,
+        "lastModified": 1727003835,
-        "narHash": "sha256-I/FrX1peu4URoj5T5odfuKR2rm4GjYJJpCGF9c0/lDA=",
+        "narHash": "sha256-Cfllbt/ADfO8oxbT984MhPHR6FJBaglsr1SxtDGbpec=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "f2e1c4aa29fc211947c3a7113cba1dd707433b70",
+        "rev": "bd7d1e3912d40f799c5c0f7e5820ec950f1e0b3d",
         "type": "github"
       },
       "original": {
@@ -220,7 +221,7 @@
         "emacs-overlay": "emacs-overlay",
         "flake-utils": "flake-utils_2",
         "nixpkgs": "nixpkgs_4",
-        "treefmt-nix": "treefmt-nix"
+        "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
         "lastModified": 1723700896,
@@ -374,6 +375,28 @@
       }
     },
     "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "cosmic",
+          "nix-update",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1719994518,
+        "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_2": {
       "inputs": {
         "nixpkgs-lib": [
           "nix-super",
@@ -394,7 +417,7 @@
         "type": "github"
       }
     },
-    "flake-parts_2": {
+    "flake-parts_3": {
       "inputs": {
         "nixpkgs-lib": [
           "nixvim",
@@ -486,24 +509,6 @@
         "type": "github"
       }
     },
-    "flake-utils_10": {
-      "inputs": {
-        "systems": "systems_11"
-      },
-      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "flake-utils_2": {
       "inputs": {
         "systems": "systems_3"
@@ -578,11 +583,11 @@
         "systems": "systems_8"
       },
       "locked": {
-        "lastModified": 1726560853,
+        "lastModified": 1710146030,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -624,24 +629,6 @@
         "type": "github"
       }
     },
-    "flake-utils_9": {
-      "inputs": {
-        "systems": "systems_10"
-      },
-      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "flakegen": {
       "inputs": {
         "systems": "systems_4"
@@ -680,11 +667,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727514110,
+        "lastModified": 1726745158,
-        "narHash": "sha256-0YRcOxJG12VGDFH8iS8pJ0aYQQUAgo/r3ZAL+cSh9nk=",
+        "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "85f7a7177c678de68224af3402ab8ee1bcee25c8",
+        "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
         "type": "github"
       },
       "original": {
@@ -693,44 +680,6 @@
         "type": "github"
       }
     },
-    "git-ignore-nix": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_14"
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "ref": "master",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "git-ignore-nix_2": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_16"
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "ref": "master",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -803,11 +752,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727383923,
+        "lastModified": 1727111745,
-        "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=",
+        "narHash": "sha256-EYLvFRoTPWtD+3uDg2wwQvlz88OrIr3zld+jFE5gDcY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ffe2d07e771580a005e675108212597e5b367d2d",
+        "rev": "21c021862fa696c8199934e2153214ab57150cb6",
         "type": "github"
       },
       "original": {
@@ -825,11 +774,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727383923,
+        "lastModified": 1726902823,
-        "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=",
+        "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ffe2d07e771580a005e675108212597e5b367d2d",
+        "rev": "14929f7089268481d86b83ed31ffd88713dcd415",
         "type": "github"
       },
       "original": {
@@ -871,7 +820,6 @@
       "inputs": {
         "aquamarine": "aquamarine",
         "hyprcursor": "hyprcursor",
-        "hyprland-protocols": "hyprland-protocols",
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
@@ -880,11 +828,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1727549598,
+        "lastModified": 1727137145,
-        "narHash": "sha256-esywx7x3PvsLepRNTP1hYL96oJAWe0lUE9u5u9TAyfI=",
+        "narHash": "sha256-3HB4Y7YBWItpKBWyzQHXzNH9JXAoYqkNIYpeV4dB7kI=",
         "ref": "refs/heads/main",
-        "rev": "d73c14751ad40fd54d93baac2226f550142b0e74",
+        "rev": "0a211f29f5952322925b9f982cbf9b0326d45f0f",
-        "revCount": 5275,
+        "revCount": 5252,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -912,11 +860,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727258890,
+        "lastModified": 1723143591,
-        "narHash": "sha256-/55TVManE/J19LSzXtUNhHUpeouRqZxM08ZdWvJrNoA=",
+        "narHash": "sha256-dPcWAeRJoG5CyWC32X3XX+Og0v/k1/S1N0T5dQWT32k=",
         "owner": "hyprwm",
         "repo": "hyprland-plugins",
-        "rev": "4fcb465c9d771f4ae1f451e8d953250d16eead70",
+        "rev": "b73d7b901d8cb1172dd25c7b7159f0242c625a77",
         "type": "github"
       },
       "original": {
@@ -926,31 +874,6 @@
       }
     },
     "hyprland-protocols": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1727451107,
-        "narHash": "sha256-qV9savtHwmZUa0eJE294WYJjKPGB2+bJhwByFShsVyo=",
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "rev": "6b3261ee13a6d2b99de79a31d352f6996e35bde3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "type": "github"
-      }
-    },
-    "hyprland-protocols_2": {
       "inputs": {
         "nixpkgs": [
           "hyprland",
@@ -1018,11 +941,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727300645,
+        "lastModified": 1726874949,
-        "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=",
+        "narHash": "sha256-PNnIpwGqpTvMU3N2r0wMQwK1E+t4Bb5fbJwblQvr+80=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c",
+        "rev": "d97af4f6bd068c03a518b597675e598f57ea2291",
         "type": "github"
       },
       "original": {
@@ -1043,11 +966,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726874836,
+        "lastModified": 1726840673,
-        "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=",
+        "narHash": "sha256-HIPEXyRRVZoqD6U+lFS1B0tsIU7p83FaB9m7KT/x6mQ=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e",
+        "rev": "b68dab23fc922eae99306988133ee80a40b39ca5",
         "type": "github"
       },
       "original": {
@@ -1058,11 +981,11 @@
     },
     "impermanence": {
       "locked": {
-        "lastModified": 1727556076,
+        "lastModified": 1727125666,
-        "narHash": "sha256-5Iplxbdn/7kQp4UYXMnUMFL2i2lyysOhRyzvvtPe1Qc=",
+        "narHash": "sha256-hmmctvhlx0mUOm/Dv3tRewSoCX7Y0MaUDNkEsSlq3lY=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "fff0d95cf40609941769a443a001b25fb95b68ab",
+        "rev": "85fe07276d8b58cff91bfeb332940e9c7b73c135",
         "type": "github"
       },
       "original": {
@@ -1137,11 +1060,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727507295,
+        "lastModified": 1726742753,
-        "narHash": "sha256-I/FrX1peu4URoj5T5odfuKR2rm4GjYJJpCGF9c0/lDA=",
+        "narHash": "sha256-QclpWrIFIg/yvWRiOUaMp1WR+TGUE9tb7RE31xHlxWc=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "f2e1c4aa29fc211947c3a7113cba1dd707433b70",
+        "rev": "c03f85fa42d68d1056ca1740f3113b04f3addff2",
         "type": "github"
       },
       "original": {
@@ -1196,7 +1119,7 @@
     "nix-super": {
       "inputs": {
         "flake-compat": "flake-compat_2",
-        "flake-parts": "flake-parts",
+        "flake-parts": "flake-parts_2",
         "libgit2": "libgit2",
         "nixpkgs": "nixpkgs_7",
         "nixpkgs-regression": "nixpkgs-regression",
@@ -1216,6 +1139,29 @@
         "url": "https://git.privatevoid.net/max/nix-super.git"
       }
     },
+    "nix-update": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": [
+          "cosmic",
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1726651036,
+        "narHash": "sha256-6kR4UEBZvbQNoR3l8/It5ZTCC+mB14jzj7MNnFoQJwE=",
+        "owner": "Mic92",
+        "repo": "nix-update",
+        "rev": "7dd0e4467c571ebb7e53d9e3d40c49f75473efdf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "nix-update",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1703013332,
@@ -1265,11 +1211,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1727540905,
+        "lastModified": 1726969270,
-        "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=",
+        "narHash": "sha256-8fnFlXBgM/uSvBlLWjZ0Z0sOdRBesyNdH0+esxqizGc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fbca5e745367ae7632731639de5c21f29c8744ed",
+        "rev": "23cbb250f3bf4f516a2d0bf03c51a30900848075",
         "type": "github"
       },
       "original": {
@@ -1297,11 +1243,11 @@
     },
     "nixpkgs_10": {
       "locked": {
-        "lastModified": 1727571603,
+        "lastModified": 1727065772,
-        "narHash": "sha256-E/oHqQDtdeGNJk5k7QhyBNhe/ujxG8oF8aMP+iWyVuY=",
+        "narHash": "sha256-U9baiEXL2YsS67QKlBAPIUq+OB+eUPKv8n1vGNdhiec=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4a1558c5feaa3a3f558e8512590e68f1a9c87e17",
+        "rev": "989dc4cbf6a95f2e5fefc8cd61d2198a8fb6834a",
         "type": "github"
       },
       "original": {
@@ -1312,11 +1258,11 @@
     },
     "nixpkgs_11": {
       "locked": {
-        "lastModified": 1727348695,
+        "lastModified": 1726755586,
-        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
+        "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
+        "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
         "type": "github"
       },
       "original": {
@@ -1328,11 +1274,11 @@
     },
     "nixpkgs_12": {
       "locked": {
-        "lastModified": 1726871744,
+        "lastModified": 1726481836,
-        "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=",
+        "narHash": "sha256-MWTBH4dd5zIz2iatDb8IkqSjIeFum9jAqkFxgHLdzO4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2",
+        "rev": "20f9370d5f588fb8c72e844c54511cab054b5f40",
         "type": "github"
       },
       "original": {
@@ -1344,11 +1290,11 @@
     },
     "nixpkgs_13": {
       "locked": {
-        "lastModified": 1726871744,
+        "lastModified": 1726481836,
-        "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=",
+        "narHash": "sha256-MWTBH4dd5zIz2iatDb8IkqSjIeFum9jAqkFxgHLdzO4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2",
+        "rev": "20f9370d5f588fb8c72e844c54511cab054b5f40",
         "type": "github"
       },
       "original": {
@@ -1358,74 +1304,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_14": {
-      "locked": {
-        "lastModified": 1666603677,
-        "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_15": {
-      "locked": {
-        "lastModified": 0,
-        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
-        "path": "/nix/store/fpivx4sjcp2vk4rp9nhliln5cwcp3kc6-source",
-        "type": "path"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_16": {
-      "locked": {
-        "lastModified": 1666603677,
-        "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_17": {
-      "locked": {
-        "lastModified": 0,
-        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
-        "path": "/nix/store/fpivx4sjcp2vk4rp9nhliln5cwcp3kc6-source",
-        "type": "path"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_18": {
-      "locked": {
-        "lastModified": 1725634671,
-        "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1726937504,
@@ -1492,11 +1370,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1727122398,
+        "lastModified": 1726755586,
-        "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
+        "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
+        "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
         "type": "github"
       },
       "original": {
@@ -1524,11 +1402,11 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1727348695,
+        "lastModified": 1726937504,
-        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
+        "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
+        "rev": "9357f4f23713673f310988025d9dc261c20e70c6",
         "type": "github"
       },
       "original": {
@@ -1560,14 +1438,14 @@
         "flake-utils": "flake-utils_5",
         "nixpkgs": "nixpkgs_10",
         "nixvim": "nixvim_2",
-        "treefmt-nix": "treefmt-nix_3"
+        "treefmt-nix": "treefmt-nix_4"
       },
       "locked": {
-        "lastModified": 1727572524,
+        "lastModified": 1727149363,
-        "narHash": "sha256-k77DTaj7KZpmtnIq8fn3ERT4B9RPTi8SbwQwcYsRrQM=",
+        "narHash": "sha256-1uQTDYafVvO0hmydMpuQiMtL7888PajLNN9SLmz5tiw=",
         "owner": "pupbrained",
         "repo": "nvim-config",
-        "rev": "071ff4950f4abde59215cd8017ac7ac90178a662",
+        "rev": "b835449c04e692abae157b12642efee62a86c912",
         "type": "github"
       },
       "original": {
@@ -1580,20 +1458,20 @@
       "inputs": {
         "devshell": "devshell",
         "flake-compat": "flake-compat_3",
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts_3",
         "git-hooks": "git-hooks",
         "home-manager": "home-manager_4",
         "nix-darwin": "nix-darwin",
         "nixpkgs": "nixpkgs_11",
         "nuschtosSearch": "nuschtosSearch",
-        "treefmt-nix": "treefmt-nix_2"
+        "treefmt-nix": "treefmt-nix_3"
       },
       "locked": {
-        "lastModified": 1727557953,
+        "lastModified": 1727050833,
-        "narHash": "sha256-xe8JQaNOPTyzWsSlLu2yC6qw4SjOMHrXk4Iq+pIgLhM=",
+        "narHash": "sha256-uq8pP+WsJsZ3QA+GoSftUsAvhx3btBOCWAqKQSFcL1M=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "2c4e4681db658deeceb2f781136d7ba1d0009521",
+        "rev": "a9345dcfc31519734361fecd246d32164feafbca",
         "type": "github"
       },
       "original": {
@@ -1612,11 +1490,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727452028,
+        "lastModified": 1726816132,
-        "narHash": "sha256-ehl/A4HQFRyqj1Fk7cl+dgSf/2Fb1jLwWJtZaMU6RfU=",
+        "narHash": "sha256-AbB0lgc0IbzLIxj1O3cosiMNAVQak4KJtvq9q8MjHhs=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "9f7426e532ef8dfc839c4a3fcc567b13a20a70d3",
+        "rev": "7733a39a1321057172d87e6251ded7cdeb67171e",
         "type": "github"
       },
       "original": {
@@ -1677,9 +1555,7 @@
         "nixvim": "nixvim",
         "snowfall-flake": "snowfall-flake",
         "snowfall-lib": "snowfall-lib_2",
-        "treefmt-nix": "treefmt-nix_4",
+        "treefmt-nix": "treefmt-nix_5"
-        "xmonad-contrib": "xmonad-contrib",
-        "zen-browser": "zen-browser"
       }
     },
     "rust-analyzer-src": {
@@ -1707,11 +1583,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727490462,
+        "lastModified": 1727058553,
-        "narHash": "sha256-OrrPiNBiikv9BR464XTT75FzOq7tKAvMbMi7YOKVIeg=",
+        "narHash": "sha256-tY/UU3Qk5gP/J0uUM4DZ6wo4arNLGAVqLKBotILykfQ=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "11a13e50debafae4ae802f1d6b8585101516dd93",
+        "rev": "edc5b0f896170f07bd39ad59d6186fcc7859bbb2",
         "type": "github"
       },
       "original": {
@@ -1804,36 +1680,6 @@
         "type": "github"
       }
     },
-    "systems_10": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_11": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "systems_2": {
       "locked": {
         "lastModified": 1681028828,
@@ -1955,6 +1801,28 @@
       }
     },
     "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "cosmic",
+          "nix-update",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1719887753,
+        "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
+    "treefmt-nix_2": {
       "inputs": {
         "nixpkgs": "nixpkgs_5"
       },
@@ -1972,7 +1840,7 @@
         "type": "github"
       }
     },
-    "treefmt-nix_2": {
+    "treefmt-nix_3": {
       "inputs": {
         "nixpkgs": [
           "nixvim",
@@ -1981,29 +1849,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727431250,
+        "lastModified": 1726734507,
-        "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=",
+        "narHash": "sha256-VUH5O5AcOSxb0uL/m34dDkxFKP6WLQ6y4I1B4+N3L2w=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754",
+        "rev": "ee41a466c2255a3abe6bc50fc6be927cdee57a9f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
-    "treefmt-nix_3": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_12"
-      },
-      "locked": {
-        "lastModified": 1727431250,
-        "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754",
         "type": "github"
       },
       "original": {
@@ -2014,14 +1864,14 @@
     },
     "treefmt-nix_4": {
       "inputs": {
-        "nixpkgs": "nixpkgs_13"
+        "nixpkgs": "nixpkgs_12"
       },
       "locked": {
-        "lastModified": 1727431250,
+        "lastModified": 1726734507,
-        "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=",
+        "narHash": "sha256-VUH5O5AcOSxb0uL/m34dDkxFKP6WLQ6y4I1B4+N3L2w=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754",
+        "rev": "ee41a466c2255a3abe6bc50fc6be927cdee57a9f",
         "type": "github"
       },
       "original": {
@@ -2030,25 +1880,27 @@
         "type": "github"
       }
     },
-    "unstable": {
+    "treefmt-nix_5": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_13"
+      },
       "locked": {
-        "lastModified": 1727348695,
+        "lastModified": 1727098951,
-        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
+        "narHash": "sha256-gplorAc0ISAUPemUNOnRUs7jr3WiLiHZb3DJh++IkZs=",
-        "owner": "NixOS",
+        "owner": "numtide",
-        "repo": "nixpkgs",
+        "repo": "treefmt-nix",
-        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
+        "rev": "35dfece10c642eb52928a48bee7ac06a59f93e9a",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "numtide",
-        "ref": "nixos-unstable",
+        "repo": "treefmt-nix",
-        "repo": "nixpkgs",
         "type": "github"
       }
     },
     "xdph": {
       "inputs": {
-        "hyprland-protocols": "hyprland-protocols_2",
+        "hyprland-protocols": "hyprland-protocols",
         "hyprlang": [
           "hyprland",
           "hyprlang"
@@ -2083,66 +1935,6 @@
         "repo": "xdg-desktop-portal-hyprland",
         "type": "github"
       }
-    },
-    "xmonad": {
-      "inputs": {
-        "flake-utils": "flake-utils_10",
-        "git-ignore-nix": "git-ignore-nix_2",
-        "nixpkgs": "nixpkgs_17",
-        "unstable": "unstable"
-      },
-      "locked": {
-        "lastModified": 1726451364,
-        "narHash": "sha256-6WKgYq0+IzPSXxVl1MfODIVwEbd3Sw0zc5sMSOyzA8I=",
-        "owner": "xmonad",
-        "repo": "xmonad",
-        "rev": "a4140b93497333ec7f3127ee4dabcb8ae8a721b6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "xmonad",
-        "repo": "xmonad",
-        "type": "github"
-      }
-    },
-    "xmonad-contrib": {
-      "inputs": {
-        "flake-utils": "flake-utils_9",
-        "git-ignore-nix": "git-ignore-nix",
-        "nixpkgs": "nixpkgs_15",
-        "xmonad": "xmonad"
-      },
-      "locked": {
-        "lastModified": 1726510493,
-        "narHash": "sha256-0kGVX0iKFHlC2Kgx+bdX68P0qqPQdudSgi11bsvaNJY=",
-        "owner": "xmonad",
-        "repo": "xmonad-contrib",
-        "rev": "42340e0f76a7a934f2a4a8d0da3165f74f68e6be",
-        "type": "github"
-      },
-      "original": {
-        "owner": "xmonad",
-        "repo": "xmonad-contrib",
-        "type": "github"
-      }
-    },
-    "zen-browser": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_18"
-      },
-      "locked": {
-        "lastModified": 1727248177,
-        "narHash": "sha256-QHE2H3VYUK3T7zVbIfqEF7P8hBeim8vU5hXz8X6y8j0=",
-        "owner": "fufexan",
-        "repo": "zen-browser-flake",
-        "rev": "67f1db200b6d533cf1f2b562c183ac536919ec4b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "fufexan",
-        "repo": "zen-browser-flake",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -45,8 +45,6 @@
       url = "github:snowfallorg/lib/dev";
     };
     treefmt-nix.url = "github:numtide/treefmt-nix";
-    xmonad-contrib.url = "github:xmonad/xmonad-contrib";
-    zen-browser.url = "github:fufexan/zen-browser-flake";
   };
   outputs = inputs: inputs.flakegen ./flake.in.nix inputs;
 }

homes/x86_64-linux/marshall@navis/default.nix

@@ -31,6 +31,7 @@
         eternal-terminal
         glow
         grc
+        iamb
         jamesdsp
         jdk21
         killall
@@ -43,25 +44,6 @@
         python3
         slack
         telegram-desktop
-        xdotool
-        zed-editor
-        (xwinwrap.overrideAttrs {
-          src = fetchFromGitHub {
-            owner = "camonater62";
-            repo = "xwinwrap";
-            rev = "ec74e730072225ffa740bf5076a1dd0a343bb113";
-            sha256 = "0vfwbcx5y1aphiaix2zps1bl7lhbhdvm6vhys2m0kwvl6igy0cc8";
-          };
-
-          buildPhase = ''
-            make all
-          '';
-
-          installPhase = ''
-            mkdir -p $out/bin
-            mv xwinwrap $out/bin
-          '';
-        })
         vesktop
         youki
         (pkgs.buildFHSUserEnv {
@@ -81,7 +63,6 @@
       ])
       ++ (with inputs; [
         nixvim.packages.${pkgs.system}.default
-        zen-browser.packages.${pkgs.system}.specific
       ])
       ++ (with inputs.chaotic.packages.${pkgs.system}; [
         distrobox_git
@@ -157,8 +138,6 @@
   };
 
   programs = {
-    xmobar.enable = true;
-
     emacs = {
       enable = true;
       package = inputs.emacs.packages.${pkgs.system}.default;
@@ -178,53 +157,6 @@
     };
   };
 
-  services = {
-    picom = {
-      enable = true;
-      backend = "glx";
-      fadeDelta = 5;
-      fade = true;
-      shadow = true;
-      vSync = true;
-
-      shadowExclude = [
-        "class_g = 'firefox' && argb"
-        "class_g *?= 'slop'"
-      ];
-
-      settings = {
-        corner-radius = 10;
-
-        blur-background-exclude = [
-          "class_g = 'slop'"
-        ];
-
-        rounded-corners-exclude = [
-          "window_type = 'dock'"
-          "window_type = 'desktop'"
-        ];
-
-        blur = {
-          method = "gaussian";
-          size = 10;
-          deviation = 5.0;
-        };
-      };
-    };
-
-    dunst = {
-      enable = true;
-      settings.global = {
-        corner_radius = 10;
-        offset = "18x53";
-        frame_width = 2;
-        font = "SN Pro 12";
-        frame_color = lib.mkForce "#a6e3a1";
-      };
-      catppuccin.enable = true;
-    };
-  };
-
   systemd.user.startServices = "sd-switch";
 
   nix.package = lib.mkForce inputs.nix-super.packages.${pkgs.system}.default;

homes/x86_64-linux/marshall@navis/hyprland/default.nix

@@ -62,7 +62,17 @@ with pkgs; {
       clipboard = "rofi -modi '   ':${rofi-clipboard}/bin/rofi-clipboard -show '   ' -show-icons";
       terminal = "wezterm";
 
-      screenshot = mode: "${hyprshot}/bin/hyprshot --clipboard-only -m ${mode}";
+      screenshot = mode: "${
+        hyprshot.overrideAttrs {
+          # Fixes cursors showing in region shots
+          src = pkgs.fetchFromGitHub {
+            owner = "BenCarmichael01";
+            repo = "Hyprshot";
+            rev = "84e2adcd5dd9060178d0d028ad032734797fba23";
+            hash = "sha256-XDKwBiUMWvxoWpkdJ0EK4kEqPSTZLcF6axHjom3c5Jk=";
+          };
+        }
+      }/bin/hyprshot --clipboard-only -m ${mode}";
     in {
       decoration.rounding = 10;
       dwindle.preserve_split = true;

homes/x86_64-linux/marshall@navis/wezterm.lua

@@ -114,14 +114,14 @@ local config = {
   default_cursor_style = 'BlinkingBar',
   enable_kitty_graphics = true,
   enable_scroll_bar = false,
-  enable_wayland = true,
+  enable_wayland = false,
   font_size = 12,
   font = wezterm.font('Maple Mono NF'),
-  front_end = 'WebGpu',
+  front_end = 'OpenGL',
+  initial_cols = 160,
   keys = keybinds,
   underline_position = -4,
   use_fancy_tab_bar = false,
-  window_decorations = 'NONE',
   warn_about_missing_glyphs = false,
   window_background_opacity = 0.8,
   window_padding = { left = 0, right = 0, top = 0, bottom = 0 },

modules/home/shell/macchina.nix

@@ -8,18 +8,18 @@ with pkgs; {
       interface = "wlp4s0";
 
       show = [
+        "DesktopEnvironment"
         "Distribution"
         "Kernel"
         "LocalIP"
-        "DesktopEnvironment"
-        "WindowManager"
-        "Packages"
-        "Resolution"
-        "Terminal"
-        "Shell"
-        "Uptime"
-        "ProcessorLoad"
         "Memory"
+        "Packages"
+        "ProcessorLoad"
+        "Resolution"
+        "Shell"
+        "Terminal"
+        "Uptime"
+        "WindowManager"
       ];
     };
 
@@ -67,7 +67,7 @@ with pkgs; {
           border = "rounded";
           visible = true;
           inner_margin = {
-            x = 1;
+            x = 0;
             y = 1;
           };
         };

systems/x86_64-linux/navis/default.nix

@@ -4,10 +4,9 @@
   inputs,
   lib,
   ...
-}: {
+}:
-  imports = [
+with lib // pkgs // inputs; {
-    ./hardware.nix
+  imports = [./hardware.nix];
-  ];
 
   security = {
     rtkit.enable = true;
@@ -31,11 +30,7 @@
       ];
     };
 
-    sudo-rs = {
+    sudo.wheelNeedsPassword = false;
-      enable = true;
-      wheelNeedsPassword = false;
-      execWheelOnly = true;
-    };
   };
 
   console.catppuccin.enable = true;
@@ -45,7 +40,7 @@
   ];
 
   systemd.user.extraConfig = let
-    path = lib.concatStringsSep ":" [
+    path = concatStringsSep ":" [
       "/run/wrappers/bin"
       "/etc/profiles/per-user/%u/bin"
       "/nix/var/nix/profiles/default/bin"
@@ -56,7 +51,7 @@
   '';
 
   age = {
-    secrets.passwd.file = ../../../secrets/passwd.age;
+    secrets.passwd.file = "${self}/secrets/passwd.age";
     identityPaths = ["/persist/root/.ssh/id_ed25519"];
   };
 
@@ -65,6 +60,11 @@
       enable = true;
       scheduler = "scx_rusty";
     };
+
+    steam.extraCompatPackages = [
+      luxtorpeda
+      proton-ge-custom
+    ];
   };
 
   virtualisation = {
@@ -77,11 +77,11 @@
       onShutdown = "shutdown";
 
       qemu = {
-        package = pkgs.qemu_kvm;
+        package = qemu_kvm;
         swtpm.enable = true;
         runAsRoot = false;
         ovmf.enable = true;
-        ovmf.packages = [pkgs.OVMFFull.fd];
+        ovmf.packages = [OVMFFull.fd];
       };
     };
 
@@ -100,8 +100,8 @@
       TERMINAL = "wezterm";
     };
 
-    systemPackages = with pkgs; [
+    systemPackages = [
-      inputs.agenix.packages.${system}.default
+      agenix.packages.${system}.default
       nautilus
       internal.lightly-boehs-qt6
       looking-glass-client
@@ -132,13 +132,13 @@
 
   boot = {
     blacklistedKernelModules = ["nouveau" "i915"];
-    kernelPackages = pkgs.linuxPackages_cachyos;
+    kernelPackages = linuxPackages_cachyos;
     supportedFilesystems = ["btrfs" "ntfs"];
 
-    # initrd.systemd = {
+    initrd.systemd = {
-    #   enable = true;
+      enable = true;
-    #   emergencyAccess = true; # No password needed because of LUKS
+      emergencyAccess = true; # No password needed because of LUKS
-    # };
+    };
 
     plymouth = {
       enable = true;
@@ -147,7 +147,7 @@
 
     extraModprobeConfig =
       "options nvidia "
-      + lib.concatStringsSep " " [
+      + concatStringsSep " " [
         "NVreg_UsePageAttributeTable=1"
         "NVreg_EnablePCIeGen3=1"
         "NVreg_RegistryDwords=RMUseSwI2c=0x01;RMI2cSpeed=100"
@@ -172,9 +172,17 @@
   };
 
   nix = let
-    nixSuper = inputs.nix-super.packages.${pkgs.system}.default;
+    mappedRegistry = pipe inputs [
+      (filterAttrs (_: isType "flake"))
+      (mapAttrs (_: flake: {inherit flake;}))
+      (x: x // {nixpkgs.flake = nixpkgs;})
+    ];
+
+    nixSuper = nix-super.packages.${system}.default;
   in {
-    package = lib.mkForce nixSuper;
+    package = mkForce nixSuper;
+    registry = mappedRegistry // optionalAttrs (config.nix.package == nixSuper) {default = mappedRegistry.nixpkgs;};
+    nixPath = mapAttrsToList (key: _: "${key}=flake:${key}") config.nix.registry;
 
     daemonCPUSchedPolicy = "batch";
     daemonIOSchedClass = "idle";
@@ -253,7 +261,7 @@
 
     hyprland = {
       enable = true;
-      package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+      package = hyprland.packages.${system}.hyprland;
     };
 
     nh = {
@@ -383,7 +391,7 @@
   };
 
   networking = {
-    useDHCP = lib.mkDefault true;
+    useDHCP = mkDefault true;
     hostName = "navis";
     firewall.enable = false;
     nameservers = ["1.1.1.1" "1.0.0.1"];
@@ -407,11 +415,23 @@
 
     emacs = {
       enable = true;
-      package = inputs.emacs.packages.${pkgs.system}.default;
+      package = inputs.emacs.packages.${system}.default;
     };
 
-    displayManager.cosmic-greeter.enable = true;
+    # greetd = {
+    #   enable = true;
+    #   settings = rec {
+    #     initial_session = {
+    #       command = "${pkgs.hyprland}/bin/hyprland";
+    #       user = "marshall";
+    #     };
+    #
+    #     default_session = initial_session;
+    #   };
+    # };
+
     desktopManager.cosmic.enable = true;
+    displayManager.cosmic-greeter.enable = true;
 
     libinput = {
       enable = true;
@@ -421,18 +441,6 @@
     xserver = {
       enable = true;
       videoDrivers = ["nvidia"];
-
-      displayManager.startx.enable = true;
-
-      windowManager.xmonad = {
-        enable = true;
-        enableContribAndExtras = true;
-        enableConfiguredRecompile = true;
-        flake = {
-          enable = true;
-          compiler = "ghc982";
-        };
-      };
     };
 
     pipewire = {
@@ -449,7 +457,7 @@
     users.marshall = {
       isNormalUser = true;
       extraGroups = ["wheel" "gamemode" "libvirtd" "qemu-libvirtd" "disk" "networkmanager"];
-      shell = pkgs.fish;
+      shell = fish;
       hashedPasswordFile = config.age.secrets.passwd.path;
     };
   };
@@ -468,7 +476,7 @@
     graphics = {
       enable = true;
       enable32Bit = true;
-      extraPackages = with pkgs; [
+      extraPackages = [
         vaapiVdpau
         nvidia-vaapi-driver
       ];
@@ -481,6 +489,13 @@
       modesetting.enable = true;
       powerManagement.enable = true;
       open = false;
+
+      prime = {
+        sync.enable = true;
+
+        intelBusId = "PCI:0:2:0";
+        nvidiaBusId = "PCI:1:0:0";
+      };
     };
   };
 

systems/x86_64-linux/navis/hardware.nix

@@ -20,35 +20,35 @@
     options = ["subvol=root"];
   };
 
-  # boot.initrd.systemd.services.wipe-root = {
+  boot.initrd.systemd.services.wipe-root = {
-  #   requires = ["dev-mapper-enc.device"];
+    requires = ["dev-mapper-enc.device"];
-  #   after = ["dev-mapper-enc.device"];
+    after = ["dev-mapper-enc.device"];
-  #   wantedBy = ["initrd.target"];
+    wantedBy = ["initrd.target"];
-  #   script = lib.mkAfter ''
+    script = lib.mkAfter ''
-  #     mkdir /btrfs_tmp
+      mkdir /btrfs_tmp
-  #     mount /dev/disk/by-uuid/d375c3a3-63a3-47f8-8b77-58fabbb8f67b /btrfs_tmp
+      mount /dev/disk/by-uuid/d375c3a3-63a3-47f8-8b77-58fabbb8f67b /btrfs_tmp
-  #     if [[ -e /btrfs_tmp/root ]]; then
+      if [[ -e /btrfs_tmp/root ]]; then
-  #         mkdir -p /btrfs_tmp/old_roots
+          mkdir -p /btrfs_tmp/old_roots
-  #         timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%-d_%H:%M:%S")
+          timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%-d_%H:%M:%S")
-  #         mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp"
+          mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp"
-  #     fi
+      fi
-  #
+
-  #     delete_subvolume_recursively() {
+      delete_subvolume_recursively() {
-  #         IFS=$'\n'
+          IFS=$'\n'
-  #         for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do
+          for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do
-  #             delete_subvolume_recursively "/btrfs_tmp/$i"
+              delete_subvolume_recursively "/btrfs_tmp/$i"
-  #         done
+          done
-  #         btrfs subvolume delete "$1"
+          btrfs subvolume delete "$1"
-  #     }
+      }
-  #
+
-  #     for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +30); do
+      for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +30); do
-  #         delete_subvolume_recursively "$i"
+          delete_subvolume_recursively "$i"
-  #     done
+      done
-  #
+
-  #     btrfs subvolume create /btrfs_tmp/root
+      btrfs subvolume create /btrfs_tmp/root
-  #     umount /btrfs_tmp
+      umount /btrfs_tmp
-  #   '';
+    '';
-  # };
+  };
 
   boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/9952fcd1-46eb-4c9c-ab7d-361d31fdb9a2";