diff --git a/configs/nixos/common.nix b/configs/nixos/common.nix index e926d1a..d7559b1 100644 --- a/configs/nixos/common.nix +++ b/configs/nixos/common.nix @@ -2,7 +2,6 @@ config, pkgs, inputs, - outputs, lib, ... }: { @@ -57,5 +56,5 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = {inherit inputs outputs;}; + home-manager.extraSpecialArgs = {inherit inputs;}; } diff --git a/configs/nixos/sshd.nix b/configs/nixos/sshd.nix index 310cfcc..e424d94 100644 --- a/configs/nixos/sshd.nix +++ b/configs/nixos/sshd.nix @@ -2,7 +2,6 @@ config, pkgs, inputs, - outputs, configLib, lib, ... diff --git a/flake.nix b/flake.nix index 113c9fb..fb2e614 100644 --- a/flake.nix +++ b/flake.nix @@ -59,7 +59,6 @@ deploy-rs, ... } @ inputs: let - inherit (self) outputs; forAllSystems = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" @@ -89,25 +88,25 @@ # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#your-hostname' nixosConfigurations = { - archlaptop-vm = import ./hosts/archlaptop-vm {inherit inputs outputs configLib;}; - workstation-vm = import ./hosts/workstation-vm {inherit inputs outputs configLib;}; - gv-wsl = import ./hosts/wsl-workstation.nix {inherit inputs outputs configLib;}; + archlaptop-vm = import ./hosts/archlaptop-vm {inherit inputs configLib;}; + workstation-vm = import ./hosts/workstation-vm {inherit inputs configLib;}; + gv-wsl = import ./hosts/wsl-workstation.nix {inherit inputs configLib;}; }; # Standalone home-manager configuration entrypoint # Available through 'home-manager --flake .#your-username@your-hostname' homeConfigurations = { - "gabe@archlaptop" = import ./hosts/home-personal.nix {inherit inputs outputs configLib;}; - "gabe@linuxgamingrig" = import ./hosts/home-personal.nix {inherit inputs outputs configLib;}; - "gabe@gv-workstation" = import ./hosts/home-workstation.nix {inherit inputs outputs configLib;}; - "gabe@gv-ubuntu" = import ./hosts/home-workstation.nix {inherit inputs outputs configLib;}; + "gabe@archlaptop" = import ./hosts/home-personal.nix {inherit inputs configLib;}; + "gabe@linuxgamingrig" = import ./hosts/home-personal.nix {inherit inputs configLib;}; + "gabe@gv-workstation" = import ./hosts/home-workstation.nix {inherit inputs configLib;}; + "gabe@gv-ubuntu" = import ./hosts/home-workstation.nix {inherit inputs configLib;}; }; packages.x86_64-linux = { - proxmox = import ./packages/proxmox.nix {inherit inputs outputs configLib;}; - iso = import ./packages/iso.nix {inherit inputs outputs configLib;}; + proxmox = import ./packages/proxmox.nix {inherit inputs configLib;}; + iso = import ./packages/iso.nix {inherit inputs configLib;}; }; - templates = import ./templates {inherit inputs outputs;}; + templates = import ./templates; }; } diff --git a/hosts/archlaptop-vm/default.nix b/hosts/archlaptop-vm/default.nix index 984a878..65ae846 100644 --- a/hosts/archlaptop-vm/default.nix +++ b/hosts/archlaptop-vm/default.nix @@ -1,12 +1,11 @@ { inputs, - outputs, configLib, ... }: inputs.nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = {inherit inputs outputs configLib;}; + specialArgs = {inherit inputs configLib;}; # > Our main nixos configuration file < modules = [ inputs.home-manager.nixosModules.home-manager diff --git a/hosts/home-personal.nix b/hosts/home-personal.nix index 41be11d..7a17afe 100644 --- a/hosts/home-personal.nix +++ b/hosts/home-personal.nix @@ -1,12 +1,11 @@ { inputs, - outputs, configLib, ... }: inputs.home-manager.lib.homeManagerConfiguration { pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance - extraSpecialArgs = {inherit inputs outputs configLib;}; + extraSpecialArgs = {inherit inputs configLib;}; modules = [ ({ config, diff --git a/hosts/home-workstation.nix b/hosts/home-workstation.nix index 282cb44..fb6360d 100644 --- a/hosts/home-workstation.nix +++ b/hosts/home-workstation.nix @@ -1,12 +1,11 @@ { inputs, - outputs, configLib, ... }: inputs.home-manager.lib.homeManagerConfiguration { pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance - extraSpecialArgs = {inherit inputs outputs configLib;}; + extraSpecialArgs = {inherit inputs configLib;}; modules = [ inputs.nixvim.homeManagerModules.nixvim ({ diff --git a/hosts/workstation-vm/default.nix b/hosts/workstation-vm/default.nix index dc68e4a..c7084da 100644 --- a/hosts/workstation-vm/default.nix +++ b/hosts/workstation-vm/default.nix @@ -3,13 +3,12 @@ # and in the NixOS manual (accessible by running ‘nixos-help’). { inputs, - outputs, configLib, ... }: inputs.nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = {inherit inputs outputs configLib;}; + specialArgs = {inherit inputs configLib;}; # > Our main nixos configuration file < modules = [ inputs.home-manager.nixosModules.home-manager diff --git a/hosts/wsl-workstation.nix b/hosts/wsl-workstation.nix index 60e069e..4bc20e6 100644 --- a/hosts/wsl-workstation.nix +++ b/hosts/wsl-workstation.nix @@ -1,11 +1,10 @@ { inputs, - outputs, configLib, }: inputs.nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = {inherit inputs outputs configLib;}; + specialArgs = {inherit inputs configLib;}; # > Our main nixos configuration file < modules = [ inputs.home-manager.nixosModules.home-manager diff --git a/packages/iso.nix b/packages/iso.nix index 108155c..81f7032 100644 --- a/packages/iso.nix +++ b/packages/iso.nix @@ -3,13 +3,12 @@ # and in the NixOS manual (accessible by running ‘nixos-help’). { inputs, - outputs, configLib, ... }: (inputs.nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = {inherit inputs outputs configLib;}; + specialArgs = {inherit inputs configLib;}; # > Our main nixos configuration file < modules = [ inputs.home-manager.nixosModules.home-manager diff --git a/packages/proxmox.nix b/packages/proxmox.nix index e33e79f..d7ac9ff 100644 --- a/packages/proxmox.nix +++ b/packages/proxmox.nix @@ -1,12 +1,11 @@ { inputs, - outputs, configLib, ... }: (inputs.nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = {inherit inputs outputs configLib;}; + specialArgs = {inherit inputs configLib;}; modules = [ inputs.home-manager.nixosModules.home-manager ../configs/nixos/sshd.nix diff --git a/templates/default.nix b/templates/default.nix index 327c134..9e30dfc 100644 --- a/templates/default.nix +++ b/templates/default.nix @@ -1,8 +1,4 @@ { - inputs, - outputs, - ... -}: { default = { path = ./default; description = "a basic blank devshell flake";