Move all configuration back into configuration.nix

hosts/slab/configuration.nix

@@ -1,4 +1,4 @@
-# vim: set ts=2 sw=2 et: 
+# vim: set ts=2 sw=2 et foldmethod=marker: 
 # Edit this configuration file to define what should be installed on
 # your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
@@ -11,11 +11,100 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-
-      # manually defined device specific configuration
-      ./host-configuration.nix
     ];
 
+  networking.hostName = "slab";
+
+  # cryptsetup
+  boot.initrd.luks.devices = {
+    lvmroot = {
+      device="/dev/disk/by-uuid/2872c0f0-e544-45f0-9b6c-ea022af7805a";
+      allowDiscards = true;
+      fallbackToPassword = true;
+      preLVM = true;
+    };
+  };
+
+  # bootloader setup
+  boot.loader = {
+    efi = {
+      canTouchEfiVariables = true;
+      efiSysMountPoint = "/boot";
+    };
+    # grub = {
+    #   enable = true;
+    #   efiSupport = true;
+    #   device = "nodev";
+    # };
+    systemd-boot = {
+      enable = true;
+      netbootxyz.enable = true;
+      memtest86.enable = true;
+    };
+  };
+
+  services.supergfxd.enable = true;
+
+  # Enable OpenGL
+  hardware.opengl = {
+    enable = true;
+    driSupport = true;
+    driSupport32Bit = true;
+  };
+
+  # Load nvidia driver for Xorg and Wayland
+  services.xserver.videoDrivers = ["amdgpu" "nvidia"];
+
+  hardware.nvidia = {
+
+    # Modesetting is required.
+    modesetting.enable = false;
+
+    # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
+    powerManagement.enable = false;
+    # Fine-grained power management. Turns off GPU when not in use.
+    # Experimental and only works on modern Nvidia GPUs (Turing or newer).
+    powerManagement.finegrained = false;
+
+    # Use the NVidia open source kernel module (not to be confused with the
+    # independent third-party "nouveau" open source driver).
+    # Support is limited to the Turing and later architectures. Full list of 
+    # supported GPUs is at: 
+    # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus 
+    # Only available from driver 515.43.04+
+    # Currently alpha-quality/buggy, so false is currently the recommended setting.
+    open = false;
+
+    # Enable the Nvidia settings menu,
+    # accessible via `nvidia-settings`.
+    nvidiaSettings = true;
+
+    # Optionally, you may need to select the appropriate driver version for your specific GPU.
+    package = config.boot.kernelPackages.nvidiaPackages.stable;
+
+    prime = {
+      offload = {
+        enable = true;
+        enableOffloadCmd = true;
+      };
+      amdgpuBusId = "PCI:07:00:0";
+      nvidiaBusId = "PCI:01:00:0";
+    };
+  };
+
+  services.syncthing = {
+    enable = true;
+    user = "nullbite";
+    dataDir = "/home/nullbite/Documents";
+    configDir = "/home/nullbite/.config/syncthing";
+  };
+
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = true;
+  };
+
+  # {{{ old config
   # Use the systemd-boot EFI boot loader.
   # boot.loader.systemd-boot.enable = true;
   # boot.loader.efi.canTouchEfiVariables = true;
@@ -26,10 +115,12 @@
   # Pick only one of the below networking options.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
   # networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
+  # }}}
 
   # Set your time zone.
   time.timeZone = "America/New_York";
 
+  # {{{ old config
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
@@ -146,6 +237,7 @@
   # };
 
   # services.tailscale.enable = true;
+  # }}}
 
   # Open ports in the firewall.
   networking.firewall.allowedTCPPorts = [ 22 ];

hosts/slab/host-configuration.nix

@@ -1,95 +0,0 @@
-# vim: set ts=2 sw=2 et: 
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  networking.hostName = "slab";
-
-  # cryptsetup
-  boot.initrd.luks.devices = {
-    lvmroot = {
-      device="/dev/disk/by-uuid/2872c0f0-e544-45f0-9b6c-ea022af7805a";
-      allowDiscards = true;
-      fallbackToPassword = true;
-      preLVM = true;
-    };
-  };
-
-  # bootloader setup
-  boot.loader = {
-    efi = {
-      canTouchEfiVariables = true;
-      efiSysMountPoint = "/boot";
-    };
-    # grub = {
-    #   enable = true;
-    #   efiSupport = true;
-    #   device = "nodev";
-    # };
-    systemd-boot = {
-      enable = true;
-      netbootxyz.enable = true;
-      memtest86.enable = true;
-    };
-  };
-
-  services.supergfxd.enable = true;
-
-  # Enable OpenGL
-  hardware.opengl = {
-    enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
-  };
-
-  # Load nvidia driver for Xorg and Wayland
-  services.xserver.videoDrivers = ["amdgpu" "nvidia"];
-
-  hardware.nvidia = {
-
-    # Modesetting is required.
-    modesetting.enable = false;
-
-    # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
-    powerManagement.enable = false;
-    # Fine-grained power management. Turns off GPU when not in use.
-    # Experimental and only works on modern Nvidia GPUs (Turing or newer).
-    powerManagement.finegrained = false;
-
-    # Use the NVidia open source kernel module (not to be confused with the
-    # independent third-party "nouveau" open source driver).
-    # Support is limited to the Turing and later architectures. Full list of 
-    # supported GPUs is at: 
-    # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus 
-    # Only available from driver 515.43.04+
-    # Currently alpha-quality/buggy, so false is currently the recommended setting.
-    open = false;
-
-    # Enable the Nvidia settings menu,
-    # accessible via `nvidia-settings`.
-    nvidiaSettings = true;
-
-    # Optionally, you may need to select the appropriate driver version for your specific GPU.
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
-
-    prime = {
-      offload = {
-        enable = true;
-        enableOffloadCmd = true;
-      };
-      amdgpuBusId = "PCI:07:00:0";
-      nvidiaBusId = "PCI:01:00:0";
-    };
-  };
-
-  services.syncthing = {
-    enable = true;
-    user = "nullbite";
-    dataDir = "/home/nullbite/Documents";
-    configDir = "/home/nullbite/.config/syncthing";
-  };
-
-  hardware.bluetooth = {
-    enable = true;
-    powerOnBoot = true;
-  };
-}