flake.lock

@@ -5,11 +5,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1713301451,
+        "lastModified": 1712834339,
-        "narHash": "sha256-LzYVqEukjOJjm4HGFe6rtHBiuJxAyPqd2MY1k5ci9QU=",
+        "narHash": "sha256-gRYAbyxx4Z2s4hMoXHSu3wv2+VSiiR2Nk+AZmCZ6kc4=",
         "owner": "Aylur",
         "repo": "ags",
-        "rev": "33bcaf34d5277031ecb97047fb8ddd44abd8d80e",
+        "rev": "c13bcba224f9ecaaa2f22b1d2895bb62e8face19",
         "type": "github"
       },
       "original": {
@@ -26,11 +26,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713259062,
+        "lastModified": 1712136515,
-        "narHash": "sha256-WTO84hUL8IlNuHDK2yOCeJ38EewFzGt5E0kzBjNWxa8=",
+        "narHash": "sha256-LpjQJYC24S5P5XhJsZX6HqsQT1pohcFzM6N42I6qo/U=",
         "owner": "Kirottu",
         "repo": "anyrun",
-        "rev": "f9d30e34fa4ccb2797c6becec37e8bcff6585d39",
+        "rev": "be6728884d543665e7bd137bbef62dc1d04a210b",
         "type": "github"
       },
       "original": {
@@ -68,11 +68,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1713279551,
+        "lastModified": 1712914814,
-        "narHash": "sha256-thdSd8oeztVJ3Ly2SvPCfoP+FCoDQCVHSizO0vMGHsI=",
+        "narHash": "sha256-2JimoqHnPCoRlvE1kY0zwTEDmNO3g+8Lz+nJrbaHMHo=",
         "owner": "atuinsh",
         "repo": "atuin",
-        "rev": "19f70cdc918769e0485b0e4aba4069327e96dc3b",
+        "rev": "c41998e98a073f4cce26134c0642c403d71b74a2",
         "type": "github"
       },
       "original": {
@@ -248,24 +248,6 @@
         "type": "github"
       }
     },
-    "flake-parts_3": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib_2"
-      },
-      "locked": {
-        "lastModified": 1712014858,
-        "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "locked": {
         "lastModified": 1667395993,
@@ -319,7 +301,7 @@
     },
     "flake-utils_4": {
       "inputs": {
-        "systems": "systems_10"
+        "systems": "systems_9"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -337,7 +319,7 @@
     },
     "flake-utils_5": {
       "inputs": {
-        "systems": "systems_11"
+        "systems": "systems_10"
       },
       "locked": {
         "lastModified": 1705309234,
@@ -355,7 +337,7 @@
     },
     "flake-utils_6": {
       "inputs": {
-        "systems": "systems_14"
+        "systems": "systems_13"
       },
       "locked": {
         "lastModified": 1694529238,
@@ -434,11 +416,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1713304603,
+        "lastModified": 1713054897,
-        "narHash": "sha256-n30G6KWe3wANaTkogJGHPXat1mNPpnSyCkbi87+j/lw=",
+        "narHash": "sha256-1RpjL4Erczw5Q1szSd543w+F1jsj5bXp2a74cpiyqIg=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "43dff1c77251c1d6b9f98d6dee83a97e46af00e8",
+        "rev": "9df1266376323b3dae07e48bd1e64463d3aec1dd",
         "type": "github"
       },
       "original": {
@@ -454,11 +436,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713294767,
+        "lastModified": 1713131281,
-        "narHash": "sha256-LmaabaQZdx52MPGKPRt9Opoc9Gd9RbwvCdysUUYQoXI=",
+        "narHash": "sha256-/Jm1X9MPfLXAxZSCdWmQAFNUQggEfNWHol5jSyyzFzw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "fa8c16e2452bf092ac76f09ee1fb1e9f7d0796e7",
+        "rev": "9f32c66a51d05e6d4ec0dea555bbff9135749ec7",
         "type": "github"
       },
       "original": {
@@ -474,11 +456,11 @@
         "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1713214463,
+        "lastModified": 1713119587,
-        "narHash": "sha256-zAOOjqHAbccCRgJSuvTCA0FNLqKswN63LgVo43R7pxw=",
+        "narHash": "sha256-i4q+C4Q8ZNmrPE38PAXqo4xpVTLrkOFE8dzSTmu9zZk=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "0a53b9957f0b17f1a0036b25198f569969ad43a0",
+        "rev": "1f4c960cf1c0c9aaf99670c62b6eff751bd67ff0",
         "type": "github"
       },
       "original": {
@@ -503,11 +485,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713214463,
+        "lastModified": 1712434681,
-        "narHash": "sha256-zAOOjqHAbccCRgJSuvTCA0FNLqKswN63LgVo43R7pxw=",
+        "narHash": "sha256-qwmR2p1oc48Bj7gUDvb1oGL19Rjs2PmEmk4ChV01A5o=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "0a53b9957f0b17f1a0036b25198f569969ad43a0",
+        "rev": "818d8c4b69e0997483d60b75f701fe14b561a7a3",
         "type": "github"
       },
       "original": {
@@ -520,14 +502,14 @@
       "inputs": {
         "hyprlang": "hyprlang_2",
         "nixpkgs": "nixpkgs_6",
-        "systems": "systems_6"
+        "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1713214520,
+        "lastModified": 1712947995,
-        "narHash": "sha256-fKNu5IbfifwGEfVmw8CsNsZRPpDBIy2/B4Dg8k+z3bk=",
+        "narHash": "sha256-rROseP9x/qt2H7H9L5KojUIPXwcw03dNjatPiP8yILE=",
         "owner": "hyprwm",
         "repo": "hypridle",
-        "rev": "01772b32afc316b85bf5ab2979bd35283ab1ce5b",
+        "rev": "72a6b38b15072ab7df64ae863fc8a4a0f94baf5d",
         "type": "github"
       },
       "original": {
@@ -542,16 +524,16 @@
         "hyprland-protocols": "hyprland-protocols",
         "hyprlang": "hyprlang_3",
         "nixpkgs": "nixpkgs_7",
-        "systems": "systems_7",
+        "systems": "systems_6",
         "wlroots": "wlroots",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1713296181,
+        "lastModified": 1713143145,
-        "narHash": "sha256-c2hUYlSi7QOful5lIEWVRl1dborfctAvWY9CwoTLxXI=",
+        "narHash": "sha256-6lcGyN2Tyucw3o1M5CRlX5cElN7Xz8LNKnrPYvHeS6Q=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "e8e02e81e84bb04efa0c926361ec80c60744f665",
+        "rev": "1719905e7fdb42516566fb95c07c6572d5fe6ce5",
         "type": "github"
       },
       "original": {
@@ -572,11 +554,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713283897,
+        "lastModified": 1712836056,
-        "narHash": "sha256-/0OPK/bDr8/Lf7r8kzDD/yP1kySbJ8gPmV3CdUbVTFM=",
+        "narHash": "sha256-qf6yev9OlJuQv557ApLQ/5V8pQj0YOO9tyh5j3It1mY=",
         "owner": "hyprwm",
         "repo": "hyprland-plugins",
-        "rev": "00d147d7f6ad2ecfbf75efe4a8402723c72edd98",
+        "rev": "e9457e08ca3ff16dc5a815be62baf9e18b539197",
         "type": "github"
       },
       "original": {
@@ -647,11 +629,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713121246,
+        "lastModified": 1709914708,
-        "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
+        "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
+        "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
         "type": "github"
       },
       "original": {
@@ -665,15 +647,14 @@
         "nixpkgs": [
           "hypridle",
           "nixpkgs"
-        ],
+        ]
-        "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1713121246,
+        "lastModified": 1708212860,
-        "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
+        "narHash": "sha256-nW3Zrhh9RJcMTvOcXAaKADnJM/g6tDf3121lJtTHnYo=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
+        "rev": "11d5ccda071c153dfdc18ef65338956a51cef96a",
         "type": "github"
       },
       "original": {
@@ -694,11 +675,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713121246,
+        "lastModified": 1711671891,
-        "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
+        "narHash": "sha256-C/Wwsy/RLxHP1axFFl+AnwJRWfd8gxDKKoa8nt8Qk3c=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
+        "rev": "c1402612146ba06606ebf64963a02bc1efe11e74",
         "type": "github"
       },
       "original": {
@@ -713,14 +694,14 @@
           "hyprlock",
           "nixpkgs"
         ],
-        "systems": "systems_8"
+        "systems": "systems_7"
       },
       "locked": {
-        "lastModified": 1713121246,
+        "lastModified": 1711250455,
-        "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
+        "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
+        "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa",
         "type": "github"
       },
       "original": {
@@ -735,14 +716,14 @@
           "xdg-portal-hyprland",
           "nixpkgs"
         ],
-        "systems": "systems_12"
+        "systems": "systems_11"
       },
       "locked": {
-        "lastModified": 1713121246,
+        "lastModified": 1708681732,
-        "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
+        "narHash": "sha256-ULZZLZ9C33G13IaXLuAc4oTzHUvnATI8Fj2u6gzMfT0=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
+        "rev": "f4466367ef0a92a6425d482050dc2b8840c0e644",
         "type": "github"
       },
       "original": {
@@ -755,14 +736,14 @@
       "inputs": {
         "hyprlang": "hyprlang_4",
         "nixpkgs": "nixpkgs_8",
-        "systems": "systems_9"
+        "systems": "systems_8"
       },
       "locked": {
-        "lastModified": 1713214544,
+        "lastModified": 1713015486,
-        "narHash": "sha256-36qa6MOhCBd39YPC0FgapwGRHZXjstw8BQuKdFzwQ4k=",
+        "narHash": "sha256-hbLGAdWXnDyrnUc2+ShoSbOiBgfl5ESx+4agrjjivsM=",
         "owner": "hyprwm",
         "repo": "hyprlock",
-        "rev": "2bce52f094c49109520ad37fc8f0d051acaace55",
+        "rev": "04267a5f83a7cd94a2e219d22b139c72ed718182",
         "type": "github"
       },
       "original": {
@@ -776,11 +757,11 @@
         "nixpkgs": "nixpkgs_9"
       },
       "locked": {
-        "lastModified": 1713196199,
+        "lastModified": 1712878696,
-        "narHash": "sha256-ifdAQO9wcw/zlAyg8fCpf5I0TtufdRS6YZoTVk1VzLM=",
+        "narHash": "sha256-pFr52cCOHVmoBe50cYGzyFX8OTwjPB6E9YMAkynd2FQ=",
         "owner": "hyprwm",
         "repo": "hyprpicker",
-        "rev": "e2472f499d67568edb1b727736c587b877e85344",
+        "rev": "be7a0e82c4ea3fa04eca4f941a2983256955c1d3",
         "type": "github"
       },
       "original": {
@@ -806,17 +787,37 @@
         "type": "github"
       }
     },
+    "nh": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1712645404,
+        "narHash": "sha256-uEVd15WsX+Wti9PXW724puFcsFO72VTiJyBwW2WXT9M=",
+        "owner": "viperML",
+        "repo": "nh",
+        "rev": "fe4a96a0b0b0662dba7c186b4a1746c70bbcad03",
+        "type": "github"
+      },
+      "original": {
+        "owner": "viperML",
+        "repo": "nh",
+        "type": "github"
+      }
+    },
     "nix-gaming": {
       "inputs": {
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_2",
         "nixpkgs": "nixpkgs_10"
       },
       "locked": {
-        "lastModified": 1713173715,
+        "lastModified": 1713059094,
-        "narHash": "sha256-l2pXDP1VMx/Jy4/G09Gh6xKSJ+vAXnUKlBtFRN6NEZs=",
+        "narHash": "sha256-fAJHKkYKFUEAAcl95HVR9wyKwiXeAGSdbHdURmOUplw=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "32843d6cbb0dc010e077930b3b34ff7fd318be41",
+        "rev": "33441143246166540b02919d035c9b1089682936",
         "type": "github"
       },
       "original": {
@@ -895,24 +896,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib_2": {
-      "locked": {
-        "dir": "lib",
-        "lastModified": 1711703276,
-        "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
-        "type": "github"
-      },
-      "original": {
-        "dir": "lib",
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1711460390,
@@ -979,15 +962,15 @@
     },
     "nixpkgs_11": {
       "locked": {
-        "lastModified": 1713248628,
+        "lastModified": 1712963716,
-        "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=",
+        "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8",
+        "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -1027,11 +1010,11 @@
     },
     "nixpkgs_14": {
       "locked": {
-        "lastModified": 1712963716,
+        "lastModified": 1708475490,
-        "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
+        "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
+        "rev": "0e74ca98a74bc7270d28838369593635a5db3260",
         "type": "github"
       },
       "original": {
@@ -1107,11 +1090,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1712963716,
+        "lastModified": 1708475490,
-        "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
+        "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
+        "rev": "0e74ca98a74bc7270d28838369593635a5db3260",
         "type": "github"
       },
       "original": {
@@ -1123,11 +1106,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1712963716,
+        "lastModified": 1708475490,
-        "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
+        "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
+        "rev": "0e74ca98a74bc7270d28838369593635a5db3260",
         "type": "github"
       },
       "original": {
@@ -1139,11 +1122,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1712963716,
+        "lastModified": 1712439257,
-        "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
+        "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
+        "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
         "type": "github"
       },
       "original": {
@@ -1155,11 +1138,11 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1712963716,
+        "lastModified": 1711523803,
-        "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
+        "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
+        "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
         "type": "github"
       },
       "original": {
@@ -1187,11 +1170,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1713303955,
+        "lastModified": 1713155537,
-        "narHash": "sha256-sVlPheZtFbvEIU4lTKaQ1MNAfe6RSmqhQN6nk0rQmvc=",
+        "narHash": "sha256-PRq9nCMwkR1JXH7Lalj0HtKD6xmirKcYX1I6/bn4u4A=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "89668a5c7afbef83112a154f587eb07b8dfc0c0c",
+        "rev": "925357404770acfe89fb96e5fa52b3bc7d56fd99",
         "type": "github"
       },
       "original": {
@@ -1229,7 +1212,6 @@
         "attic": "attic",
         "atuin": "atuin",
         "deploy-rs": "deploy-rs",
-        "flake-parts": "flake-parts_2",
         "helix": "helix",
         "home-manager": "home-manager",
         "hyprcursor": "hyprcursor",
@@ -1238,6 +1220,7 @@
         "hyprland-plugins": "hyprland-plugins",
         "hyprlock": "hyprlock",
         "hyprpicker": "hyprpicker",
+        "nh": "nh",
         "nix-gaming": "nix-gaming",
         "nix-index-database": "nix-index-database",
         "nixos-hardware": "nixos-hardware",
@@ -1333,11 +1316,11 @@
         "nixpkgs-stable": "nixpkgs-stable_3"
       },
       "locked": {
-        "lastModified": 1713174909,
+        "lastModified": 1713066950,
-        "narHash": "sha256-APoDs2GtzVrsE+Z9w72qpHzEtEDfuinWcNTN7zhwLxg=",
+        "narHash": "sha256-ZaefFyvt5369XdjzSw43NhfbPM9MN5b9YXhzx4lFIRc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "cc535d07cbcdd562bcca418e475c7b1959cefa4b",
+        "rev": "226062b47fe0e2130ba3ee9f4f1c880dc815cf87",
         "type": "github"
       },
       "original": {
@@ -1378,16 +1361,16 @@
     },
     "systems_11": {
       "locked": {
-        "lastModified": 1681028828,
+        "lastModified": 1689347949,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
         "owner": "nix-systems",
-        "repo": "default",
+        "repo": "default-linux",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default",
+        "repo": "default-linux",
         "type": "github"
       }
     },
@@ -1407,21 +1390,6 @@
       }
     },
     "systems_13": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_14": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1543,16 +1511,16 @@
     },
     "systems_9": {
       "locked": {
-        "lastModified": 1689347949,
+        "lastModified": 1681028828,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
         "type": "github"
       }
     },
@@ -1623,14 +1591,14 @@
         "hyprland-protocols": "hyprland-protocols_2",
         "hyprlang": "hyprlang_5",
         "nixpkgs": "nixpkgs_14",
-        "systems": "systems_13"
+        "systems": "systems_12"
       },
       "locked": {
-        "lastModified": 1713214484,
+        "lastModified": 1709299639,
-        "narHash": "sha256-h1bSIsDuPk1FGgvTuSHJyiU2Glu7oAyoPMJutKZmLQ8=",
+        "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "bb44921534a9cee9635304fdb876c1b3ec3a8f61",
+        "rev": "2d2fb547178ec025da643db57d40a971507b82fe",
         "type": "github"
       },
       "original": {
@@ -1659,11 +1627,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713214484,
+        "lastModified": 1709299639,
-        "narHash": "sha256-h1bSIsDuPk1FGgvTuSHJyiU2Glu7oAyoPMJutKZmLQ8=",
+        "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "bb44921534a9cee9635304fdb876c1b3ec3a8f61",
+        "rev": "2d2fb547178ec025da643db57d40a971507b82fe",
         "type": "github"
       },
       "original": {
@@ -1679,11 +1647,11 @@
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1713309288,
+        "lastModified": 1713108842,
-        "narHash": "sha256-mpgkeLDvqq048AJnnk95WEyk/PjfBOgSIlJQSl+zQSQ=",
+        "narHash": "sha256-lbhHIQOvYBv1ZnDHIfXqcksgCrOJa9219vRgribq/+4=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "1d15fd96c537a7e507c2271a274ee9e8e045aa40",
+        "rev": "64c5e854578b04907717b0f6b3e5e5246d6fd236",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,71 +1,9 @@
 {
   description = "snowflake";
 
-  outputs = inputs:
-    inputs.flake-parts.lib.mkFlake {inherit inputs;} {
-      imports = [
-        inputs.pre-commit-hooks.flakeModule
-        ./hosts
-        ./hosts/deploy.nix
-        ./home/profiles
-      ];
-      systems = ["x86_64-linux"];
-      perSystem = {
-        config,
-        pkgs,
-        ...
-      }: {
-        pre-commit = {
-          check.enable = true;
-          settings = {
-            excludes = ["flake.lock"];
-            hooks = {
-              stylua.enable = true;
-              statix.enable = true;
-              alejandra.enable = true;
-              deadnix = {
-                enable = true;
-                excludes = ["overlays.nix"];
-              };
-              prettier = {
-                enable = true;
-                files = "\\.(js|ts|md|json)$";
-                settings = {
-                  trailing-comma = "none";
-                };
-              };
-            };
-          };
-        };
-        devShells.default = pkgs.mkShell {
-          name = "snowflake";
-          shellHook = config.pre-commit.installationScript;
-          packages = with pkgs; [
-            git
-            sops
-            alejandra
-            yaml-language-server
-            lua-language-server
-          ];
-        };
-        formatter = pkgs.alejandra;
-      };
-    };
-
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-
     hyprland.url = "github:hyprwm/Hyprland";
-    hypridle.url = "github:hyprwm/hypridle";
-    hyprlock.url = "github:hyprwm/hyprlock";
-    hyprpicker.url = "github:hyprwm/hyprpicker";
-    hyprcursor.url = "github:hyprwm/hyprcursor";
-    xdg-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland";
-    hyprland-plugins = {
-      url = "github:hyprwm/hyprland-plugins";
-      inputs.hyprland.follows = "hyprland";
-    };
-
     ags.url = "github:Aylur/ags";
     nix-gaming.url = "github:fufexan/nix-gaming";
     attic.url = "github:zhaofengli/attic";
@@ -74,9 +12,17 @@
     helix.url = "github:helix-editor/helix";
     pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
     wezterm.url = "github:notohh/wezterm?dir=nix&ref=nix-add-overlay";
+    hypridle.url = "github:hyprwm/hypridle";
+    hyprlock.url = "github:hyprwm/hyprlock";
+    hyprpicker.url = "github:hyprwm/hyprpicker";
+    hyprcursor.url = "github:hyprwm/hyprcursor";
+    xdg-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     atuin.url = "github:atuinsh/atuin";
-    flake-parts.url = "github:hercules-ci/flake-parts";
+    hyprland-plugins = {
+      url = "github:hyprwm/hyprland-plugins";
+      inputs.hyprland.follows = "hyprland";
+    };
     deploy-rs = {
       url = "github:serokell/deploy-rs";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -93,9 +39,58 @@
       url = "github:Mic92/nix-index-database";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nh = {
+      url = "github:viperML/nh";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     anyrun = {
       url = "github:Kirottu/anyrun";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
+  outputs = {
+    self,
+    nixpkgs,
+    pre-commit-hooks,
+    ...
+  } @ inputs: let
+    system = "x86_64-linux";
+    pkgs = import nixpkgs {
+      inherit system;
+    };
+  in {
+    checks = {
+      pre-commit-check = pre-commit-hooks.lib.${system}.run {
+        src = ./.;
+        hooks = {
+          stylua.enable = true;
+          eslint.enable = true;
+          statix.enable = true;
+          alejandra.enable = true;
+          deadnix = {
+            enable = true;
+            excludes = ["overlays.nix"];
+          };
+          prettier = {
+            enable = true;
+            files = "\\.(js|ts|md|json)$";
+          };
+        };
+      };
+    };
+    devShells.${system}.default = pkgs.mkShell {
+      name = "snowflake";
+      inherit (self.checks.pre-commit-check) shellHook;
+      packages = with pkgs; [
+        git
+        sops
+        alejandra
+        yaml-language-server
+        lua-language-server
+      ];
+    };
+    formatter.${system} = pkgs.alejandra;
+    deploy = import ./hosts/deploy.nix inputs;
+    nixosConfigurations = import ./hosts inputs;
+  };
 }

home/ags/config/import.js

@@ -19,5 +19,5 @@ export {
   SystemTray,
   Utils,
   Variable,
-  Widget
+  Widget,
 };

home/ags/config/js/widgets/images/image.js

@@ -2,7 +2,8 @@ import { Widget } from "../../../import.js";
 
 const nixosLogo = () =>
   Widget.Icon({
-    icon: "/home/notoh/snowflake/home/ags/config/js/widgets/images/static/nixos.png"
+    icon:
+      "/home/notoh/snowflake/home/ags/config/js/widgets/images/static/nixos.png",
   });
 
 export { nixosLogo };

home/ags/default.nix

@@ -3,7 +3,7 @@
   config,
   ...
 }: let
-  configDir = "/home/notoh/snowflake/home/programs/ags/config";
+  configDir = "/home/notoh/snowflake/home/ags/config";
 in {
   programs.ags = {
     enable = true;

home/default.nix

@@ -1,25 +1,14 @@
 {pkgs, ...}: {
-  systemd.user.startServices = "sd-switch";
-  programs.home-manager.enable = true;
-
   imports = [
-    ./programs/editors/helix
+    ./helix
-    ./programs/terminal/lazygit
+    ./neofetch
-    ./programs/terminal/neofetch
+    ./nushell
-    ./programs/terminal/nushell
+    ./starship
-    ./programs/terminal/yazi
+    ./lazygit
-    ./programs/terminal/atuin.nix
+    ./yazi
-    ./programs/terminal/bat.nix
-    ./programs/terminal/starship.nix
-    ./programs/terminal/zoxide.nix
-    ./programs/direnv.nix
-    ./programs/git.nix
   ];
 
-  home = {
+  home.packages = with pkgs; [
-    username = "notoh";
-    homeDirectory = "/home/notoh";
-    packages = with pkgs; [
     wget
     croc
     eza
@@ -40,6 +29,60 @@
     p7zip
     procs
   ];
-    stateVersion = "23.05";
+
+  services = {
+    gpg-agent = {
+      enable = true;
+      defaultCacheTtl = 3600;
+      pinentryPackage = pkgs.pinentry-curses;
+      enableSshSupport = true;
+      enableNushellIntegration = true;
+    };
+  };
+
+  programs = {
+    bat.enable = true;
+    atuin = {
+      enable = true;
+      enableNushellIntegration = true;
+      settings = {
+        auto_sync = true;
+        update_check = true;
+        sync_frequency = "1h";
+        sync_address = "http://100.104.42.96:8888";
+        secrets_filter = true;
+        style = "full";
+      };
+      flags = ["--disable-up-arrow"];
+    };
+    git = {
+      enable = true;
+      delta.enable = true;
+      userEmail = "github@notohh.dev";
+      userName = "notohh";
+      signing = {
+        key = "BD47506D475EE86D";
+        signByDefault = true;
+      };
+      ignores = ["*result*" ".direnv" "node_modules"];
+    };
+    gh = {
+      enable = true;
+      gitCredentialHelper.enable = true;
+      settings = {
+        editor = "hx";
+        prompt = "enabled";
+      };
+    };
+    direnv = {
+      enable = true;
+      enableNushellIntegration = true;
+      nix-direnv.enable = true;
+    };
+    zoxide = {
+      enable = true;
+      enableNushellIntegration = true;
+      options = ["--cmd cdd"];
+    };
   };
 }

home/firefox/user.js/betterfox.js

@@ -63,14 +63,8 @@ user_pref("dom.security.sanitizer.enabled", true);
 ****************************************************************************/
 /** TRACKING PROTECTION ***/
 user_pref("browser.contentblocking.category", "strict");
-user_pref(
+user_pref("urlclassifier.trackingSkipURLs", "*.reddit.com, *.twitter.com, *.twimg.com, *.tiktok.com");
-  "urlclassifier.trackingSkipURLs",
+user_pref("urlclassifier.features.socialtracking.skipURLs", "*.instagram.com, *.twitter.com, *.twimg.com");
-  "*.reddit.com, *.twitter.com, *.twimg.com, *.tiktok.com"
-);
-user_pref(
-  "urlclassifier.features.socialtracking.skipURLs",
-  "*.instagram.com, *.twitter.com, *.twimg.com"
-);
 user_pref("network.cookie.sameSite.noneRequiresSecure", true);
 user_pref("browser.download.start_downloads_in_tmp_dir", true);
 user_pref("browser.helperApps.deleteTempFileOnExit", true);
@@ -143,10 +137,7 @@ user_pref("browser.safebrowsing.downloads.remote.enabled", false);
 /** MOZILLA ***/
 user_pref("permissions.default.desktop-notification", 2);
 user_pref("permissions.default.geo", 2);
-user_pref(
+user_pref("geo.provider.network.url", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
-  "geo.provider.network.url",
-  "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"
-);
 user_pref("permissions.manager.defaultsUrl", "");
 user_pref("webchannel.allowObject.urlWhitelist", "");
 
@@ -193,14 +184,8 @@ user_pref("extensions.getAddons.showPane", false);
 user_pref("extensions.htmlaboutaddons.recommendations.enabled", false);
 user_pref("browser.discovery.enabled", false);
 user_pref("browser.shell.checkDefaultBrowser", false);
-user_pref(
+user_pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons", false);
-  "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons",
+user_pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features", false);
-  false
-);
-user_pref(
-  "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features",
-  false
-);
 user_pref("browser.preferences.moreFromMozilla", false);
 user_pref("browser.tabs.tabmanager.enabled", false);
 user_pref("browser.aboutConfig.showWarning", false);

home/gtk/catppuccin-red.nix

@@ -0,0 +1,21 @@
+{pkgs, ...}: {
+  home.pointerCursor = {
+    package = pkgs.bibata-cursors;
+    name = "Bibata-Modern-Classic";
+    size = 24;
+    gtk.enable = true;
+    x11.enable = true;
+  };
+
+  gtk = {
+    enable = true;
+    theme = {
+      name = "Catppuccin-Mocha-Standard-Red-Dark";
+      package = pkgs.catppuccin-gtk.override {
+        accents = ["red"];
+        size = "standard";
+        variant = "mocha";
+      };
+    };
+  };
+}

home/profiles/default.nix

@@ -1,48 +0,0 @@
-# stolen from fufexan
-{
-  self,
-  inputs,
-  ...
-}: let
-  extraSpecialArgs = {inherit inputs self;};
-
-  homeImports = {
-    "notoh@tsuki" = [
-      ../.
-      ./tsuki
-    ];
-    "notoh@ame" = [
-      ../.
-      ./ame
-    ];
-    default = [
-      ../.
-      ./default
-    ];
-  };
-
-  inherit (inputs.hm.lib) homeManagerConfiguration;
-
-  pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
-in {
-  _module.args = {inherit homeImports;};
-
-  flake = {
-    homeConfigurations = {
-      "notoh_tsuki" = homeManagerConfiguration {
-        modules = homeImports."notoh@tsuki";
-        inherit pkgs extraSpecialArgs;
-      };
-
-      "notoh_ame" = homeManagerConfiguration {
-        modules = homeImports."notoh@ame";
-        inherit pkgs extraSpecialArgs;
-      };
-
-      default = homeManagerConfiguration {
-        modules = homeImports.default;
-        inherit pkgs extraSpecialArgs;
-      };
-    };
-  };
-}

home/profiles/default/default.nix

@@ -1,4 +0,0 @@
-{
-  imports = [
-  ];
-}

home/programs/browsers/chromium/default.nix

@@ -1,5 +0,0 @@
-_: {
-  programs.chromium = {
-    enable = true;
-  };
-}

home/programs/browsers/firefox/user.js/.prettierrc.json

@@ -1,3 +0,0 @@
-{
-  "trailingComma": "none"
-}

home/programs/direnv.nix

@@ -1,7 +0,0 @@
-_: {
-  programs.direnv = {
-    enable = true;
-    enableNushellIntegration = true;
-    nix-direnv.enable = true;
-  };
-}

home/programs/git.nix

@@ -1,23 +0,0 @@
-_: {
-  programs = {
-    git = {
-      enable = true;
-      delta.enable = true;
-      userEmail = "github@notohh.dev";
-      userName = "notohh";
-      signing = {
-        key = "BD47506D475EE86D";
-        signByDefault = true;
-      };
-      ignores = ["*result*" ".direnv" "node_modules"];
-    };
-    gh = {
-      enable = true;
-      gitCredentialHelper.enable = true;
-      settings = {
-        editor = "hx";
-        prompt = "enabled";
-      };
-    };
-  };
-}

home/programs/terminal/atuin.nix

@@ -1,15 +0,0 @@
-_: {
-  programs.atuin = {
-    enable = true;
-    enableNushellIntegration = true;
-    settings = {
-      auto_sync = true;
-      update_check = true;
-      sync_frequency = "1h";
-      sync_address = "http://100.104.42.96:8888";
-      secrets_filter = true;
-      style = "full";
-    };
-    flags = ["--disable-up-arrow"];
-  };
-}

home/programs/terminal/bat.nix

@@ -1,3 +0,0 @@
-_: {
-  programs.bat.enable = true;
-}

home/programs/terminal/zoxide.nix

@@ -1,7 +0,0 @@
-_: {
-  programs.zoxide = {
-    enable = true;
-    enableNushellIntegration = true;
-    options = ["--cmd cdd"];
-  };
-}

home/services/default.nix

@@ -1,3 +0,0 @@
-{
-  imports = [./gpg.nix];
-}

home/services/gpg.nix

@@ -1,11 +0,0 @@
-{pkgs, ...}: {
-  services = {
-    gpg-agent = {
-      enable = true;
-      defaultCacheTtl = 3600;
-      pinentryPackage = pkgs.pinentry-curses;
-      enableSshSupport = true;
-      enableNushellIntegration = true;
-    };
-  };
-}

hosts/ame/home.nix

@@ -1,29 +1,26 @@
-{
+{pkgs, ...}: {
-  inputs,
-  pkgs,
-  ...
-}: {
   imports = [
-    inputs.hyprland.homeManagerModules.default
+    ../../home
-    inputs.anyrun.homeManagerModules.default
+    ../../home/anyrun
-    inputs.ags.homeManagerModules.default
+    ../../home/firefox
-    inputs.nix-index-database.hmModules.nix-index
+    ../../home/wezterm
-    ../../services
+    ../../home/zathura
-    ../../programs/ags
+    ../../home/zellij
-    ../../programs/anyrun
+    ../../home/mako
-    ../../programs/browsers/firefox
+    ../../home/gtk/catppuccin-red.nix
-    ../../programs/browsers/chromium
-    ../../programs/terminal/wezterm
-    ../../programs/terminal/zellij
-    ../../programs/gtk.nix
-    ../../programs/media/cava.nix
-    ../../programs/mako.nix
-    ../../programs/media/spotify-player.nix
-    ../../programs/media/zathura.nix
   ];
 
-  home.packages = with pkgs; [
+  systemd.user.startServices = "sd-switch";
+  programs.home-manager.enable = true;
+
+  home = {
+    username = "notoh";
+    homeDirectory = "/home/notoh";
+    packages = with pkgs; [
+      chromium
       discord
+      spotify-player
+      cinny-desktop
       pavucontrol
       imv
       mpv
@@ -38,8 +35,10 @@
       wl-clipboard
       swww
       hyprpicker
-    (libsForQt5.callPackage ../../../pkgs/chatterino7 {})
+      (libsForQt5.callPackage ../../pkgs/chatterino7 {})
     ];
+    stateVersion = "23.05";
+  };
   programs.ssh = {
     enable = true;
     extraConfig = ''

hosts/arashi/home.nix

@@ -0,0 +1,14 @@
+{...}: {
+  imports = [
+    ../../home
+  ];
+
+  systemd.user.startServices = "sd-switch";
+  programs.home-manager.enable = true;
+
+  home = {
+    username = "notoh";
+    homeDirectory = "/home/notoh";
+    stateVersion = "23.05";
+  };
+}

hosts/default.nix

@@ -1,19 +1,21 @@
-{
+inputs: let
-  inputs,
+  system = "x86_64-linux";
-  homeImports,
-  ...
-}: {
-  flake.nixosConfigurations = let
-    inherit (inputs.nixpkgs.lib) nixosSystem;
-    specialArgs = {inherit inputs;};
   sopsModule = inputs.sops-nix.nixosModules.sops;
   hmModule = inputs.home-manager.nixosModules.home-manager;
+  hyprlandModule = inputs.hyprland.homeManagerModules.default;
+  nix-index-Module = inputs.nix-index-database.hmModules.nix-index;
+  anyrunModule = inputs.anyrun.homeManagerModules.default;
+  agsModule = inputs.ags.homeManagerModules.default;
   atticModule = inputs.attic.nixosModules.atticd;
   nurModule = inputs.nur.nixosModules.nur;
+  hypridleModule = inputs.hypridle.homeManagerModules.default;
+  hyprlockModule = inputs.hyprlock.homeManagerModules.default;
   t480Module = inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t480;
+  inherit (inputs.nixpkgs.lib) nixosSystem;
 in {
   tsuki = nixosSystem {
-      inherit specialArgs;
+    inherit system;
+    specialArgs = {inherit inputs;};
     modules = [
       ./tsuki
       sopsModule
@@ -24,16 +26,88 @@
         home-manager = {
           useGlobalPkgs = true;
           useUserPackages = true;
-            extraSpecialArgs = specialArgs;
+          extraSpecialArgs = {inherit inputs;};
           users.notoh = {
-              imports = homeImports."notoh@tsuki";
+            imports = [
+              ./tsuki/home.nix
+              hyprlandModule
+              nix-index-Module
+              anyrunModule
+              agsModule
+              hypridleModule
+              hyprlockModule
+            ];
+          };
+        };
+      }
+    ];
+  };
+  sakura = nixosSystem {
+    inherit system;
+    specialArgs = {inherit inputs;};
+    modules = [
+      ./sakura
+      sopsModule
+      hmModule
+      {
+        home-manager = {
+          useGlobalPkgs = true;
+          useUserPackages = true;
+          extraSpecialArgs = {inherit inputs;};
+          users.notoh = {
+            imports = [
+              ./sakura/home.nix
+            ];
+          };
+        };
+      }
+    ];
+  };
+  kariru = nixosSystem {
+    inherit system;
+    specialArgs = {inherit inputs;};
+    modules = [
+      ./kariru
+      sopsModule
+      hmModule
+      {
+        home-manager = {
+          useGlobalPkgs = true;
+          useUserPackages = true;
+          extraSpecialArgs = {inherit inputs;};
+          users.notoh = {
+            imports = [
+              ./kariru/home.nix
+            ];
+          };
+        };
+      }
+    ];
+  };
+  yuki = nixosSystem {
+    inherit system;
+    specialArgs = {inherit inputs;};
+    modules = [
+      ./yuki
+      sopsModule
+      hmModule
+      {
+        home-manager = {
+          useGlobalPkgs = true;
+          useUserPackages = true;
+          extraSpecialArgs = {inherit inputs;};
+          users.notoh = {
+            imports = [
+              ./yuki/home.nix
+            ];
           };
         };
       }
     ];
   };
   ame = nixosSystem {
-      inherit specialArgs;
+    inherit system;
+    specialArgs = {inherit inputs;};
     modules = [
       ./ame
       sopsModule
@@ -43,70 +117,21 @@
         home-manager = {
           useGlobalPkgs = true;
           useUserPackages = true;
-            extraSpecialArgs = specialArgs;
+          extraSpecialArgs = {inherit inputs;};
           users.notoh = {
-              imports = homeImports."notoh@ame";
+            imports = [
-            };
+              ./ame/home.nix
-          };
+              anyrunModule
-        }
+              agsModule
             ];
           };
-    sakura = nixosSystem {
-      inherit specialArgs;
-      modules = [
-        ./sakura
-        sopsModule
-        hmModule
-        {
-          home-manager = {
-            useGlobalPkgs = true;
-            useUserPackages = true;
-            extraSpecialArgs = specialArgs;
-            users.notoh = {
-              imports = homeImports."default";
-            };
-          };
-        }
-      ];
-    };
-    kariru = nixosSystem {
-      inherit specialArgs;
-      modules = [
-        ./kariru
-        sopsModule
-        hmModule
-        {
-          home-manager = {
-            useGlobalPkgs = true;
-            useUserPackages = true;
-            extraSpecialArgs = specialArgs;
-            users.notoh = {
-              imports = homeImports."default";
-            };
-          };
-        }
-      ];
-    };
-    yuki = nixosSystem {
-      inherit specialArgs;
-      modules = [
-        ./yuki
-        sopsModule
-        hmModule
-        {
-          home-manager = {
-            useGlobalPkgs = true;
-            useUserPackages = true;
-            extraSpecialArgs = specialArgs;
-            users.notoh = {
-              imports = homeImports."default";
-            };
         };
       }
     ];
   };
   arashi = nixosSystem {
-      inherit specialArgs;
+    inherit system;
+    specialArgs = {inherit inputs;};
     modules = [
       ./arashi
       sopsModule
@@ -115,16 +140,19 @@
         home-manager = {
           useGlobalPkgs = true;
           useUserPackages = true;
-            extraSpecialArgs = specialArgs;
+          extraSpecialArgs = {inherit inputs;};
           users.notoh = {
-              imports = homeImports."default";
+            imports = [
+              ./arashi/home.nix
+            ];
           };
         };
       }
     ];
   };
   sora = nixosSystem {
-      inherit specialArgs;
+    inherit system;
+    specialArgs = {inherit inputs;};
     modules = [
       ./sora
       sopsModule
@@ -134,16 +162,19 @@
         home-manager = {
           useGlobalPkgs = true;
           useUserPackages = true;
-            extraSpecialArgs = specialArgs;
+          extraSpecialArgs = {inherit inputs;};
           users.notoh = {
-              imports = homeImports."default";
+            imports = [
+              ./sora/home.nix
+            ];
           };
         };
       }
     ];
   };
   tsuru = nixosSystem {
-      inherit specialArgs;
+    inherit system;
+    specialArgs = {inherit inputs;};
     modules = [
       ./tsuru
       sopsModule
@@ -152,16 +183,19 @@
         home-manager = {
           useGlobalPkgs = true;
           useUserPackages = true;
-            extraSpecialArgs = specialArgs;
+          extraSpecialArgs = {inherit inputs;};
           users.notoh = {
-              imports = homeImports."default";
+            imports = [
+              ./tsuru/home.nix
+            ];
           };
         };
       }
     ];
   };
   haru = nixosSystem {
-      inherit specialArgs;
+    inherit system;
+    specialArgs = {inherit inputs;};
     modules = [
       ./haru
       sopsModule
@@ -170,16 +204,19 @@
         home-manager = {
           useGlobalPkgs = true;
           useUserPackages = true;
-            extraSpecialArgs = specialArgs;
+          extraSpecialArgs = {inherit inputs;};
           users.notoh = {
-              imports = homeImports."default";
+            imports = [
+              ./haru/home.nix
+            ];
           };
         };
       }
     ];
   };
   kaze = nixosSystem {
-      inherit specialArgs;
+    inherit system;
+    specialArgs = {inherit inputs;};
     modules = [
       ./kaze
       sopsModule
@@ -188,13 +225,14 @@
         home-manager = {
           useGlobalPkgs = true;
           useUserPackages = true;
-            extraSpecialArgs = specialArgs;
+          extraSpecialArgs = {inherit inputs;};
           users.notoh = {
-              imports = homeImports."default";
+            imports = [
+              ./kaze/home.nix
+            ];
           };
         };
       }
     ];
   };
-  };
 }

hosts/deploy.nix

@@ -1,5 +1,4 @@
-{inputs, ...}: {
+inputs: {
-  flake.deploy = {
   nodes = with inputs.deploy-rs.lib.x86_64-linux; {
     sakura = {
       hostname = "100.121.201.47";
@@ -82,5 +81,4 @@
       magicRollback = true;
     };
   };
-  };
 }

hosts/haru/home.nix

@@ -0,0 +1,14 @@
+{...}: {
+  imports = [
+    ../../home
+  ];
+
+  systemd.user.startServices = "sd-switch";
+  programs.home-manager.enable = true;
+
+  home = {
+    username = "notoh";
+    homeDirectory = "/home/notoh";
+    stateVersion = "23.05";
+  };
+}

hosts/kariru/home.nix

@@ -0,0 +1,14 @@
+{...}: {
+  imports = [
+    ../../home
+  ];
+
+  systemd.user.startServices = "sd-switch";
+  programs.home-manager.enable = true;
+
+  home = {
+    username = "notoh";
+    homeDirectory = "/home/notoh";
+    stateVersion = "23.05";
+  };
+}

hosts/kaze/home.nix

@@ -0,0 +1,14 @@
+{...}: {
+  imports = [
+    ../../home
+  ];
+
+  systemd.user.startServices = "sd-switch";
+  programs.home-manager.enable = true;
+
+  home = {
+    username = "notoh";
+    homeDirectory = "/home/notoh";
+    stateVersion = "23.05";
+  };
+}

hosts/sakura/home.nix

@@ -0,0 +1,14 @@
+{...}: {
+  imports = [
+    ../../home
+  ];
+
+  systemd.user.startServices = "sd-switch";
+  programs.home-manager.enable = true;
+
+  home = {
+    username = "notoh";
+    homeDirectory = "/home/notoh";
+    stateVersion = "23.05";
+  };
+}

hosts/sora/hardware.nix

@@ -1,8 +1,4 @@
-{
+{modulesPath, ...}: {
-  modulesPath,
-  lib,
-  ...
-}: {
   imports = [(modulesPath + "/profiles/qemu-guest.nix")];
 
   zramSwap.enable = true;
@@ -30,5 +26,4 @@
       fsType = "vfat";
     };
   };
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }

hosts/sora/home.nix

@@ -0,0 +1,14 @@
+{...}: {
+  imports = [
+    ../../home
+  ];
+
+  systemd.user.startServices = "sd-switch";
+  programs.home-manager.enable = true;
+
+  home = {
+    username = "notoh";
+    homeDirectory = "/home/notoh";
+    stateVersion = "23.05";
+  };
+}

hosts/tsuki/home.nix

@@ -4,32 +4,32 @@
   ...
 }: {
   imports = [
-    inputs.hyprland.homeManagerModules.default
+    ../../home
-    inputs.anyrun.homeManagerModules.default
+    ../../home/firefox
-    inputs.ags.homeManagerModules.default
+    ../../home/ags
-    inputs.hypridle.homeManagerModules.default
+    ../../home/anyrun
-    inputs.hyprlock.homeManagerModules.default
+    ../../home/cava
-    inputs.nix-index-database.hmModules.nix-index
+    ../../home/wezterm
-    ../../services
+    ../../home/zathura
-    ../../programs/ags
+    ../../home/gtk
-    ../../programs/anyrun
+    ../../home/mako
-    ../../programs/browsers/firefox
+    ../../home/zellij
-    ../../programs/browsers/chromium
+    ../../home/spotify-player
-    ../../programs/terminal/wezterm
+    ../../home/wayland/hyprland
-    ../../programs/terminal/zellij
+    ../../home/wayland/services/hypridle.nix
-    ../../programs/gtk.nix
+    ../../home/wayland/programs/hyprlock.nix
-    ../../programs/media/cava.nix
-    ../../programs/mako.nix
-    ../../programs/media/spotify-player.nix
-    ../../programs/media/zathura.nix
-    ../../wayland/hyprland
-    ../../wayland/services/hypridle.nix
-    ../../wayland/programs/hyprlock.nix
   ];
 
-  home.packages = with pkgs; [
+  systemd.user.startServices = "sd-switch";
+  programs.home-manager.enable = true;
+
+  home = {
+    username = "notoh";
+    homeDirectory = "/home/notoh";
+    packages = with pkgs; [
+      chromium
       discord
-    signal-desktop
+      cinny-desktop
       thunderbird
       obs-studio
       pavucontrol
@@ -56,9 +56,11 @@
       prismlauncher
       stellarium
       inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin
-    (libsForQt5.callPackage ../../../pkgs/chatterino7 {})
+      (libsForQt5.callPackage ../../pkgs/chatterino7 {})
-    (callPackage ../../../pkgs/jellyfin-rpc {})
+      (callPackage ../../pkgs/jellyfin-rpc {})
     ];
+    stateVersion = "23.05";
+  };
 
   programs.ssh = {
     enable = true;

hosts/tsuru/home.nix

@@ -0,0 +1,14 @@
+{...}: {
+  imports = [
+    ../../home
+  ];
+
+  systemd.user.startServices = "sd-switch";
+  programs.home-manager.enable = true;
+
+  home = {
+    username = "notoh";
+    homeDirectory = "/home/notoh";
+    stateVersion = "23.05";
+  };
+}

hosts/yuki/home.nix

@@ -0,0 +1,14 @@
+{...}: {
+  imports = [
+    ../../home
+  ];
+
+  systemd.user.startServices = "sd-switch";
+  programs.home-manager.enable = true;
+
+  home = {
+    username = "notoh";
+    homeDirectory = "/home/notoh";
+    stateVersion = "23.05";
+  };
+}

modules/default.nix

@@ -1,5 +1,6 @@
-_: {
+{inputs, ...}: {
   imports = [
+    inputs.nh.nixosModules.default
     ./prometheus.nix
     ./security.nix
     ./users.nix

modules/nix.nix

@@ -5,7 +5,6 @@
       inputs.helix.overlays.default
       inputs.yazi.overlays.default
       inputs.wezterm.overlays.default
-      inputs.hyprland.overlays.default
       inputs.hypridle.overlays.default
       inputs.hyprlock.overlays.default
       inputs.hyprpicker.overlays.default
@@ -21,7 +20,7 @@
     };
   };
 
-  programs.nh = {
+  nh = {
     enable = true;
     clean = {
       enable = true;