split wsl, consolidate hardware

hosts/hydra/default.nix

@@ -11,6 +11,7 @@ nixpkgs.lib.nixosSystem {
   modules = [
     ../../modules/common
     ../../modules/nixos
+    ../../modules/wsl
     globals
     wsl.nixosModules.wsl
     home-manager.nixosModules.home-manager

hosts/tempest/default.nix

@@ -8,23 +8,56 @@ with inputs;
 nixpkgs.lib.nixosSystem {
   system = "x86_64-linux";
   modules = [
-    ./hardware-configuration.nix
+    globals
+    home-manager.nixosModules.home-manager
     ../../modules/common
     ../../modules/nixos
-    globals
-    wsl.nixosModules.wsl
-    home-manager.nixosModules.home-manager
     {
+      nixpkgs.overlays = [ nur.overlay ] ++ overlays;
+
+      # Hardware
       physical = true;
       networking.hostName = "tempest";
-      gui.enable = true;
+
-      nixpkgs.overlays = [ nur.overlay ] ++ overlays;
+      boot.initrd.availableKernelModules =
-      passwordHash = nixpkgs.lib.fileContents ../../password.sha512;
+        [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+      boot.initrd.kernelModules = [ "amdgpu" ];
+      boot.kernelModules = [ "kvm-amd" ];
+      services.xserver.videoDrivers = [ "amdgpu" ];
+      powerManagement.cpuFreqGovernor = "performance";
+      hardware.cpu.amd.updateMicrocode = true;
+      hardware.fancontrol.enable = true;
+      hardware.fancontrol.config = ''
+        # Configuration file generated by pwmconfig, changes will be lost
+        INTERVAL=10
+        DEVPATH=hwmon0=devices/pci0000:00/0000:00:03.1/0000:06:00.0/0000:07:00.0/0000:08:00.0
+        DEVNAME=hwmon0=amdgpu
+        FCTEMPS=hwmon0/pwm1=hwmon0/temp1_input
+        FCFANS= hwmon0/pwm1=hwmon0/fan1_input
+        MINTEMP=hwmon0/pwm1=50
+        MAXTEMP=hwmon0/pwm1=70
+        MINSTART=hwmon0/pwm1=100
+        MINSTOP=hwmon0/pwm1=10
+        MINPWM=hwmon0/pwm1=10
+        MAXPWM=hwmon0/pwm1=240
+      '';
+
+      fileSystems."/" = {
+        device = "/dev/disk/by-label/nixos";
+        fsType = "ext4";
+      };
+
+      fileSystems."/boot" = {
+        device = "/dev/disk/by-label/boot";
+        fsType = "vfat";
+      };
 
       # Must be prepared ahead
       identityFile = "/home/${globals.user}/.ssh/id_ed25519";
+      passwordHash = nixpkgs.lib.fileContents ../../password.sha512;
 
       # Theming
+      gui.enable = true;
       theme = {
         colors = (import ../../colorscheme/gruvbox-dark).dark;
         dark = true;

hosts/tempest/hardware-configuration.nix

@@ -1,56 +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" "usbhid" "sd_mod" ];
-  boot.initrd.kernelModules = [ "amdgpu" ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  services.xserver.videoDrivers = [ "amdgpu" ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-label/nixos";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-label/boot";
-    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.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
-
-  powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
-  hardware.cpu.amd.updateMicrocode =
-    lib.mkDefault config.hardware.enableRedistributableFirmware;
-
-  hardware.fancontrol.enable = true;
-  hardware.fancontrol.config = ''
-    # Configuration file generated by pwmconfig, changes will be lost
-    INTERVAL=10
-    DEVPATH=hwmon0=devices/pci0000:00/0000:00:03.1/0000:06:00.0/0000:07:00.0/0000:08:00.0
-    DEVNAME=hwmon0=amdgpu
-    FCTEMPS=hwmon0/pwm1=hwmon0/temp1_input
-    FCFANS= hwmon0/pwm1=hwmon0/fan1_input
-    MINTEMP=hwmon0/pwm1=50
-    MAXTEMP=hwmon0/pwm1=70
-    MINSTART=hwmon0/pwm1=100
-    MINSTOP=hwmon0/pwm1=10
-    MINPWM=hwmon0/pwm1=10
-    MAXPWM=hwmon0/pwm1=240
-  '';
-}

modules/common/neovim/config/colors.nix

@@ -8,6 +8,13 @@
   config = {
     plugins = [ pkgs.vimPlugins.nvim-base16 ];
     setup.base16-colorscheme = config.colors;
+
+    # Telescope isn't working, shut off for now
+    lua = ''
+      require('base16-colorscheme').with_config {
+          telescope = false,
+      }
+    '';
   };
 
 }

modules/nixos/default.nix

@@ -1,13 +1,6 @@
 { ... }: {
 
-  imports = [
+  imports =
-    ./applications
+    [ ./applications ./gaming ./graphical ./hardware ./services ./system ];
-    ./gaming
-    ./graphical
-    ./hardware
-    ./services
-    ./system
-    ./wsl
-  ];
 
 }

modules/nixos/services/secrets.nix

@@ -47,7 +47,7 @@
 
   };
 
-  config = lib.mkIf (pkgs.stdenv.isLinux && !config.wsl.enable) {
+  config = lib.mkIf pkgs.stdenv.isLinux {
 
     # Create a default directory to place secrets
 

modules/nixos/services/sshd.nix

@@ -13,7 +13,7 @@
     };
   };
 
-  config = lib.mkIf (!config.wsl.enable && config.publicKey != null) {
+  config = lib.mkIf (config.publicKey != null) {
     services.openssh = {
       enable = true;
       ports = [ 22 ];