From c6554c72fbebe45698fada7f65a42422169b5bea Mon Sep 17 00:00:00 2001 From: Joshua Yuen Date: Sat, 24 Jan 2026 19:38:04 -0500 Subject: [PATCH] Improve live installation ISO --- flake.nix | 6 +++--- hosts/installation-iso/default.nix | 25 ++++++++++++++++++++++++ hosts/installation-iso/hardware.nix | 3 +++ hosts/installation-iso/host-packages.nix | 10 ++++++++++ modules/core/network.nix | 2 +- modules/core/user.nix | 6 ++++-- 6 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 hosts/installation-iso/default.nix create mode 100644 hosts/installation-iso/hardware.nix create mode 100644 hosts/installation-iso/host-packages.nix diff --git a/flake.nix b/flake.nix index d31f704..281ed14 100644 --- a/flake.nix +++ b/flake.nix @@ -55,14 +55,14 @@ inherit system; specialArgs = { inherit inputs; - inherit host; - inherit profile; + host = "installation-iso"; + profile = "desktop"; inherit username; }; modules = [ (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix") { environment.systemPackages = [ install-system.packages.${system}.default ]; } - ./hosts/${host} + ./hosts/installation-iso ]; }; }; diff --git a/hosts/installation-iso/default.nix b/hosts/installation-iso/default.nix new file mode 100644 index 0000000..ec5a949 --- /dev/null +++ b/hosts/installation-iso/default.nix @@ -0,0 +1,25 @@ +{ + ... +}: +{ + imports = [ + ../../modules/core + ../../modules/options + + ./hardware.nix + ./host-packages.nix + ]; + + modules.hyprland = { + enable = true; + terminal = "kitty"; + }; + + modules.plasma.enable = false; + modules.displayManager.displayManager = "gdm"; + + modules.zsh.enable = true; + modules.shell.defaultShell = "zsh"; + + modules.pipewire.enable = true; +} diff --git a/hosts/installation-iso/hardware.nix b/hosts/installation-iso/hardware.nix new file mode 100644 index 0000000..0db3279 --- /dev/null +++ b/hosts/installation-iso/hardware.nix @@ -0,0 +1,3 @@ +{ + +} diff --git a/hosts/installation-iso/host-packages.nix b/hosts/installation-iso/host-packages.nix new file mode 100644 index 0000000..5e293f8 --- /dev/null +++ b/hosts/installation-iso/host-packages.nix @@ -0,0 +1,10 @@ +{ + pkgs, + ... +}: +{ + environment.systemPackages = with pkgs; [ + parted + unixtools.fdisk + ]; +} diff --git a/modules/core/network.nix b/modules/core/network.nix index aff9449..fce7b48 100644 --- a/modules/core/network.nix +++ b/modules/core/network.nix @@ -7,7 +7,7 @@ networking = { hostName = "${host}"; networkmanager.enable = true; - wireless.enable = false; + wireless.enable = true; }; environment.systemPackages = with pkgs; [ networkmanagerapplet ]; diff --git a/modules/core/user.nix b/modules/core/user.nix index ebd2438..49678a7 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -48,8 +48,10 @@ in # Set /etc/shells so GDM will show our user when ZSH is selected environment.shells = [ pkgs.${shellCfg.defaultShell} ]; - # Needed to get completion for system packages (e.g. systemd) environment.pathsToLink = - [ ] + # Since Home Manager is installed via its NixOS module, we need to add this so that + # the portal definitions and DE provided configurations get linked + [ "/share/applications" "/share/xdg-desktop-portal" ] + # Needed to get completion for system packages (e.g. systemd) ++ (if zshCfg.enable then [ "/share/zsh" ] else [ ]); }