diff --git a/hosts/hades/default.nix b/hosts/hades/default.nix index b55cb10..a9982bf 100644 --- a/hosts/hades/default.nix +++ b/hosts/hades/default.nix @@ -2,9 +2,13 @@ { imports = [ - ./hardware - ./network + ./hardware-configuration.nix + ./network-configuration.nix ../../config.nix + + ./modules/syncthing.nix + ./modules/disko.nix + ./modules/zfs.nix ]; nix = { diff --git a/hosts/hades/hardware/config.nix b/hosts/hades/hardware-configuration.nix similarity index 56% rename from hosts/hades/hardware/config.nix rename to hosts/hades/hardware-configuration.nix index 56871dc..1b9d04d 100644 --- a/hosts/hades/hardware/config.nix +++ b/hosts/hades/hardware-configuration.nix @@ -2,22 +2,10 @@ { imports = [ - - ## Import necessary flake modules - #"${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix" - ## Include results from the (non-existent) hardware scan ## as well as the host-specific hardware config options (modulesPath + "/installer/scan/not-detected.nix") - ## Disko config, should eventually let us nuke our boot drive and reinstall - ## with zero worries. - ## commented out for now as we have "broken" it - #./disko.nix - - ## ZFS module, separated to help keep us sane while we set it up lol - ./zfs.nix - ]; fileSystems."/" = { @@ -89,89 +77,6 @@ }; }; - - ## Hardware-related services - services = { - ## TRIM to keep SSDs healthy-ish - fstrim.enable = true; - - }; - - #powerManagement = { - #enable = true; - - #powertop.enable = true; - - #cpuFreqGovernor = Lib.mkDefault "performance"; - - #cpufreq = { - #min = 1500000; - #max = 4400000; - #}; - #}; - - hardware = { - - enableAllFirmware = true; - bluetooth.enable = false; - - graphics = { - enable = true; - ## Packages for integrated graphics inside Hades - extraPackages = with pkgs; [ - intel-compute-runtime - intel-media-driver - vaapiIntel - vaapiVdpau - libvdpau-va-gl - ]; - }; - - amdgpu = { - initrd.enable = true; - opencl.enable = true; - - amdvlk = { - enable = true; - #package = [ ]; - support32Bit.enable = true; - supportExperimental.enable = true; - #settings = { - #}; - }; - - }; - }; - - programs = { - ## For tweaking Radeon GPUs - corectrl = { - enable = true; - gpuOverclock = { - enable = true; - ## Allows changing clocks and volts - ppfeaturemask = "0xfffd7fff"; - }; - }; - - tuxclocker = { - enable = true; - enableAMD = true; - useUnfree = true; - }; - - }; - - ## Some packages for managing the radeon GPU inside Hades - environment.systemPackages = with pkgs; [ - umr - radeontop - amdgpu_top - radeontools - radeon-profile - nvtopPackages.amd - ]; - ## 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 diff --git a/hosts/hades/hardware/default.nix b/hosts/hades/hardware/default.nix deleted file mode 100644 index fa49ff6..0000000 --- a/hosts/hades/hardware/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, config, pkgs, modulesPath, ... }: - -{ - imports = [ - - ## Hardware config - ./config.nix - - ## Disko config, should eventually let us nuke our boot drive and reinstall - ## with zero worries. - #./disko.nix # broken for now - - ## ZFS module, separated to help keep us sane while we set it up lol - ./zfs.nix - - ]; - -} diff --git a/hosts/hades/hardware/disko.nix b/hosts/hades/modules/disko.nix similarity index 100% rename from hosts/hades/hardware/disko.nix rename to hosts/hades/modules/disko.nix diff --git a/hosts/hades/network/syncthing.nix b/hosts/hades/modules/syncthing.nix similarity index 100% rename from hosts/hades/network/syncthing.nix rename to hosts/hades/modules/syncthing.nix diff --git a/hosts/hades/hardware/zfs.nix b/hosts/hades/modules/zfs.nix similarity index 100% rename from hosts/hades/hardware/zfs.nix rename to hosts/hades/modules/zfs.nix diff --git a/hosts/hades/network/default.nix b/hosts/hades/network-configuration.nix similarity index 96% rename from hosts/hades/network/default.nix rename to hosts/hades/network-configuration.nix index f615097..6a692fe 100644 --- a/hosts/hades/network/default.nix +++ b/hosts/hades/network-configuration.nix @@ -47,10 +47,6 @@ #]; }; - services.jellyfin = { - enable = true; - openFirewall = true; - }; ## syncthing for device <-> device filesharing and,,, syncing ## still not set up, grrrr