From e7e637b2f6988a720c1344451aba5a4b94adcc91 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Fri, 5 Sep 2025 18:44:50 +0200 Subject: [PATCH] feat: adds iris --- README.md | 1 + flake.nix | 10 ++++ hosts/iris/default.nix | 68 +++++++++++++++++++++++++++ hosts/iris/hardware-configuration.nix | 43 +++++++++++++++++ modules/core/sshd.nix | 1 + modules/core/virtualization.nix | 2 + 6 files changed, 125 insertions(+) create mode 100644 hosts/iris/default.nix create mode 100644 hosts/iris/hardware-configuration.nix diff --git a/README.md b/README.md index 56c28ba..78be231 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,7 @@ - [variables.nix](variables.nix): base variables useful for all hosts - [hosts](hosts): per-host configurations that contain host specific settings - [yoshino](hosts/yoshino/): Desktop (yoshino) specific configuration + - [iris](hosts/iris/): Desktop (iris) specific configuration - [sakura](hosts/sakura/): Laptop (sakura) specific configuration - [ichiyo](hosts/ichiyo/): Laptop (ichiyo) specific configuration - [violet](hosts/violet/): Server (violet) specific configuration diff --git a/flake.nix b/flake.nix index dee9411..74cece5 100644 --- a/flake.nix +++ b/flake.nix @@ -138,6 +138,16 @@ inherit self inputs username; }; }; + iris = nixpkgs.lib.nixosSystem { + inherit system; + modules = [ + (import ./hosts/iris) + ]; + specialArgs = { + host = "iris"; + inherit self inputs username; + }; + }; }; }; } diff --git a/hosts/iris/default.nix b/hosts/iris/default.nix new file mode 100644 index 0000000..bc47be4 --- /dev/null +++ b/hosts/iris/default.nix @@ -0,0 +1,68 @@ +{ + inputs, + pkgs, + config, + lib, + ... +}: +{ + imports = [ + ./hardware-configuration.nix + ./../../modules/core + # ./../../modules/home/nfs.nix + ./../../modules/core/virtualization.nix + ./../../modules/services/tailscale.nix + ./../../modules/services/mpd.nix + ]; + + powerManagement = { + enable = true; + # powertop.enable = true; + cpuFreqGovernor = lib.mkDefault "performance"; + }; + + networking = { + hostName = "iris"; + networkmanager.enable = true; + }; + + systemd.network.networks."99-local" = { + matchConfig.name = "enp68s0"; + address = [ + "192.168.1.100/24" + ]; + routes = [ + { + Gateway = "172.16.10.1"; + GatewayOnLink = false; + } + ]; + }; + + liv = { + desktop.enable = true; + creative.enable = true; + amdgpu.enable = true; + wine.enable = false; # use VM for this + gui.enable = true; + }; + + boot = { + kernelParams = [ ]; + kernelModules = [ "acpi_call" ]; + kernelPackages = pkgs.linuxPackages_latest; + loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + systemd-boot.configurationLimit = 10; + }; + extraModulePackages = + with config.boot.kernelPackages; + [ + acpi_call + cpupower + v4l2loopback + ] + ++ [ pkgs.cpupower-gui ]; + }; +} diff --git a/hosts/iris/hardware-configuration.nix b/hosts/iris/hardware-configuration.nix new file mode 100644 index 0000000..81f813e --- /dev/null +++ b/hosts/iris/hardware-configuration.nix @@ -0,0 +1,43 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/6609be3d-2dda-4961-9247-6463349f196c"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."luks-e8a36fde-6d6f-4650-b0dc-3152ef561c99".device = "/dev/disk/by-uuid/e8a36fde-6d6f-4650-b0dc-3152ef561c99"; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/1793-F35D"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = [ ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.eno1.useDHCP = lib.mkDefault true; + # networking.interfaces.ens4f0.useDHCP = lib.mkDefault true; + # networking.interfaces.ens4f1.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/modules/core/sshd.nix b/modules/core/sshd.nix index 9cccd6d..64d60bd 100644 --- a/modules/core/sshd.nix +++ b/modules/core/sshd.nix @@ -17,6 +17,7 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGXi00z/rxVrWLKgYr+tWIsbHsSQO75hUMSTThNm5wUw liv@sakura" # sakura "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHv2zxCy22KU1tZOH2hA1p8fWVpOSrTYF68+3E5r330O liv@ichiyo" # ichiyo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEDltZ7vfyrLrl32TIWCC3iUx40TrCtIz6Ssi/SZvikg liv@zinnia" # zinnia + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKQtG69zrMFsoHForwZEi66y1tPvctqg1OgjQFrF3OI+ liv@iris" # iris "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO7mHVQp99G0osUAtnVoq5TARR8x5wjCkdbe7ChnzLRa liv@azalea" # linux phone "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ2nsQHyWnrmuQway0ehoMUcYYfhD8Ph/vpD0Tzip1b1 liv@meow" # xz1c diff --git a/modules/core/virtualization.nix b/modules/core/virtualization.nix index 3ad3ae8..e800e35 100644 --- a/modules/core/virtualization.nix +++ b/modules/core/virtualization.nix @@ -10,6 +10,8 @@ true else if (host == "yoshino") then true + else if (host == "iris") then + true else false; spiceUSBRedirection.enable = true;