From a132ccf4b651f1c16c7e2d1b133e3ba5b3735cef Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Sun, 10 Dec 2023 17:01:30 -0500
Subject: [PATCH] fix mkPackages

move "lint" command to /packages
---
 hosts/gerg-desktop/main.nix | 80 ++++++++++++-------------------------
 lib/default.nix             | 28 ++++++-------
 outputs.nix                 | 19 +--------
 packages/lint/package.nix   | 32 +++++++++++++++
 4 files changed, 71 insertions(+), 88 deletions(-)
 create mode 100644 packages/lint/package.nix

diff --git a/hosts/gerg-desktop/main.nix b/hosts/gerg-desktop/main.nix
index befdc87..c77f237 100644
--- a/hosts/gerg-desktop/main.nix
+++ b/hosts/gerg-desktop/main.nix
@@ -1,4 +1,4 @@
-{nvim-flake, nixfmt, ...}:
+{nvim-flake, self, ...}:
 {pkgs, config, ...}:
 {
   local = {
@@ -44,59 +44,31 @@
   ];
 
   environment = {
-    systemPackages =
-      let
-        fmt = pkgs.nixfmt.overrideAttrs {
-          version = "0.6.0-${nixfmt.shortRev}";
-
-          src = nixfmt;
-        };
-      in
-      builtins.attrValues {
-        inherit (pkgs)
-          bitwarden # store stuff
-          qbittorrent # steal stuff
-          pavucontrol # gui volume control
-          pcmanfm # file manager
-          librewolf # best browser
-          vlc # play stuff
-          ripgrep
-          fd
-          jq
-          xautoclick
-          prismlauncher
-          deadnix
-          statix
-          nix-index
-          element-desktop
-          webcord
-          # QMK configuration
-          via
-          qmk
-          ;
-        inherit (nvim-flake.packages) neovim;
-        inherit fmt;
-        lint = pkgs.writeShellApplication {
-          name = "lint";
-          runtimeInputs = [
-            fmt
-            pkgs.deadnix
-            pkgs.statix
-            pkgs.fd
-          ];
-
-          text = ''
-            if [ -z "''${1:-""}" ]; then
-              fd '.*\.nix' . -x statix fix -- {} \;
-              fd '.*\.nix' . -X deadnix -e -- {} \; -X nixfmt {} \;
-            else
-              statix fix -- "$1"
-              deadnix -e "$1"
-              nixfmt "$1"
-            fi
-          '';
-        };
-      };
+    systemPackages = builtins.attrValues {
+      inherit (pkgs)
+        bitwarden # store stuff
+        qbittorrent # steal stuff
+        pavucontrol # gui volume control
+        pcmanfm # file manager
+        librewolf # best browser
+        vlc # play stuff
+        ripgrep
+        fd
+        jq
+        xautoclick
+        prismlauncher
+        deadnix
+        statix
+        nix-index
+        element-desktop
+        webcord
+        # QMK configuration
+        via
+        qmk
+        ;
+      inherit (nvim-flake.packages) neovim;
+      inherit (self.packages) lint;
+    };
     etc = {
       "jdks/17".source = "${pkgs.openjdk17}/bin";
       "jdks/8".source = "${pkgs.openjdk8}/bin";
diff --git a/lib/default.nix b/lib/default.nix
index fea65f9..ae4de63 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -127,29 +127,25 @@ rec {
       (lib.mapAttrs (
         n: _:
         let
-          addArgs =
-            x:
-            lib.setFunctionArgs x (
-              lib.mapAttrs
-                (
-                  n: v:
-                  {
-                    inherit inputs self;
-                    #sources = import ../npins;
-                  }
-                  .${n} or v
-                )
-                (lib.functionArgs x)
-            );
+          callPackage = lib.callPackageWith (
+            pkgs
+            // {
+              inherit inputs;
+              # maybe add self?
+              # inherit self;
+              # npins sources if i need them
+              # sources = import ./npins;
+            }
+          );
         in
 
         if builtins.pathExists "${path}/${n}/call.nix" then
           let
             x = import "${path}/${n}/call.nix" pkgs;
           in
-          (addArgs x.callPackage "${path}/${n}/package.nix") x.args
+          x.callPackage "${path}/${n}/package.nix" x.args
         else
-          (addArgs pkgs.callPackage "${path}/${n}/package.nix") {}
+          callPackage "${path}/${n}/package.nix" {}
 
       ))
     ];
diff --git a/outputs.nix b/outputs.nix
index a4a0aef..6421f9a 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -18,25 +18,8 @@ lib.gerg-utils {} {
     "game-desktop"
     "media-laptop"
   ];
-  formatter =
-    pkgs:
-    pkgs.writeShellApplication {
-      name = "lint";
-      runtimeInputs = [
-        (pkgs.nixfmt.overrideAttrs {
-          version = "0.6.0-${inputs.nixfmt.shortRev}";
 
-          src = inputs.nixfmt;
-        })
-        pkgs.deadnix
-        pkgs.statix
-        pkgs.fd
-      ];
-      text = ''
-        fd '.*\.nix' . -x statix fix -- {} \;
-        fd '.*\.nix' . -X deadnix -e -- {} \; -X nixfmt {} \;
-      '';
-    };
+  formatter = pkgs: inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.lint;
 
   devShells = pkgs: {default = pkgs.mkShell {packages = [pkgs.sops];};};
 
diff --git a/packages/lint/package.nix b/packages/lint/package.nix
new file mode 100644
index 0000000..4eea355
--- /dev/null
+++ b/packages/lint/package.nix
@@ -0,0 +1,32 @@
+{
+  inputs,
+  nixfmt,
+  writeShellApplication,
+  deadnix,
+  statix,
+  fd,
+}:
+
+writeShellApplication {
+  name = "lint";
+  runtimeInputs = [
+    (nixfmt.overrideAttrs {
+      version = "0.6.0-${inputs.nixfmt.shortRev}";
+
+      src = inputs.nixfmt;
+    })
+    deadnix
+    statix
+    fd
+  ];
+  text = ''
+    if [ -z "''${1:-""}" ]; then
+      fd '.*\.nix' . -x statix fix -- {} \;
+      fd '.*\.nix' . -X deadnix -e -- {} \; -X nixfmt {} \;
+    else
+      statix fix -- "$1"
+      deadnix -e "$1"
+      nixfmt "$1"
+    fi
+  '';
+}