From dccffdbc7dc59671066be659b7608056a29e86e1 Mon Sep 17 00:00:00 2001 From: Whovian9369 Date: Tue, 4 Jun 2024 21:47:21 -0400 Subject: [PATCH] Move around commented `nixosConfigurations.nixps` block. --- flake.nix | 80 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 39 deletions(-) diff --git a/flake.nix b/flake.nix index ca205ce..d2fc00f 100644 --- a/flake.nix +++ b/flake.nix @@ -133,46 +133,7 @@ } ]; }; - /* - nixps = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./system/xps/configuration.nix - # ./system/xps/users.nix - home-manager.nixosModules.home-manager - { - system.configurationRevision = self.shortRev or self.dirtyShortRev or "dirty"; - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - - users = { - whovian = { - imports = [ - ./home/home.nix - agenix.homeManagerModules.default - nix-index-database.hmModules.nix-index - ]; - }; - }; - - # Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix - extraSpecialArgs = { - system = "x86_64-linux"; - inherit xil; - inherit nixpkgs; - pkgs = import nixpkgs { - system = "x86_64-linux"; - config.allowUnfree = true; - }; - inherit agenix; - }; - }; - } - ]; - }; - */ isoimage = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ @@ -195,6 +156,47 @@ "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix" ]; }; + + /* + nixps = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + ./system/xps/configuration.nix + # ./system/xps/users.nix + home-manager.nixosModules.home-manager + { + system.configurationRevision = self.shortRev or self.dirtyShortRev or "dirty"; + + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + + users = { + whovian = { + imports = [ + ./home/home.nix + agenix.homeManagerModules.default + nix-index-database.hmModules.nix-index + ]; + }; + }; + + # Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix + extraSpecialArgs = { + system = "x86_64-linux"; + inherit xil; + inherit nixpkgs; + pkgs = import nixpkgs { + system = "x86_64-linux"; + config.allowUnfree = true; + }; + inherit agenix; + }; + }; + } + ]; + }; + */ }; packages.x86_64-linux = {