genebean/dots
1
0
Fork 0
mirror of https://github.com/genebean/dots.git synced 2026-03-27 01:17:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix typo

Browse source
This commit is contained in:
Gene Liverman 2024-06-05 22:54:03 -04:00
parent 83b9d86806
commit 5704463a41
1 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

46
flake.nix
View file

@ -61,7 +61,7 @@
home-manager, nix-darwin, nix-flatpak, nix-homebrew, nixos-hardware, nixpkgs-terraform, sops-nix, ... }: let home-manager, nix-darwin, nix-flatpak, nix-homebrew, nixos-hardware, nixpkgs-terraform, sops-nix, ... }: let
# creates a macOS system config # creates a macOS system config
darwinHostConfig = { system, hostname, username, additionaModules, additionaSpecialArgs }: nix-darwin.lib.darwinSystem { darwinHostConfig = { system, hostname, username, additionalModules, additionalSpecialArgs }: nix-darwin.lib.darwinSystem {
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
config = { config = {
@ -70,7 +70,7 @@
}; };
overlays = [ nixpkgs-terraform.overlays.default ]; overlays = [ nixpkgs-terraform.overlays.default ];
}; };
specialArgs = { inherit inputs hostname username; } // additionaSpecialArgs; specialArgs = { inherit inputs hostname username; } // additionalSpecialArgs;
modules = [ modules = [
nix-homebrew.darwinModules.nix-homebrew { nix-homebrew.darwinModules.nix-homebrew {
nix-homebrew = { nix-homebrew = {
@ -94,11 +94,11 @@
./modules/system/common/all-darwin.nix # system-wide stuff ./modules/system/common/all-darwin.nix # system-wide stuff
./modules/hosts/darwin/${hostname} # host specific stuff ./modules/hosts/darwin/${hostname} # host specific stuff
] ++ additionaModules; # end modules ] ++ additionalModules; # end modules
}; # end darwinSystem }; # end darwinSystem
# creates a nixos system config # creates a nixos system config
nixosHostConfig = { system, hostname, username, additionaModules, additionaSpecialArgs }: nixpkgs.lib.nixosSystem { nixosHostConfig = { system, hostname, username, additionalModules, additionalSpecialArgs }: nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs compose2nix hostname username; specialArgs = { inherit inputs compose2nix hostname username;
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
@ -108,7 +108,7 @@
}; };
overlays = [ nixpkgs-terraform.overlays.default ]; overlays = [ nixpkgs-terraform.overlays.default ];
}; };
} // additionaSpecialArgs; } // additionalSpecialArgs;
modules = [ modules = [
disko.nixosModules.disko disko.nixosModules.disko
@ -128,10 +128,10 @@
sops-nix.nixosModules.sops # system wide secrets management sops-nix.nixosModules.sops # system wide secrets management
./modules/system/common/all-nixos.nix # system-wide stuff ./modules/system/common/all-nixos.nix # system-wide stuff
./modules/hosts/nixos/${hostname} # host specific stuff ./modules/hosts/nixos/${hostname} # host specific stuff
] ++ additionaModules; ] ++ additionalModules;
}; # end nixosSystem }; # end nixosSystem
linuxHomeConfig = { system, hostname, username, additionaModules, additionaSpecialArgs }: home-manager.lib.homeManagerConfiguration { linuxHomeConfig = { system, hostname, username, additionalModules, additionalSpecialArgs }: home-manager.lib.homeManagerConfiguration {
extraSpecialArgs = { inherit genebean-omp-themes hostname username; extraSpecialArgs = { inherit genebean-omp-themes hostname username;
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
@ -141,7 +141,7 @@
}; };
overlays = [ nixpkgs-terraform.overlays.default ]; overlays = [ nixpkgs-terraform.overlays.default ];
}; };
} // additionaSpecialArgs; } // additionalSpecialArgs;
modules = [ modules = [
./modules/home-manager/hosts/${hostname}/${username}.nix ./modules/home-manager/hosts/${hostname}/${username}.nix
{ {
@ -151,7 +151,7 @@
}; };
} }
sops-nix.homeManagerModules.sops sops-nix.homeManagerModules.sops
] ++ additionaModules; ] ++ additionalModules;
}; # end homeManagerConfiguration }; # end homeManagerConfiguration
in { in {
@ -161,22 +161,22 @@
system = "x86_64-darwin"; system = "x86_64-darwin";
hostname = "AirPuppet"; hostname = "AirPuppet";
username = "gene"; username = "gene";
additionaModules = []; additionalModules = [];
additionaSpecialArgs = {}; additionalSpecialArgs = {};
}; };
Blue-Rock = darwinHostConfig { Blue-Rock = darwinHostConfig {
system = "x86_64-darwin"; system = "x86_64-darwin";
hostname = "Blue-Rock"; hostname = "Blue-Rock";
username = "gene.liverman"; username = "gene.liverman";
additionaModules = []; additionalModules = [];
additionaSpecialArgs = {}; additionalSpecialArgs = {};
}; };
mightymac = darwinHostConfig { mightymac = darwinHostConfig {
system = "aarch64-darwin"; system = "aarch64-darwin";
hostname = "mightymac"; hostname = "mightymac";
username = "gene.liverman"; username = "gene.liverman";
additionaModules = []; additionalModules = [];
additionaSpecialArgs = {}; additionalSpecialArgs = {};
}; };
}; # end darwinConfigurations }; # end darwinConfigurations
@ -186,24 +186,24 @@
system = "aarch64-linux"; system = "aarch64-linux";
hostname = "hetznix01"; hostname = "hetznix01";
username = "gene"; username = "gene";
additionaModules = []; additionalModules = [];
additionaSpecialArgs = {}; additionalSpecialArgs = {};
}; };
nixnuc = nixosHostConfig { nixnuc = nixosHostConfig {
system = "x86_64-linux"; system = "x86_64-linux";
hostname = "nixnuc"; hostname = "nixnuc";
username = "gene"; username = "gene";
additionaModules = []; additionalModules = [];
additionaSpecialArgs = {}; additionalSpecialArgs = {};
}; };
rainbow-planet = nixosHostConfig { rainbow-planet = nixosHostConfig {
system = "x86_64-linux"; system = "x86_64-linux";
hostname = "rainbow-planet"; hostname = "rainbow-planet";
username = "gene"; username = "gene";
additionaModules = [ additionalModules = [
nixos-hardware.nixosModules.dell-xps-13-9360 nixos-hardware.nixosModules.dell-xps-13-9360
]; ];
additionaSpecialArgs = {}; additionalSpecialArgs = {};
}; };
}; # end nixosConfigurations }; # end nixosConfigurations
@ -213,8 +213,8 @@
system = "x86_64-linux"; system = "x86_64-linux";
hostname = "mini-watcher"; hostname = "mini-watcher";
username = "gene"; username = "gene";
additionaModules = []; additionalModules = [];
additionaSpecialArgs = {}; additionalSpecialArgs = {};
}; };
}; # end homeConfigurations }; # end homeConfigurations
}; };