refactor: pass inputs as attrset to system

flake.lock

@@ -19,11 +19,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1691972610,
-        "narHash": "sha256-01X6GZ7nGZIvqzjM7zfnRemNXwgx5kneMldbTqRnPTU=",
+        "lastModified": 1692225040,
+        "narHash": "sha256-jbQNvkgWGioiC6S39dZVyn6us8p/DlEvm5hQKEYkzDU=",
         "owner": "zhaofengli",
         "repo": "attic",
-        "rev": "f4cf5704d64303ad11cc6918fbc6ab3cab6ca333",
+        "rev": "b43d12082e34bceb26038bdad0438fd68804cfcd",
         "type": "github"
       },
       "original": {
@@ -145,11 +145,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1692081771,
-        "narHash": "sha256-LWhyDz3gi1RzTcW6e6iwfs4VuDWFajOexBKygNIqvQM=",
+        "lastModified": 1692222899,
+        "narHash": "sha256-dHrv+lMUKFXLnzc/yYhEpNr34JYG8gwD4eH6qcrScFI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "18791781ea86cbec6bce8bcb847444b9c73b8b3b",
+        "rev": "2471d965a3522025157a790fc49c3567fd56e26e",
         "type": "github"
       },
       "original": {
@@ -180,11 +180,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1692039634,
-        "narHash": "sha256-L5ISasJZ5lZFOJ9NdxNj7cdrfO4GYv3tKGrv3eNMVJc=",
+        "lastModified": 1692190437,
+        "narHash": "sha256-yJUZzmzSmDYb9ONPnMQDru66RjZgGQZRvj3tQebkexk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b392b28a47d2103ac422197fde95449651aee458",
+        "rev": "9b2aa98db6b10503666a50f4eb93b2fc0d57bde5",
         "type": "github"
       },
       "original": {
@@ -210,11 +210,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1692027995,
-        "narHash": "sha256-x4/8/aBu4naA+24PQhNoUZ6w0leHk1LY9MhSTobom9U=",
+        "lastModified": 1692180423,
+        "narHash": "sha256-rJDaQMzdjtC39mRylTfqEll3zgcpQkCMw5XKo9t1Xhg=",
         "owner": "ryanccn",
         "repo": "nyoom",
-        "rev": "9af65efd16ff3f1ac6794099ffe3b2998315ed7b",
+        "rev": "2f360906fc87e622bc53dc183313ff40baf4e4b7",
         "type": "github"
       },
       "original": {
@@ -248,11 +248,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1692065371,
-        "narHash": "sha256-1uKLJT89aDS2IlT5oM9vOe6yL34teNvs+b6DZNA5RAM=",
+        "lastModified": 1692238117,
+        "narHash": "sha256-gOoxig/GBuGOYWqE3+7OMrgPVduxjjsbo4qikRb1h3s=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "4ea85def89eceac6b5e327fd3628dcb9ba5add2e",
+        "rev": "3e0e4ec062706ebba759795ad18ad72ad69d41f3",
         "type": "github"
       },
       "original": {

flake.nix

@@ -82,7 +82,9 @@
         home-manager.darwinModules.home-manager
       ];
 
-      specialArgs = inputs;
+      specialArgs = {
+        inherit inputs;
+      };
     };
   };
 }

system.nix

@@ -1,8 +1,6 @@
 {
   pkgs,
-  attic,
-  discord-applemusic-rich-presence,
-  nyoom,
+  inputs,
   ...
 }: {
   environment.systemPackages = with pkgs; [
@@ -35,8 +33,6 @@
     rustfmt
     clippy
 
-    pkgs.nyoom
-
     age
     asciinema
     bat
@@ -45,7 +41,6 @@
     doggo
     doppler
     du-dust
-    exiftool
     fd
     ffmpeg
     flyctl
@@ -56,7 +51,6 @@
     hyperfine
     jq
     just
-    spicetify-cli
     mkcert
     nerdfix
     pscale
@@ -72,9 +66,11 @@
 
     typst
     packwiz
-
     catppuccin-catwalk
-    packwiz
+
+    nyoom
+    spicetify-cli
+    exiftool
   ];
 
   services.nix-daemon.enable = true;
@@ -97,9 +93,9 @@
 
   nixpkgs = {
     overlays = [
-      attic.overlays.default
-      discord-applemusic-rich-presence.overlays.default
-      nyoom.overlays.default
+      inputs.attic.overlays.default
+      inputs.discord-applemusic-rich-presence.overlays.default
+      inputs.nyoom.overlays.default
       (import ./overlays/ryan-mono-bin.nix)
     ];
 
@@ -110,7 +106,7 @@
   system.activationScripts.extraActivation = {
     text = ''
       set -eo pipefail
-      HOME="/var/root" ${pkgs.lib.getExe pkgs.nvd} --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig"
+      HOME="/var/root" ${pkgs.lib.getExe' pkgs.nvd "nvd"} --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig"
     '';
   };
 

users.nix

@@ -1,16 +1,13 @@
-{
-  catppuccin,
-  discord-applemusic-rich-presence,
-  ...
-}: {
+{inputs, ...}: {
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
 
     extraSpecialArgs = {
-      ctpModule = catppuccin.homeManagerModules.catppuccin;
-      discord-applemusic-rich-presence = discord-applemusic-rich-presence.homeManagerModules.default;
+      ctpModule = inputs.catppuccin.homeManagerModules.catppuccin;
+      discord-applemusic-rich-presence = inputs.discord-applemusic-rich-presence.homeManagerModules.default;
     };
+
     users.ryanccn = import ./home.nix;
   };