removed useless and cargo-culted outputs inherrits.

This commit is contained in:
Gabe Venberg 2024-06-10 16:19:36 -05:00
parent 296fbdb3c5
commit f27b5ac056
11 changed files with 18 additions and 32 deletions

View file

@ -2,7 +2,6 @@
config, config,
pkgs, pkgs,
inputs, inputs,
outputs,
lib, lib,
... ...
}: { }: {
@ -57,5 +56,5 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = {inherit inputs outputs;}; home-manager.extraSpecialArgs = {inherit inputs;};
} }

View file

@ -2,7 +2,6 @@
config, config,
pkgs, pkgs,
inputs, inputs,
outputs,
configLib, configLib,
lib, lib,
... ...

View file

@ -59,7 +59,6 @@
deploy-rs, deploy-rs,
... ...
} @ inputs: let } @ inputs: let
inherit (self) outputs;
forAllSystems = nixpkgs.lib.genAttrs [ forAllSystems = nixpkgs.lib.genAttrs [
"x86_64-linux" "x86_64-linux"
"aarch64-linux" "aarch64-linux"
@ -89,25 +88,25 @@
# NixOS configuration entrypoint # NixOS configuration entrypoint
# Available through 'nixos-rebuild --flake .#your-hostname' # Available through 'nixos-rebuild --flake .#your-hostname'
nixosConfigurations = { nixosConfigurations = {
archlaptop-vm = import ./hosts/archlaptop-vm {inherit inputs outputs configLib;}; archlaptop-vm = import ./hosts/archlaptop-vm {inherit inputs configLib;};
workstation-vm = import ./hosts/workstation-vm {inherit inputs outputs configLib;}; workstation-vm = import ./hosts/workstation-vm {inherit inputs configLib;};
gv-wsl = import ./hosts/wsl-workstation.nix {inherit inputs outputs configLib;}; gv-wsl = import ./hosts/wsl-workstation.nix {inherit inputs configLib;};
}; };
# Standalone home-manager configuration entrypoint # Standalone home-manager configuration entrypoint
# Available through 'home-manager --flake .#your-username@your-hostname' # Available through 'home-manager --flake .#your-username@your-hostname'
homeConfigurations = { homeConfigurations = {
"gabe@archlaptop" = import ./hosts/home-personal.nix {inherit inputs outputs configLib;}; "gabe@archlaptop" = import ./hosts/home-personal.nix {inherit inputs configLib;};
"gabe@linuxgamingrig" = import ./hosts/home-personal.nix {inherit inputs outputs configLib;}; "gabe@linuxgamingrig" = import ./hosts/home-personal.nix {inherit inputs configLib;};
"gabe@gv-workstation" = import ./hosts/home-workstation.nix {inherit inputs outputs configLib;}; "gabe@gv-workstation" = import ./hosts/home-workstation.nix {inherit inputs configLib;};
"gabe@gv-ubuntu" = import ./hosts/home-workstation.nix {inherit inputs outputs configLib;}; "gabe@gv-ubuntu" = import ./hosts/home-workstation.nix {inherit inputs configLib;};
}; };
packages.x86_64-linux = { packages.x86_64-linux = {
proxmox = import ./packages/proxmox.nix {inherit inputs outputs configLib;}; proxmox = import ./packages/proxmox.nix {inherit inputs configLib;};
iso = import ./packages/iso.nix {inherit inputs outputs configLib;}; iso = import ./packages/iso.nix {inherit inputs configLib;};
}; };
templates = import ./templates {inherit inputs outputs;}; templates = import ./templates;
}; };
} }

View file

@ -1,12 +1,11 @@
{ {
inputs, inputs,
outputs,
configLib, configLib,
... ...
}: }:
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = {inherit inputs outputs configLib;}; specialArgs = {inherit inputs configLib;};
# > Our main nixos configuration file < # > Our main nixos configuration file <
modules = [ modules = [
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager

View file

@ -1,12 +1,11 @@
{ {
inputs, inputs,
outputs,
configLib, configLib,
... ...
}: }:
inputs.home-manager.lib.homeManagerConfiguration { inputs.home-manager.lib.homeManagerConfiguration {
pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
extraSpecialArgs = {inherit inputs outputs configLib;}; extraSpecialArgs = {inherit inputs configLib;};
modules = [ modules = [
({ ({
config, config,

View file

@ -1,12 +1,11 @@
{ {
inputs, inputs,
outputs,
configLib, configLib,
... ...
}: }:
inputs.home-manager.lib.homeManagerConfiguration { inputs.home-manager.lib.homeManagerConfiguration {
pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
extraSpecialArgs = {inherit inputs outputs configLib;}; extraSpecialArgs = {inherit inputs configLib;};
modules = [ modules = [
inputs.nixvim.homeManagerModules.nixvim inputs.nixvim.homeManagerModules.nixvim
({ ({

View file

@ -3,13 +3,12 @@
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ {
inputs, inputs,
outputs,
configLib, configLib,
... ...
}: }:
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = {inherit inputs outputs configLib;}; specialArgs = {inherit inputs configLib;};
# > Our main nixos configuration file < # > Our main nixos configuration file <
modules = [ modules = [
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager

View file

@ -1,11 +1,10 @@
{ {
inputs, inputs,
outputs,
configLib, configLib,
}: }:
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = {inherit inputs outputs configLib;}; specialArgs = {inherit inputs configLib;};
# > Our main nixos configuration file < # > Our main nixos configuration file <
modules = [ modules = [
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager

View file

@ -3,13 +3,12 @@
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ {
inputs, inputs,
outputs,
configLib, configLib,
... ...
}: }:
(inputs.nixpkgs.lib.nixosSystem { (inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = {inherit inputs outputs configLib;}; specialArgs = {inherit inputs configLib;};
# > Our main nixos configuration file < # > Our main nixos configuration file <
modules = [ modules = [
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager

View file

@ -1,12 +1,11 @@
{ {
inputs, inputs,
outputs,
configLib, configLib,
... ...
}: }:
(inputs.nixpkgs.lib.nixosSystem { (inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = {inherit inputs outputs configLib;}; specialArgs = {inherit inputs configLib;};
modules = [ modules = [
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
../configs/nixos/sshd.nix ../configs/nixos/sshd.nix

View file

@ -1,8 +1,4 @@
{ {
inputs,
outputs,
...
}: {
default = { default = {
path = ./default; path = ./default;
description = "a basic blank devshell flake"; description = "a basic blank devshell flake";