From c8235346fe342df4aebc3f47d4f29040162dbe61 Mon Sep 17 00:00:00 2001 From: Mel Date: Tue, 15 Oct 2024 15:52:11 +0200 Subject: Bring in bismuth configuration Signed-off-by: Mel --- machines/bismuth/default.nix | 27 +++++++++++++++ machines/bismuth/devices.nix | 75 ++++++++++++++++++++++++++++++++++++++++++ machines/bismuth/hardware.nix | 37 +++++++++++++++++++++ machines/bismuth/home.nix | 9 +++++ machines/devices/graphite.nix | 68 -------------------------------------- machines/graphite.nix | 14 -------- machines/graphite/default.nix | 14 ++++++++ machines/graphite/devices.nix | 68 ++++++++++++++++++++++++++++++++++++++ machines/graphite/hardware.nix | 39 ++++++++++++++++++++++ machines/graphite/home.nix | 9 +++++ machines/hardware/graphite.nix | 39 ---------------------- 11 files changed, 278 insertions(+), 121 deletions(-) create mode 100644 machines/bismuth/default.nix create mode 100644 machines/bismuth/devices.nix create mode 100644 machines/bismuth/hardware.nix create mode 100644 machines/bismuth/home.nix delete mode 100644 machines/devices/graphite.nix delete mode 100644 machines/graphite.nix create mode 100644 machines/graphite/default.nix create mode 100644 machines/graphite/devices.nix create mode 100644 machines/graphite/hardware.nix create mode 100644 machines/graphite/home.nix delete mode 100644 machines/hardware/graphite.nix (limited to 'machines') diff --git a/machines/bismuth/default.nix b/machines/bismuth/default.nix new file mode 100644 index 0000000..8dbdd14 --- /dev/null +++ b/machines/bismuth/default.nix @@ -0,0 +1,27 @@ +{ ... }: + +{ + imports = [ + ../../modules/common.nix + + ./hardware.nix + ./devices.nix + + ../../modules/jellyfin.nix + ../../modules/nvidia.nix + ]; + + networking.hostName = "Bismuth"; + + # expose vm web interface to tailnet + services.tailscale.extraUpFlags = [ + "--advertise-routes=192.168.122.100/32" + ]; + + # set monitor configuration for gdm + systemd.tmpfiles.rules = [ + "L+ /run/gdm/.config/monitors.xml - - - - ${../../configs/monitors.xml}" + ]; + + system.stateVersion = "23.11"; +} diff --git a/machines/bismuth/devices.nix b/machines/bismuth/devices.nix new file mode 100644 index 0000000..06fa69f --- /dev/null +++ b/machines/bismuth/devices.nix @@ -0,0 +1,75 @@ +{ config, pkgs, ... }: + +{ + # boot settings + boot = { + loader.grub = { + enable = true; + devices = [ "nodev" ]; + efiSupport = true; + useOSProber = true; + gfxmodeEfi = "1366x768x32"; + }; + + loader.efi.canTouchEfiVariables = true; + + plymouth.enable = true; + + initrd.systemd.enable = true; + }; + + # swap + swapDevices = [{ + device = "/var/swapfile"; + size = 8 * 1024; + }]; + + # internet + networking.networkmanager.enable = true; + + # sound + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa = { enable = true; support32Bit = true; }; + pulse.enable = true; + jack.enable = true; + }; + + # extra filesystems + boot.supportedFilesystems = [ "ntfs" ]; + + fileSystems = { + "/run/media/mel/Duo" = { + device = "/dev/disk/by-label/Duo"; + fsType = "ntfs-3g"; + options = [ "rw" "uid=1000" ]; + }; + "/run/media/mel/Half" = { + device = "/dev/disk/by-label/Half"; + fsType = "ntfs-3g"; + options = [ "rw" "uid=1000" ]; + }; + "/run/media/mel/Main" = { + device = "/dev/disk/by-label/Main"; + fsType = "ntfs-3g"; + options = [ "rw" "uid=1000" ]; + }; + }; + + # printing + services.printing = { + enable = true; + stateless = true; + startWhenNeeded = true; + }; + + services.avahi.enable = false; + #services.avahi = { + # enable = true; + # nssmdns4 = true; + # openFirewall = true; + #}; +} diff --git a/machines/bismuth/hardware.nix b/machines/bismuth/hardware.nix new file mode 100644 index 0000000..272f987 --- /dev/null +++ b/machines/bismuth/hardware.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 = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/58d99ea0-ea5e-465a-a5aa-4dc6f6d02e55"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/F2C3-B4E5"; + fsType = "vfat"; + }; + + 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; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/machines/bismuth/home.nix b/machines/bismuth/home.nix new file mode 100644 index 0000000..2ba6f25 --- /dev/null +++ b/machines/bismuth/home.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: + +{ + imports = [ + ../../modules/home/common.nix + ]; + + home.stateVersion = "23.11"; +} diff --git a/machines/devices/graphite.nix b/machines/devices/graphite.nix deleted file mode 100644 index f8b7631..0000000 --- a/machines/devices/graphite.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ config, pkgs, ... }: - -{ - hardware = { - enableAllFirmware = true; - enableRedistributableFirmware = true; - }; - - # boot settings - boot = { - loader.systemd-boot.enable = true; - loader.efi.canTouchEfiVariables = true; - - plymouth.enable = true; - - initrd.systemd.enable = true; - }; - - # swap - swapDevices = [{ - device = "/var/swapfile"; - size = 8 * 1024; - }]; - - # internet - networking = { - networkmanager = { - enable = true; - # needed so that network chip wakes up after a longer suspend - # https://bbs.archlinux.org/viewtopic.php?id=270819 - wifi = { - powersave = false; - scanRandMacAddress = false; - }; - }; - }; - - # sound - sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa = { enable = true; support32Bit = true; }; - pulse.enable = true; - jack.enable = true; - }; - - # bluetooth - hardware.bluetooth = { - enable = true; - powerOnBoot = true; - }; - - # printing - services.printing = { - enable = true; - stateless = true; - startWhenNeeded = true; - }; - - services.avahi.enable = false; - #services.avahi = { - # enable = true; - # nssmdns4 = true; - # openFirewall = true; - #}; -} diff --git a/machines/graphite.nix b/machines/graphite.nix deleted file mode 100644 index d0bcaa8..0000000 --- a/machines/graphite.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ ... }: - -{ - imports = [ - ../modules/common.nix - - ./hardware/graphite.nix - ./devices/graphite.nix - ]; - - networking.hostName = "Graphite"; - - system.stateVersion = "24.05"; -} diff --git a/machines/graphite/default.nix b/machines/graphite/default.nix new file mode 100644 index 0000000..4bbb938 --- /dev/null +++ b/machines/graphite/default.nix @@ -0,0 +1,14 @@ +{ ... }: + +{ + imports = [ + ../../modules/common.nix + + ./hardware.nix + ./devices.nix + ]; + + networking.hostName = "Graphite"; + + system.stateVersion = "24.05"; +} diff --git a/machines/graphite/devices.nix b/machines/graphite/devices.nix new file mode 100644 index 0000000..f8b7631 --- /dev/null +++ b/machines/graphite/devices.nix @@ -0,0 +1,68 @@ +{ config, pkgs, ... }: + +{ + hardware = { + enableAllFirmware = true; + enableRedistributableFirmware = true; + }; + + # boot settings + boot = { + loader.systemd-boot.enable = true; + loader.efi.canTouchEfiVariables = true; + + plymouth.enable = true; + + initrd.systemd.enable = true; + }; + + # swap + swapDevices = [{ + device = "/var/swapfile"; + size = 8 * 1024; + }]; + + # internet + networking = { + networkmanager = { + enable = true; + # needed so that network chip wakes up after a longer suspend + # https://bbs.archlinux.org/viewtopic.php?id=270819 + wifi = { + powersave = false; + scanRandMacAddress = false; + }; + }; + }; + + # sound + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa = { enable = true; support32Bit = true; }; + pulse.enable = true; + jack.enable = true; + }; + + # bluetooth + hardware.bluetooth = { + enable = true; + powerOnBoot = true; + }; + + # printing + services.printing = { + enable = true; + stateless = true; + startWhenNeeded = true; + }; + + services.avahi.enable = false; + #services.avahi = { + # enable = true; + # nssmdns4 = true; + # openFirewall = true; + #}; +} diff --git a/machines/graphite/hardware.nix b/machines/graphite/hardware.nix new file mode 100644 index 0000000..c8fc7c6 --- /dev/null +++ b/machines/graphite/hardware.nix @@ -0,0 +1,39 @@ +# 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 + "/hardware/network/broadcom-43xx.nix") + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/e03c7434-31d7-474b-9c8b-45b044b1492c"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/67E3-17ED"; + 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.wlp3s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/machines/graphite/home.nix b/machines/graphite/home.nix new file mode 100644 index 0000000..dce0783 --- /dev/null +++ b/machines/graphite/home.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: + +{ + imports = [ + ../../modules/home/common.nix + ]; + + home.stateVersion = "24.05"; +} diff --git a/machines/hardware/graphite.nix b/machines/hardware/graphite.nix deleted file mode 100644 index c8fc7c6..0000000 --- a/machines/hardware/graphite.nix +++ /dev/null @@ -1,39 +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, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/hardware/network/broadcom-43xx.nix") - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/e03c7434-31d7-474b-9c8b-45b044b1492c"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/67E3-17ED"; - 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.wlp3s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} -- cgit 1.4.1