♻️ config refactor cleanup

nix/checks.nix

@@ -1,5 +1,4 @@
-{ self, system, pre-commit-hooks, ... }:
-with self.pkgs.${system};
+{ self, pkgs, system, pre-commit-hooks, ... }:
 {
   pre-commit-check = pre-commit-hooks.lib.${system}.run {
     src = ./.;
@@ -9,4 +8,4 @@ with self.pkgs.${system};
       statix.enable = true;
     };
   };
-} // (deploy-rs.lib.deployChecks self.deploy)
+} // (pkgs.deploy-rs.lib.deployChecks self.deploy)

nix/darwin.nix

@@ -10,7 +10,7 @@ let
         home-manager.darwinModules.home-manager
         (_: {
           networking.hostName = hostName;
-          nixpkgs.pkgs = self.pkgs.${hostSystem};
+          nixpkgs.overlays = [ self.overlays.default ];
         })
       ] ++ modules;
       specialArgs = { inherit dotfiles home-manager; };

nix/nixos.nix

@@ -10,7 +10,8 @@ let
         home-manager.nixosModules.home-manager
         (_: {
           networking.hostName = hostName;
-          nixpkgs.pkgs = self.pkgs.${hostSystem};
+          nixpkgs.overlays = [ self.overlays.default ];
+          nixpkgs.config.allowUnfree = true;
         })
       ] ++ modules;
       specialArgs = { inherit dotfiles nixos-hardware sops-nix; };

nix/shells.nix

@@ -1,16 +1,13 @@
-{ system, self, ... }:
-
-with self.pkgs.${system};
-
+{ system, pkgs, self, ... }:
 let
-  darwin-local = writeScriptBin "darwin-local" ''
-    #!${stdenv.shell}
+  darwin-local = pkgs.writeScriptBin "darwin-local" ''
+    #!${pkgs.stdenv.shell}
     nix build .#darwinConfigurations.$(hostname -s).system
     ./result/sw/bin/darwin-rebuild switch --flake .
   '';
 in
 {
-  default = mkShell {
+  default = pkgs.mkShell {
     name = "athens";
     buildInputs = with pkgs; [
       darwin-local