From 09222529a3cd2c7e4e2d48060d8d1ee5617430a1 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Fri, 15 Dec 2023 15:26:41 -0500 Subject: [PATCH] Swap order of things in flake.nix --- flake.nix | 60 +++++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.nix b/flake.nix index c98c0b6..4484ea1 100644 --- a/flake.nix +++ b/flake.nix @@ -37,36 +37,6 @@ 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; }; - # 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 darwinSystem = system: hostName: username: nix-darwin.lib.darwinSystem { pkgs = import nixpkgs { @@ -111,6 +81,36 @@ ]; # end modules }; # 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 { darwinConfigurations = { Blue-Rock = darwinSystem "x86_64-darwin" "Blue-Rock" "gene.liverman";