From 362d6725408e25a5c9c10db24364dca7e7e12475 Mon Sep 17 00:00:00 2001 From: Madeline Hashcube Date: Fri, 24 Apr 2026 18:09:10 -0500 Subject: [PATCH] fixup the iso image thing --- configurations/iso/test/configuration.nix | 16 +++++----------- flake.nix | 5 +++++ modules/boot/plymouth.nix | 4 ++-- modules/self.nix | 1 + modules/users/hashcube.nix | 7 ++++++- users/hashcube/euclase.nix | 16 ++++++++++++++++ 6 files changed, 35 insertions(+), 14 deletions(-) create mode 100644 users/hashcube/euclase.nix diff --git a/configurations/iso/test/configuration.nix b/configurations/iso/test/configuration.nix index 7b825b0..70f31b5 100644 --- a/configurations/iso/test/configuration.nix +++ b/configurations/iso/test/configuration.nix @@ -1,19 +1,13 @@ -{ pkgs, modulesPath, ... }: +{ lib, modulesPath, ... }: { imports = [ - "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" + "${modulesPath}/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix" ]; - nixpkgs.hostPlatform = "x86_64-linux"; - - environment.systemPackages = with pkgs; [ - git - neovim - disko - ]; + networking.hostName = "euclase"; - nix.settings.experimental-features = [ "nix-command" "flakes" ]; + services.displayManager.autoLogin.user = lib.mkForce "hashcube"; - services.desktopManager.cosmic.enable = true; + nixpkgs.hostPlatform = "x86_64-linux"; } diff --git a/flake.nix b/flake.nix index 636b6ab..adfa850 100644 --- a/flake.nix +++ b/flake.nix @@ -129,10 +129,15 @@ testIso = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; + nixpkgs.config.allowUnfree = true; }; modules = [ + catppuccin.nixosModules.catppuccin nixvim.nixosModules.nixvim + home-manager.nixosModules.home-manager + ./modules/min.nix + ./modules/users/hashcube.nix ./configurations/iso/test/configuration.nix ]; }; diff --git a/modules/boot/plymouth.nix b/modules/boot/plymouth.nix index 6a5def2..1e3dabc 100644 --- a/modules/boot/plymouth.nix +++ b/modules/boot/plymouth.nix @@ -1,4 +1,4 @@ -{ ... }: +{ lib, ... }: { boot = { @@ -17,6 +17,6 @@ # Hide the OS choice for bootloaders. # It's still possible to open the bootloader list by pressing any key # It will just not appear on screen unless a key is pressed - loader.timeout = 0; + loader.timeout = lib.mkDefault 0; }; } diff --git a/modules/self.nix b/modules/self.nix index 9dd24d5..88d2b4a 100644 --- a/modules/self.nix +++ b/modules/self.nix @@ -2,4 +2,5 @@ { nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nixpkgs.config.allowUnfree = true; } diff --git a/modules/users/hashcube.nix b/modules/users/hashcube.nix index c42f4dd..ffbf374 100644 --- a/modules/users/hashcube.nix +++ b/modules/users/hashcube.nix @@ -20,7 +20,12 @@ home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.users.hashcube = { imports = [ - (if config.networking.hostName == "iolite" then ../../users/hashcube/iolite.nix else ../../users/hashcube/.) + (if config.networking.hostName == "iolite" then + ../../users/hashcube/iolite.nix + else if config.networking.hostName == "euclase" then + ../../users/hashcube/euclase.nix + else + ../../users/hashcube/.) inputs.zen-browser.homeModules.beta inputs.catppuccin.homeModules.catppuccin inputs.nixvim.homeModules.nixvim diff --git a/users/hashcube/euclase.nix b/users/hashcube/euclase.nix new file mode 100644 index 0000000..fba1853 --- /dev/null +++ b/users/hashcube/euclase.nix @@ -0,0 +1,16 @@ +{ ... }: + +{ + imports = [ + ./programs/iolite.nix + ./services/. + ./i18n/. + ./theming/. + ./pkgs/. + + ./user.nix + ./catppuccin.nix + ./files.nix + ./xdg.nix + ]; +} -- 2.51.2