Merge pull request 'treewide: refactor to use flake-parts' (#39) from refactor-flake-parts into master

Reviewed-on: #39

flake.lock

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

flake.nix

@@ -1,9 +1,71 @@
 {
   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";
@@ -12,17 +74,9 @@
     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";
-    hyprland-plugins = {
+    flake-parts.url = "github:hercules-ci/flake-parts";
-      url = "github:hyprwm/hyprland-plugins";
-      inputs.hyprland.follows = "hyprland";
-    };
     deploy-rs = {
       url = "github:serokell/deploy-rs";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -39,58 +93,9 @@
       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/default.nix

@@ -1,14 +1,25 @@
 {pkgs, ...}: {
+  systemd.user.startServices = "sd-switch";
+  programs.home-manager.enable = true;
+
   imports = [
-    ./helix
+    ./programs/editors/helix
-    ./neofetch
+    ./programs/terminal/lazygit
-    ./nushell
+    ./programs/terminal/neofetch
-    ./starship
+    ./programs/terminal/nushell
-    ./lazygit
+    ./programs/terminal/yazi
-    ./yazi
+    ./programs/terminal/atuin.nix
+    ./programs/terminal/bat.nix
+    ./programs/terminal/starship.nix
+    ./programs/terminal/zoxide.nix
+    ./programs/direnv.nix
+    ./programs/git.nix
   ];
 
-  home.packages = with pkgs; [
+  home = {
+    username = "notoh";
+    homeDirectory = "/home/notoh";
+    packages = with pkgs; [
       wget
       croc
       eza
@@ -29,60 +40,6 @@
       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/gtk/catppuccin-red.nix

@@ -1,21 +0,0 @@
-{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/ame/default.nix

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

home/profiles/default.nix

@@ -0,0 +1,48 @@
+# 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

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

home/profiles/tsuki/default.nix

@@ -4,32 +4,32 @@
   ...
 }: {
   imports = [
-    ../../home
+    inputs.hyprland.homeManagerModules.default
-    ../../home/firefox
+    inputs.anyrun.homeManagerModules.default
-    ../../home/ags
+    inputs.ags.homeManagerModules.default
-    ../../home/anyrun
+    inputs.hypridle.homeManagerModules.default
-    ../../home/cava
+    inputs.hyprlock.homeManagerModules.default
-    ../../home/wezterm
+    inputs.nix-index-database.hmModules.nix-index
-    ../../home/zathura
+    ../../services
-    ../../home/gtk
+    ../../programs/ags
-    ../../home/mako
+    ../../programs/anyrun
-    ../../home/zellij
+    ../../programs/browsers/firefox
-    ../../home/spotify-player
+    ../../programs/browsers/chromium
-    ../../home/wayland/hyprland
+    ../../programs/terminal/wezterm
-    ../../home/wayland/services/hypridle.nix
+    ../../programs/terminal/zellij
-    ../../home/wayland/programs/hyprlock.nix
+    ../../programs/gtk.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
   ];
 
-  systemd.user.startServices = "sd-switch";
+  home.packages = with pkgs; [
-  programs.home-manager.enable = true;
-
-  home = {
-    username = "notoh";
-    homeDirectory = "/home/notoh";
-    packages = with pkgs; [
-      chromium
     discord
-      cinny-desktop
+    signal-desktop
     thunderbird
     obs-studio
     pavucontrol
@@ -56,11 +56,9 @@
     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;

home/programs/ags/config/import.js

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

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

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

home/programs/ags/default.nix

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

home/programs/browsers/chromium/default.nix

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

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

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

home/programs/browsers/firefox/user.js/betterfox.js

@@ -63,8 +63,14 @@ user_pref("dom.security.sanitizer.enabled", true);
  ****************************************************************************/
 /** TRACKING PROTECTION ***/
 user_pref("browser.contentblocking.category", "strict");
-user_pref("urlclassifier.trackingSkipURLs", "*.reddit.com, *.twitter.com, *.twimg.com, *.tiktok.com");
+user_pref(
-user_pref("urlclassifier.features.socialtracking.skipURLs", "*.instagram.com, *.twitter.com, *.twimg.com");
+  "urlclassifier.trackingSkipURLs",
+  "*.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);
@@ -137,7 +143,10 @@ user_pref("browser.safebrowsing.downloads.remote.enabled", false);
 /** MOZILLA ***/
 user_pref("permissions.default.desktop-notification", 2);
 user_pref("permissions.default.geo", 2);
-user_pref("geo.provider.network.url", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
+user_pref(
+  "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", "");
 
@@ -184,8 +193,14 @@ 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("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons", false);
+user_pref(
-user_pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features", false);
+  "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons",
+  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/programs/direnv.nix

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

home/programs/git.nix

@@ -0,0 +1,23 @@
+_: {
+  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

@@ -0,0 +1,15 @@
+_: {
+  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

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

home/programs/terminal/zoxide.nix

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

home/services/default.nix

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

home/services/gpg.nix

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

hosts/arashi/home.nix

@@ -1,14 +0,0 @@
-{...}: {
-  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,21 +1,19 @@
-inputs: let
+{
-  system = "x86_64-linux";
+  inputs,
+  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 system;
+      inherit specialArgs;
-    specialArgs = {inherit inputs;};
       modules = [
         ./tsuki
         sopsModule
@@ -26,88 +24,16 @@ in {
           home-manager = {
             useGlobalPkgs = true;
             useUserPackages = true;
-          extraSpecialArgs = {inherit inputs;};
+            extraSpecialArgs = specialArgs;
             users.notoh = {
-            imports = [
+              imports = homeImports."notoh@tsuki";
-              ./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 system;
+      inherit specialArgs;
-    specialArgs = {inherit inputs;};
       modules = [
         ./ame
         sopsModule
@@ -117,21 +43,70 @@ in {
           home-manager = {
             useGlobalPkgs = true;
             useUserPackages = true;
-          extraSpecialArgs = {inherit inputs;};
+            extraSpecialArgs = specialArgs;
             users.notoh = {
-            imports = [
+              imports = homeImports."notoh@ame";
-              ./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 system;
+      inherit specialArgs;
-    specialArgs = {inherit inputs;};
       modules = [
         ./arashi
         sopsModule
@@ -140,19 +115,16 @@ in {
           home-manager = {
             useGlobalPkgs = true;
             useUserPackages = true;
-          extraSpecialArgs = {inherit inputs;};
+            extraSpecialArgs = specialArgs;
             users.notoh = {
-            imports = [
+              imports = homeImports."default";
-              ./arashi/home.nix
-            ];
             };
           };
         }
       ];
     };
     sora = nixosSystem {
-    inherit system;
+      inherit specialArgs;
-    specialArgs = {inherit inputs;};
       modules = [
         ./sora
         sopsModule
@@ -162,19 +134,16 @@ in {
           home-manager = {
             useGlobalPkgs = true;
             useUserPackages = true;
-          extraSpecialArgs = {inherit inputs;};
+            extraSpecialArgs = specialArgs;
             users.notoh = {
-            imports = [
+              imports = homeImports."default";
-              ./sora/home.nix
-            ];
             };
           };
         }
       ];
     };
     tsuru = nixosSystem {
-    inherit system;
+      inherit specialArgs;
-    specialArgs = {inherit inputs;};
       modules = [
         ./tsuru
         sopsModule
@@ -183,19 +152,16 @@ in {
           home-manager = {
             useGlobalPkgs = true;
             useUserPackages = true;
-          extraSpecialArgs = {inherit inputs;};
+            extraSpecialArgs = specialArgs;
             users.notoh = {
-            imports = [
+              imports = homeImports."default";
-              ./tsuru/home.nix
-            ];
             };
           };
         }
       ];
     };
     haru = nixosSystem {
-    inherit system;
+      inherit specialArgs;
-    specialArgs = {inherit inputs;};
       modules = [
         ./haru
         sopsModule
@@ -204,19 +170,16 @@ in {
           home-manager = {
             useGlobalPkgs = true;
             useUserPackages = true;
-          extraSpecialArgs = {inherit inputs;};
+            extraSpecialArgs = specialArgs;
             users.notoh = {
-            imports = [
+              imports = homeImports."default";
-              ./haru/home.nix
-            ];
             };
           };
         }
       ];
     };
     kaze = nixosSystem {
-    inherit system;
+      inherit specialArgs;
-    specialArgs = {inherit inputs;};
       modules = [
         ./kaze
         sopsModule
@@ -225,14 +188,13 @@ in {
           home-manager = {
             useGlobalPkgs = true;
             useUserPackages = true;
-          extraSpecialArgs = {inherit inputs;};
+            extraSpecialArgs = specialArgs;
             users.notoh = {
-            imports = [
+              imports = homeImports."default";
-              ./kaze/home.nix
-            ];
             };
           };
         }
       ];
     };
+  };
 }

hosts/deploy.nix

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

hosts/haru/home.nix

@@ -1,14 +0,0 @@
-{...}: {
-  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

@@ -1,14 +0,0 @@
-{...}: {
-  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

@@ -1,14 +0,0 @@
-{...}: {
-  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

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

hosts/sora/home.nix

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

hosts/tsuru/home.nix

@@ -1,14 +0,0 @@
-{...}: {
-  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

@@ -1,14 +0,0 @@
-{...}: {
-  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,6 +1,5 @@
-{inputs, ...}: {
+_: {
   imports = [
-    inputs.nh.nixosModules.default
     ./prometheus.nix
     ./security.nix
     ./users.nix

modules/nix.nix

@@ -5,6 +5,7 @@
       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
@@ -20,7 +21,7 @@
     };
   };
 
-  nh = {
+  programs.nh = {
     enable = true;
     clean = {
       enable = true;