mirror of
https://github.com/genebean/dots.git
synced 2026-03-27 09:27:44 -04:00
Swap order of things in flake.nix
This commit is contained in:
parent
067ab7a012
commit
09222529a3
1 changed files with 30 additions and 30 deletions
60
flake.nix
60
flake.nix
|
|
@ -37,36 +37,6 @@
|
||||||
outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, nix-darwin, home-manager, nix-homebrew, disko, genebean-omp-themes, ... }: let
|
outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, nix-darwin, home-manager, nix-homebrew, disko, genebean-omp-themes, ... }: let
|
||||||
inputs = { inherit disko home-manager nixpkgs nixpkgs-unstable nix-darwin; };
|
inputs = { inherit disko home-manager nixpkgs nixpkgs-unstable nix-darwin; };
|
||||||
|
|
||||||
# creates a nixos system config
|
|
||||||
nixosSystem = system: hostName: username: nixpkgs.lib.nixosSystem {
|
|
||||||
pkgs = import nixpkgs {
|
|
||||||
inherit system;
|
|
||||||
config = {
|
|
||||||
allowUnfree = true;
|
|
||||||
permittedInsecurePackages = [
|
|
||||||
"electron-21.4.4" # Well, this sucks, hopefully a fixed version is available soon...
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
modules = [
|
|
||||||
home-manager.nixosModules.home-manager
|
|
||||||
{
|
|
||||||
home-manager = {
|
|
||||||
useGlobalPkgs = true;
|
|
||||||
useUserPackages = true;
|
|
||||||
users.${username}.imports = [
|
|
||||||
./modules/home-manager
|
|
||||||
./modules/home-manager/nixos.nix
|
|
||||||
];
|
|
||||||
extraSpecialArgs = { inherit genebean-omp-themes; };
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
./modules/common/nixos/all-hosts.nix
|
|
||||||
./modules/hosts/nixos/${hostName} # ip address, host specific stuff
|
|
||||||
];
|
|
||||||
}; # end nixosSystem
|
|
||||||
|
|
||||||
# creates a macOS system config
|
# creates a macOS system config
|
||||||
darwinSystem = system: hostName: username: nix-darwin.lib.darwinSystem {
|
darwinSystem = system: hostName: username: nix-darwin.lib.darwinSystem {
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
|
|
@ -111,6 +81,36 @@
|
||||||
]; # end modules
|
]; # end modules
|
||||||
}; # end darwinSystem
|
}; # end darwinSystem
|
||||||
|
|
||||||
|
# creates a nixos system config
|
||||||
|
nixosSystem = system: hostName: username: nixpkgs.lib.nixosSystem {
|
||||||
|
pkgs = import nixpkgs {
|
||||||
|
inherit system;
|
||||||
|
config = {
|
||||||
|
allowUnfree = true;
|
||||||
|
permittedInsecurePackages = [
|
||||||
|
"electron-21.4.4" # Well, this sucks, hopefully a fixed version is available soon...
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
modules = [
|
||||||
|
home-manager.nixosModules.home-manager
|
||||||
|
{
|
||||||
|
home-manager = {
|
||||||
|
useGlobalPkgs = true;
|
||||||
|
useUserPackages = true;
|
||||||
|
users.${username}.imports = [
|
||||||
|
./modules/home-manager
|
||||||
|
./modules/home-manager/nixos.nix
|
||||||
|
];
|
||||||
|
extraSpecialArgs = { inherit genebean-omp-themes; };
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
./modules/common/nixos/all-hosts.nix
|
||||||
|
./modules/hosts/nixos/${hostName} # ip address, host specific stuff
|
||||||
|
];
|
||||||
|
}; # end nixosSystem
|
||||||
|
|
||||||
in {
|
in {
|
||||||
darwinConfigurations = {
|
darwinConfigurations = {
|
||||||
Blue-Rock = darwinSystem "x86_64-darwin" "Blue-Rock" "gene.liverman";
|
Blue-Rock = darwinSystem "x86_64-darwin" "Blue-Rock" "gene.liverman";
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue