From ed4062b85ba2ac753ed295399a213535a596f5d8 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 8 Jul 2024 18:21:48 +1000 Subject: [PATCH] hosts/{blossom,sugarcane}: decommission --- hosts/blossom/default.nix | 36 ----------------------------- hosts/blossom/filesystem.nix | 41 ---------------------------------- hosts/blossom/kernel.nix | 25 --------------------- hosts/blossom/networking.nix | 31 ------------------------- hosts/sugarcane/default.nix | 28 ----------------------- hosts/sugarcane/filesystem.nix | 29 ------------------------ hosts/sugarcane/kernel.nix | 17 -------------- hosts/sugarcane/networking.nix | 11 --------- hosts/sugarcane/packages.nix | 14 ------------ 9 files changed, 232 deletions(-) delete mode 100644 hosts/blossom/default.nix delete mode 100644 hosts/blossom/filesystem.nix delete mode 100644 hosts/blossom/kernel.nix delete mode 100644 hosts/blossom/networking.nix delete mode 100644 hosts/sugarcane/default.nix delete mode 100644 hosts/sugarcane/filesystem.nix delete mode 100644 hosts/sugarcane/kernel.nix delete mode 100644 hosts/sugarcane/networking.nix delete mode 100644 hosts/sugarcane/packages.nix diff --git a/hosts/blossom/default.nix b/hosts/blossom/default.nix deleted file mode 100644 index 4c13361..0000000 --- a/hosts/blossom/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ config, inputs, modules, overlays, pkgs, ... }: { - networking.hostName = "blossom"; - system.stateVersion = "21.11"; - time.timeZone = "Asia/Phnom_Penh"; - - boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; - nixpkgs.overlays = [ inputs.neovim-nightly.overlay ]; - age.secrets = { - passwd.file = ../../secrets/passwd.age; - wg_blossom.file = ../../secrets/wg_blossom.age; - wpa_conf.file = ../../secrets/wpa_conf.age; - }; - imports = with modules.system; [ - inputs.home-manager.nixosModule - home-manager - - audio - base - greetd - gui - input - kernel - nix - packages - security - snapper - wireguard - - ./filesystem.nix - ./kernel.nix - ./networking.nix - - ../../users/rin - ]; -} - diff --git a/hosts/blossom/filesystem.nix b/hosts/blossom/filesystem.nix deleted file mode 100644 index 9f6bf1c..0000000 --- a/hosts/blossom/filesystem.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ config, ... }: -let - mkMount = uuid: type: { - device = "/dev/disk/by-uuid/${uuid}"; - fsType = type; - options = [ "defaults" "relatime" ]; - }; - mkBtrfsMount = subvolid: atime: mkMount "cf0f4302-f006-46a5-afc7-ada04d17f6f2" "btrfs" // { - options = [ "autodefrag" "compress=zstd:3" "defaults" "discard=async" "space_cache=v2" "ssd" "subvolid=${builtins.toString subvolid}" (if atime then "relatime" else "noatime") ]; - }; -in -{ - fileSystems = { - "/" = { - device = "rootfs"; - fsType = "tmpfs"; - options = [ "defaults" "size=4G" "mode=755" ]; - }; - "/boot" = mkMount "186A-A42E" "vfat"; - - "/mnt/butter" = mkBtrfsMount 5 true; - "/nix" = mkBtrfsMount 257 false; - "/home" = mkBtrfsMount 259 true; - "/home/.snapshots" = mkBtrfsMount 262 false; - "/root" = mkBtrfsMount 260 false; - "/var" = mkBtrfsMount 258 false; - "/persist" = { - depends = [ "/var" ]; - device = "/var/persist"; - fsType = "none"; - options = [ "bind" ]; - neededForBoot = true; - }; - - # "/mnt/nfs" = { - # device = "192.168.100.11:/srv/nfs"; - # fsType = "nfs"; - # options = [ "defaults" ]; - # }; - }; -} diff --git a/hosts/blossom/kernel.nix b/hosts/blossom/kernel.nix deleted file mode 100644 index 935d709..0000000 --- a/hosts/blossom/kernel.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ config, lib, pkgs, ... }: { - boot = { - loader = { - efi.canTouchEfiVariables = true; - grub = { - enable = true; - efiSupport = true; - device = "nodev"; - useOSProber = lib.mkForce false; - }; - }; - initrd.kernelModules = [ "i915" ]; - kernelParams = [ - "amdgpu.gpu_recovery=1" - "amdgpu.si_support=1" - "radeon.si_support=0" - "intel_pstate=passive" - "msr.allow_writes=on" - ]; - kernelPackages = lib.mkForce (pkgs.linuxPackagesFor pkgs.me.linux-lava); - - extraModulePackages = [ config.boot.kernelPackages.v4l2loopback.out ]; - kernelModules = [ "v4l2loopback" ]; - }; -} diff --git a/hosts/blossom/networking.nix b/hosts/blossom/networking.nix deleted file mode 100644 index 2e0f6a6..0000000 --- a/hosts/blossom/networking.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, ... }: { - environment.etc."wpa_supplicant.conf".source = config.age.secrets.wpa_conf.path; - networking = { - wireless = { - enable = true; - interfaces = [ "wlp3s0" ]; - }; - - useDHCP = false; - interfaces.eno1.useDHCP = false; - interfaces.wlp3s0.useDHCP = false; - - interfaces.eno1.ipv4.addresses = [{ - address = "10.0.0.2"; - prefixLength = 24; - }]; - interfaces.wlp3s0.ipv4.addresses = [{ - address = "192.168.100.13"; - prefixLength = 24; - }]; - defaultGateway = "192.168.100.1"; - nameservers = [ "192.168.100.15" ]; - - extraHosts = '' - 192.168.100.12 strawberry - 192.168.100.15 caramel - - 10.100.0.1 sugarcane - ''; - }; -} diff --git a/hosts/sugarcane/default.nix b/hosts/sugarcane/default.nix deleted file mode 100644 index fb2a276..0000000 --- a/hosts/sugarcane/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, inputs, modules, modulesPath, overlays, pkgs, ... }: { - networking.hostName = "sugarcane"; - system.stateVersion = "21.11"; - time.timeZone = "Asia/Singapore"; - - age.secrets = { - passwd.file = ../../secrets/passwd.age; - wg_sugarcane.file = ../../secrets/wg_sugarcane.age; - }; - imports = with modules.system; [ - (modulesPath + "/profiles/qemu-guest.nix") - inputs.home-manager-raccoon.nixosModule - - base - home-manager - input - nix-stable - security - wireguard - - ./filesystem.nix - ./kernel.nix - ./networking.nix - ./packages.nix - - ../../users/hana - ]; -} diff --git a/hosts/sugarcane/filesystem.nix b/hosts/sugarcane/filesystem.nix deleted file mode 100644 index cc3db8e..0000000 --- a/hosts/sugarcane/filesystem.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ config, ... }: -let - bind = src: { - depends = [ "/nix" ]; - device = src; - fsType = "none"; - neededForBoot = true; - options = [ "bind" ]; - }; -in { - fileSystems = { - "/" = { - device = "rootfs"; - fsType = "tmpfs"; - options = [ "defaults" "size=1G" "mode=755" ]; - }; - - "/nix" = { - device = "/dev/disk/by-uuid/19d572a8-1cf6-4b9c-94c6-3ce6be54f719"; - fsType = "ext4"; - options = [ "defaults" "noatime" ]; - neededForBoot = true; - }; - - "/persist" = bind "/nix/persist"; - "/var/log/journal" = bind "/nix/persist/journal"; - "/boot" = bind "/nix/persist/boot"; - }; -} diff --git a/hosts/sugarcane/kernel.nix b/hosts/sugarcane/kernel.nix deleted file mode 100644 index 35c4452..0000000 --- a/hosts/sugarcane/kernel.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ config, inputs, pkgs, ... }: { - boot = { - loader = { - systemd-boot.enable = false; - efi.canTouchEfiVariables = true; - grub = { - enable = true; - device = "/dev/sda"; - }; - }; - initrd.kernelModules = [ "nvme" ]; - kernel.sysctl = { - "kernel.core_pattern" = "|/bin/false"; - "kernel.sysrq" = 1; - }; - }; -} diff --git a/hosts/sugarcane/networking.nix b/hosts/sugarcane/networking.nix deleted file mode 100644 index 5218f0d..0000000 --- a/hosts/sugarcane/networking.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, ... }: { - networking = { - useDHCP = false; - interfaces.ens3.useDHCP = true; - - extraHosts = '' - 10.100.0.3 blossom - 10.100.0.4 strawberry - ''; - }; -} diff --git a/hosts/sugarcane/packages.nix b/hosts/sugarcane/packages.nix deleted file mode 100644 index e3e3f15..0000000 --- a/hosts/sugarcane/packages.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ lib, pkgs, ... }: { - environment.systemPackages = with pkgs; [ - git - htop - jq - neovim - rsync - sshfs - wget - - kitty.terminfo - ]; - environment.variables.EDITOR = "nvim"; -}