From f780780523be8287e090059e93d515ce105ee1c6 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Thu, 22 Aug 2024 10:09:10 -0400 Subject: [PATCH] remove richie machines --- systems/bob/configuration.nix | 106 -------------------- systems/bob/default.nix | 8 -- systems/bob/hardware.nix | 66 ------------ systems/bob/nvidia.nix | 13 --- systems/bob/steam.nix | 15 --- systems/rhapsody-in-green/configuration.nix | 100 ------------------ systems/rhapsody-in-green/default.nix | 9 -- systems/rhapsody-in-green/hardware.nix | 50 --------- 8 files changed, 367 deletions(-) delete mode 100644 systems/bob/configuration.nix delete mode 100644 systems/bob/default.nix delete mode 100644 systems/bob/hardware.nix delete mode 100644 systems/bob/nvidia.nix delete mode 100644 systems/bob/steam.nix delete mode 100644 systems/rhapsody-in-green/configuration.nix delete mode 100644 systems/rhapsody-in-green/default.nix delete mode 100644 systems/rhapsody-in-green/hardware.nix diff --git a/systems/bob/configuration.nix b/systems/bob/configuration.nix deleted file mode 100644 index c49540c..0000000 --- a/systems/bob/configuration.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ - imports = [ - ../../users/richie/global/desktop.nix - ../../users/richie/global/ssh.nix - ../../users/richie/global/syncthing_base.nix - ../../users/richie/global/zerotier.nix - ./hardware.nix - ./nvidia.nix - ./steam.nix - ]; - - boot = { - useSystemdBoot = true; - default = true; - }; - - networking = { - networkmanager.enable = true; - hostId = "9ab3b18e"; - }; - - hardware = { - pulseaudio.enable = false; - bluetooth = { - enable = true; - powerOnBoot = true; - }; - }; - - security.rtkit.enable = true; - - services = { - autopull.enable = false; - - displayManager.sddm.enable = true; - - openssh.ports = [ 262 ]; - - printing.enable = true; - - pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - - rad-dev.k3s-net.enable = false; - - syncthing.settings.folders = { - "notes" = { - id = "l62ul-lpweo"; # cspell:disable-line - path = "/home/richie/notes"; - devices = [ - "phone" - "jeeves" - "rhapsody-in-green" - ]; - fsWatcherEnabled = true; - }; - "books" = { - id = "6uppx-vadmy"; # cspell:disable-line - path = "/home/richie/books"; - devices = [ - "phone" - "jeeves" - "rhapsody-in-green" - ]; - fsWatcherEnabled = true; - }; - "important" = { - id = "4ckma-gtshs"; # cspell:disable-line - path = "/home/richie/important"; - devices = [ - "phone" - "jeeves" - "rhapsody-in-green" - ]; - fsWatcherEnabled = true; - }; - "music" = { - id = "vprc5-3azqc"; # cspell:disable-line - path = "/home/richie/music"; - devices = [ - "phone" - "jeeves" - "rhapsody-in-green" - ]; - fsWatcherEnabled = true; - }; - "projects" = { - id = "vyma6-lqqrz"; # cspell:disable-line - path = "/home/richie/projects"; - devices = [ - "jeeves" - "rhapsody-in-green" - ]; - fsWatcherEnabled = true; - }; - }; - }; - - system.autoUpgrade.enable = false; - - system.stateVersion = "23.11"; -} diff --git a/systems/bob/default.nix b/systems/bob/default.nix deleted file mode 100644 index 712e2ed..0000000 --- a/systems/bob/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ ... }: -{ - users = [ "richie" ]; - system = "x86_64-linux"; - home = true; - sops = true; - server = false; -} diff --git a/systems/bob/hardware.nix b/systems/bob/hardware.nix deleted file mode 100644 index db9f28a..0000000 --- a/systems/bob/hardware.nix +++ /dev/null @@ -1,66 +0,0 @@ -# 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, - modulesPath, - ... -}: - -{ - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - - boot = { - initrd = { - availableKernelModules = [ - "nvme" - "xhci_pci" - "ahci" - "usb_storage" - "sd_mod" - ]; - kernelModules = [ ]; - luks.devices = { - "luks-rpool-nvme-Samsung_SSD_970_EVO_Plus_1TB_S6S1NS0T617615W-part2".device = "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_1TB_S6S1NS0T617615W-part2"; - }; - }; - kernelModules = [ "kvm-amd" ]; - extraModulePackages = [ ]; - }; - - fileSystems = { - "/" = lib.mkDefault { - device = "rpool/root"; - fsType = "zfs"; - }; - - "/home" = { - device = "rpool/home"; - fsType = "zfs"; - }; - - "/boot" = { - device = "/dev/disk/by-uuid/8AE6-270D"; - 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.enp5s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp11s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/systems/bob/nvidia.nix b/systems/bob/nvidia.nix deleted file mode 100644 index 2970577..0000000 --- a/systems/bob/nvidia.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, ... }: -{ - services.xserver.videoDrivers = [ "nvidia" ]; - hardware = { - nvidia = { - modesetting.enable = true; - powerManagement.enable = true; - package = config.boot.kernelPackages.nvidiaPackages.production; - nvidiaSettings = true; - }; - nvidia-container-toolkit.enable = true; - }; -} diff --git a/systems/bob/steam.nix b/systems/bob/steam.nix deleted file mode 100644 index 17c2e23..0000000 --- a/systems/bob/steam.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs, ... }: - -{ - environment.systemPackages = [ pkgs.steam-run ]; - hardware.steam-hardware.enable = true; - programs = { - steam = { - enable = true; - remotePlay.openFirewall = true; - localNetworkGameTransfers.openFirewall = true; - extraCompatPackages = with pkgs; [ proton-ge-bin ]; - extest.enable = true; - }; - }; -} diff --git a/systems/rhapsody-in-green/configuration.nix b/systems/rhapsody-in-green/configuration.nix deleted file mode 100644 index b468259..0000000 --- a/systems/rhapsody-in-green/configuration.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ - imports = [ - ../../users/richie/global/desktop.nix - ../../users/richie/global/syncthing_base.nix - ../../users/richie/global/zerotier.nix - ./hardware.nix - ]; - - boot = { - useSystemdBoot = true; - default = true; - }; - - networking = { - networkmanager.enable = true; - hostId = "9b68eb32"; - }; - - hardware = { - pulseaudio.enable = false; - bluetooth = { - enable = true; - powerOnBoot = true; - }; - }; - - security.rtkit.enable = true; - - services = { - autopull.enable = false; - - displayManager.sddm.enable = true; - - openssh.ports = [ 922 ]; - - printing.enable = true; - - pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - - syncthing.settings.folders = { - "notes" = { - id = "l62ul-lpweo"; # cspell:disable-line - path = "/home/richie/notes"; - devices = [ - "bob" - "phone" - "jeeves" - ]; - fsWatcherEnabled = true; - }; - "books" = { - id = "6uppx-vadmy"; # cspell:disable-line - path = "/home/richie/books"; - devices = [ - "bob" - "phone" - "jeeves" - ]; - fsWatcherEnabled = true; - }; - "important" = { - id = "4ckma-gtshs"; # cspell:disable-line - path = "/home/richie/important"; - devices = [ - "bob" - "phone" - "jeeves" - ]; - fsWatcherEnabled = true; - }; - "music" = { - id = "vprc5-3azqc"; # cspell:disable-line - path = "/home/richie/music"; - devices = [ - "bob" - "phone" - "jeeves" - ]; - fsWatcherEnabled = true; - }; - "projects" = { - id = "vyma6-lqqrz"; # cspell:disable-line - path = "/home/richie/projects"; - devices = [ - "bob" - "jeeves" - ]; - fsWatcherEnabled = true; - }; - }; - }; - - system.autoUpgrade.enable = false; - system.stateVersion = "23.11"; -} diff --git a/systems/rhapsody-in-green/default.nix b/systems/rhapsody-in-green/default.nix deleted file mode 100644 index 3fdacca..0000000 --- a/systems/rhapsody-in-green/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ inputs, ... }: -{ - users = [ "richie" ]; - system = "x86_64-linux"; - home = true; - sops = true; - server = false; - modules = [ inputs.nixos-hardware.nixosModules.framework-13-7040-amd ]; -} diff --git a/systems/rhapsody-in-green/hardware.nix b/systems/rhapsody-in-green/hardware.nix deleted file mode 100644 index 6faf14e..0000000 --- a/systems/rhapsody-in-green/hardware.nix +++ /dev/null @@ -1,50 +0,0 @@ -# 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, - modulesPath, - ... -}: - -{ - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - - boot = { - - initrd.availableKernelModules = [ - "nvme" - "xhci_pci" - "thunderbolt" - "usbhid" - ]; - initrd.kernelModules = [ ]; - kernelModules = [ "kvm-amd" ]; - extraModulePackages = [ ]; - }; - - fileSystems."/" = lib.mkDefault { - device = "/dev/disk/by-uuid/c5cc486b-0076-40b0-9402-7ddb2b4a7fdf"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/D571-3949"; - fsType = "vfat"; - }; - - swapDevices = [ { device = "/dev/disk/by-uuid/57a25825-69a9-41ac-999e-5137a01edc9e"; } ]; - - # 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.docker0.useDHCP = lib.mkDefault true; - # networking.interfaces.enp195s0f3u1u3.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -}