flake: simplify packages setup

Signed-off-by: Christoph Heiss <christoph@c8h4.io>

flake.nix

@@ -142,8 +142,7 @@
 
         checks = {
           formatting = treefmt.config.build.check self;
-        } // (import ./pkgs null pkgs)
-          // (import ./pkgs/vim-plugins.nix null pkgs);
+        } // self.packages.${system};
 
         formatter = treefmt.config.build.wrapper;
 
@@ -152,7 +151,7 @@
           nativeBuildInputs = with pkgs; [ age nix-tree sops ];
         };
 
-        packages = (import ./pkgs) null pkgs;
+        packages = (import ./pkgs pkgs) // (import ./pkgs/vim-plugins.nix pkgs);
       })) // (let
         machines = {
           back = { };

pkgs/default.nix

@@ -1,11 +1,11 @@
-_: super:
+{ callPackage, ... }:
 
 {
-  automation-shell = super.callPackage ./automation-shell.nix { };
-  dashboard-icons = super.callPackage ./dashboard-icons.nix { };
-  deploy-sink = super.callPackage ./deploy-sink.nix { };
-  git-multi-shortlog = super.callPackage ./git-multi-shortlog.nix { };
-  homer = super.callPackage ./homer { };
-  neomutt-export-patches = super.callPackage ./neomutt-export-patches.nix { };
-  sway-background-image = super.callPackage ./sway-background-image.nix { };
+  dashboard-icons = callPackage ./dashboard-icons.nix { };
+  automation-shell = callPackage ./automation-shell.nix { };
+  deploy-sink = callPackage ./deploy-sink.nix { };
+  git-multi-shortlog = callPackage ./git-multi-shortlog.nix { };
+  homer = callPackage ./homer { };
+  neomutt-export-patches = callPackage ./neomutt-export-patches.nix { };
+  sway-background-image = callPackage ./sway-background-image.nix { };
 }

pkgs/vim-plugins.nix

@@ -1,7 +1,7 @@
-_: super:
+{ callPackage, ... }:
 
 {
-  none-ls-shellcheck-nvim = super.callPackage ({ vimUtils, fetchFromGitHub }:
+  none-ls-shellcheck-nvim = callPackage ({ vimUtils, fetchFromGitHub }:
     vimUtils.buildVimPlugin {
       pname = "none-ls-shellcheck.nvim";
       version = "2024-03-19";