From f7b25b3316473f88411f23edf189c49e41e3fc33 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 2 Aug 2025 00:40:47 +0200 Subject: [PATCH 1/4] feat: adds `sshuttle` to gui systems --- roles/gui.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/gui.nix b/roles/gui.nix index 150c808..387ed07 100644 --- a/roles/gui.nix +++ b/roles/gui.nix @@ -46,6 +46,9 @@ in # Gaming lunar-client + + # Not GUI but specific to GUI usage + sshuttle ]; }; } From 96772558fada8c5953e8992d0796c6147fab7d7b Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 2 Aug 2025 01:14:21 +0200 Subject: [PATCH 2/4] feat: adds `daisy` host --- hosts/daisy/default.nix | 48 ++++++++++++++++++++++++++ hosts/daisy/hardware-configuration.nix | 37 ++++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 hosts/daisy/default.nix create mode 100644 hosts/daisy/hardware-configuration.nix diff --git a/hosts/daisy/default.nix b/hosts/daisy/default.nix new file mode 100644 index 0000000..f511347 --- /dev/null +++ b/hosts/daisy/default.nix @@ -0,0 +1,48 @@ +{ + pkgs, + config, + lib, + ... +}: +{ + imports = [ + ./hardware-configuration.nix + ./../../modules/core/default.server.nix + # ./../../modules/services/violet.nix + ]; + + networking = { + hostName = "daisy"; + networkmanager.enable = true; + firewall = { + allowedTCPPorts = [ + # 80 + # 443 + # 25565 + 9123 + ]; + }; + }; + + time.timeZone = "Europe/Amsterdam"; + + environment.systemPackages = with pkgs; [ + pkgs.kitty.terminfo + ]; + + boot = { + loader.grub = { + enable = true; + device = "/dev/sdb"; + useOSProber = true; + }; + kernelModules = [ "acpi_call" ]; + extraModulePackages = + with config.boot.kernelPackages; + [ + acpi_call + cpupower + ] + ++ [ pkgs.cpupower-gui ]; + }; +} diff --git a/hosts/daisy/hardware-configuration.nix b/hosts/daisy/hardware-configuration.nix new file mode 100644 index 0000000..4508655 --- /dev/null +++ b/hosts/daisy/hardware-configuration.nix @@ -0,0 +1,37 @@ +# 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 = [ "ehci_pci" "ahci" "uhci_hcd" "hpsa" "mpt3sas" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/02aaca49-be45-42ad-ba44-6f5dbfe9032e"; + fsType = "ext4"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/40aff86f-c371-4f7f-ab62-5665c4f1c071"; } + ]; + + # 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.eno2.useDHCP = lib.mkDefault true; + # networking.interfaces.eno3.useDHCP = lib.mkDefault true; + # networking.interfaces.eno4.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} From 0547c948ab95f966f01e97f5df47e350eb193061 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 2 Aug 2025 01:17:07 +0200 Subject: [PATCH 3/4] feat: adds `hazel` and `daisy` as servers instead of normal user machines --- modules/core/user.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/core/user.nix b/modules/core/user.nix index eef3a74..8370132 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -26,6 +26,10 @@ [ ./../home/default.server.nix ] else if (host == "posy") then [ ./../home/default.server.nix ] + else if (host == "hazel") then + [ ./../home/default.server.nix ] + else if (host == "daisy") then + [ ./../home/default.server.nix ] # else if (host == "yoshino") then # [ ./../home/default.nix ] else From ff942eb88a369e9e9b9f8206e241f53ab2473586 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 2 Aug 2025 01:17:19 +0200 Subject: [PATCH 4/4] feat: adds `daisy` host to flake --- flake.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/flake.nix b/flake.nix index ddd5625..dee9411 100644 --- a/flake.nix +++ b/flake.nix @@ -128,6 +128,16 @@ inherit self inputs username; }; }; + daisy = nixpkgs.lib.nixosSystem { + inherit system; + modules = [ + (import ./hosts/daisy) + ]; + specialArgs = { + host = "daisy"; + inherit self inputs username; + }; + }; }; }; }