This commit is contained in:
2026-04-23 13:29:08 -05:00
parent ae0732d2a2
commit 62c6498568
3 changed files with 27 additions and 17 deletions

View File

@@ -2,14 +2,19 @@
flake.nixosModules.iso = { lib, pkgs, modulesPath, ... }: { flake.nixosModules.iso = { lib, pkgs, modulesPath, ... }: {
imports = with inputs; [ imports = with self.nixosModules; [
(modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix")
inputs.home-manager.nixosModules.default
self.nixosModules.default self.nixosModules.default
self.nixosModules.aurora-greeter aurora-greeter
hyprland
home-manager.nixosModules.default pipewire
avahi
netbird
openssh
]; ];
@@ -22,7 +27,8 @@
system.stateVersion = "25.11"; system.stateVersion = "25.11";
nixpkgs.hostPlatform = "x86_64-linux"; #nixpkgs.hostPlatform = "x86_64-linux";
nixpkgs.hostPlatform = pkgs.stdenv.hostPlatform.system;
users.users."nathan" = { users.users."nathan" = {
hashedPassword = "$y$j9T$F0pn6l4C45lz4a0FTZLqE0$Fc48Ptbmz/3MJCk/Jsaqop4ff.bY3J3GcjhmJx5R7k6"; hashedPassword = "$y$j9T$F0pn6l4C45lz4a0FTZLqE0$Fc48Ptbmz/3MJCk/Jsaqop4ff.bY3J3GcjhmJx5R7k6";
@@ -35,6 +41,9 @@
users.users.nixos.enable = lib.mkForce false; users.users.nixos.enable = lib.mkForce false;
networking = { networking = {
hostName = "iso";
nameservers = [ "1.1.1.1" "1.0.0.1" ]; nameservers = [ "1.1.1.1" "1.0.0.1" ];
networkmanager.enable = true; networkmanager.enable = true;
}; };

View File

@@ -6,8 +6,9 @@
flake.nixosConfigurations.iso = inputs.nixpkgs.lib.nixosSystem { flake.nixosConfigurations.iso = inputs.nixpkgs.lib.nixosSystem {
modules = [ modules = with self.nixosModules; [
self.nixosModules.iso iso
user-nathan
]; ];
}; };

View File

@@ -3,7 +3,7 @@
flake.nixosModules.user-nathan = { config, lib, pkgs, ... }: let flake.nixosModules.user-nathan = { config, lib, pkgs, ... }: let
laptop = [ "laptop" ]; laptop = [ "laptop" ];
homebox = [ "homebox" ]; homebox = [ "homebox" ];
#both = laptop ++ homebox; iso = [ "iso" ];
useWith = x: y: (lib.mkIf (builtins.any (z: z == config.networking.hostName) x) y); useWith = x: y: (lib.mkIf (builtins.any (z: z == config.networking.hostName) x) y);
in { in {
@@ -18,7 +18,7 @@
#hashedPasswordFile = lib.mkIf (cfg.hashedPasswordFile != null) cfg.hashedPasswordFile; #hashedPasswordFile = lib.mkIf (cfg.hashedPasswordFile != null) cfg.hashedPasswordFile;
extraGroups = [ "networkmanager" "docker" "libvirtd" "wheel" ]; extraGroups = [ "networkmanager" "docker" "libvirtd" "wheel" ];
openssh.authorizedKeys.keys = lib.mkMerge [ openssh.authorizedKeys.keys = lib.mkMerge [
(useWith homebox [ (useWith (homebox ++ iso) [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsU69CxfQk58CvItPN426h5Alnpb60SH37wet97Vb57 nathan@laptop" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsU69CxfQk58CvItPN426h5Alnpb60SH37wet97Vb57 nathan@laptop"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEnUhN2uHwAJF/SLRX3wlGRmfhV3zpP88JQAYB+gh8jW nathan@localhost" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEnUhN2uHwAJF/SLRX3wlGRmfhV3zpP88JQAYB+gh8jW nathan@localhost"
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCM7ZgIu4+ntHZbzo9iQPq5pUt7AhpOnfvvI0lWDgO4CgtkPGvyFrDnW87wjAKGKYkgKeHWHIkwq2hkEDqlPD+7xxtPpwzfyo7ZS23xlP31rL14HcG21jGHgx9SO7RmGDHHylu4PwJzz/KX59hcVmpSSV4hgB/mYA9UKe6VHv39X4y3HsjmiHwNBOKXltG4V+VkxOZD6HcZ62sgkyDTaqDpE7p+q8vHPbm6dVTKC9cMjtJmjB5EesMGKcEAy3VN2tA9M0EndtaLcBKM39vDXGpBsjURYZTu7NbQnncnO7L8kVL0nT4vA/d4mCjB51dPoXIcxn1ise0TOb9G7TxMbBQQO5YMOpiB2iuZRRvB3sYoKwbO8YfSxZi0EhvLcxkF9GBFw+pWPl0p0D2fPBbW88YQfEpoAt2EWvEu/pgaMJsTHpgaIuDwPLVQmDciX4MRoi324oElGSK8yN0P8IaCHhFchuehLBWvTi34Qot0GpnxeTzmlLzImICO9Yq0I7dk2rk= nathan@rpi-3dp" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCM7ZgIu4+ntHZbzo9iQPq5pUt7AhpOnfvvI0lWDgO4CgtkPGvyFrDnW87wjAKGKYkgKeHWHIkwq2hkEDqlPD+7xxtPpwzfyo7ZS23xlP31rL14HcG21jGHgx9SO7RmGDHHylu4PwJzz/KX59hcVmpSSV4hgB/mYA9UKe6VHv39X4y3HsjmiHwNBOKXltG4V+VkxOZD6HcZ62sgkyDTaqDpE7p+q8vHPbm6dVTKC9cMjtJmjB5EesMGKcEAy3VN2tA9M0EndtaLcBKM39vDXGpBsjURYZTu7NbQnncnO7L8kVL0nT4vA/d4mCjB51dPoXIcxn1ise0TOb9G7TxMbBQQO5YMOpiB2iuZRRvB3sYoKwbO8YfSxZi0EhvLcxkF9GBFw+pWPl0p0D2fPBbW88YQfEpoAt2EWvEu/pgaMJsTHpgaIuDwPLVQmDciX4MRoi324oElGSK8yN0P8IaCHhFchuehLBWvTi34Qot0GpnxeTzmlLzImICO9Yq0I7dk2rk= nathan@rpi-3dp"
@@ -37,14 +37,14 @@
home-manager.users.nathan = with self.homeModules; lib.mkMerge [ home-manager.users.nathan = with self.homeModules; lib.mkMerge [
self.homeModules.nathan self.homeModules.nathan
(useWith laptop nathan-aurora) (useWith (laptop ++ iso) nathan-aurora)
(useWith laptop nathan-firefox) (useWith (laptop ++ iso) nathan-firefox)
(useWith laptop nathan-rofi) (useWith (laptop ++ iso) nathan-rofi)
(useWith laptop nathan-hypridle) (useWith (laptop ++ iso) nathan-hypridle)
(useWith laptop nathan-hyprland) (useWith (laptop ++ iso) nathan-hyprland)
(useWith laptop nathan-kitty) (useWith (laptop ++ iso) nathan-kitty)
(useWith laptop nathan-scripts) (useWith (laptop ++ iso) nathan-scripts)
(useWith laptop nathan-pywal) (useWith (laptop ++ iso) nathan-pywal)
(useWith laptop { (useWith laptop {
wayland.windowManager.hyprland.extraConfig = '' wayland.windowManager.hyprland.extraConfig = ''