diff --git a/flake.nix b/flake.nix index f916bc2..a8b4071 100644 --- a/flake.nix +++ b/flake.nix @@ -42,6 +42,7 @@ modules = [ nixos-hardware.nixosModules.framework-11th-gen-intel ./system + ./system/hardware-configuration.nix ./programs ./hertog/user.nix nix-flatpak.nixosModules.nix-flatpak @@ -64,6 +65,34 @@ inherit system; }; }; + + alex = lib.nixosSystem { + inherit system; + modules = [ + "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" + ./system + ./programs + ./hertog/user.nix + nix-flatpak.nixosModules.nix-flatpak + home-manager.nixosModules.home-manager { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + users = { + hertog = import hertog/home.nix; + }; + extraSpecialArgs = { + inherit inputs; + }; + }; + } + ]; + specialArgs = { + inputs = inputs; + inherit nix-colors; + inherit system; + }; + }; }; packages."${system}" = { vim = nixvim.legacyPackages."${system}".makeNixvimWithModule { diff --git a/system/boot.nix b/system/boot.nix new file mode 100644 index 0000000..8637873 --- /dev/null +++ b/system/boot.nix @@ -0,0 +1,12 @@ +{ + boot = { + loader = { + timeout = 0; + efi.canTouchEfiVariables = true; + systemd-boot = { + enable = true; + editor = false; + }; + }; + }; +} diff --git a/system/default.nix b/system/default.nix index 126ad08..affb28a 100644 --- a/system/default.nix +++ b/system/default.nix @@ -1,12 +1,12 @@ { imports = [ + ./boot.nix ./environment.nix ./locale.nix ./networking.nix ./xserver.nix ./services.nix ./appliances.nix - ./hardware-configuration.nix ]; nix = {