feat(modules/personal): Rearranged certain configs between files and renamed essential to default

3 files changed, 56 insertions, 55 deletions

diff --git a/modules/personal/essential.nix b/modules/personal/default.nix
index 8edd525..1b28c00 100644
--- a/modules/personal/essential.nix
+++ b/modules/personal/default.nix
@@ -41,47 +41,12 @@
   i18n.defaultLocale = "en_US.UTF-8";
 
   #
-  # Graphics
-  #
-
-  # https://nixos.wiki/wiki/Accelerated_Video_Playback
-  hardware.opengl = {
-    enable = true;
-    extraPackages = with pkgs; [
-      vaapiVdpau
-      libvdpau-va-gl
-    ];
-  };
-
-  #
-  # Sound
-  #
-
-  sound.enable = false;
-  # hardware.pulseaudio.enable = true;
-
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-  services.dbus = {
-    enable = true;
-    packages = [ pkgs.dconf ];
-  };
-
-  #
   # Networking
   #
 
   # 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.
-  networking.extraHosts = ''
-    127.0.0.1 synd.local
-  '';
 
   # zeroconf networking
   services.avahi = {
@@ -89,24 +54,4 @@
     nssmdns4 = true;
     openFirewall = true;
   };
-
-  #
-  # Bluetooth
-  #
-
-  hardware.bluetooth.enable = true;
-
-  #
-  # Printers and scanners
-  #
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-  hardware.sane.enable = true;
-
-  #
-  # Other hardware
-  #
-
-  hardware.rtl-sdr.enable = true;
 }
diff --git a/modules/personal/hardware-general.nix b/modules/personal/hardware-general.nix
index 4f83454..3f6b681 100644
--- a/modules/personal/hardware-general.nix
+++ b/modules/personal/hardware-general.nix
@@ -6,4 +6,56 @@
   programs = {
     mtr.enable = true;
   };
+
+  #
+  # Graphics
+  #
+
+  # https://nixos.wiki/wiki/Accelerated_Video_Playback
+  hardware.opengl = {
+    enable = true;
+    extraPackages = with pkgs; [
+      vaapiVdpau
+      libvdpau-va-gl
+    ];
+  };
+
+  #
+  # Sound
+  #
+
+  sound.enable = false;
+  # hardware.pulseaudio.enable = true;
+
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+  services.dbus = {
+    enable = true;
+    packages = [ pkgs.dconf ];
+  };
+
+  #
+  # Bluetooth
+  #
+
+  hardware.bluetooth.enable = true;
+
+  #
+  # Printers and scanners
+  #
+
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+  hardware.sane.enable = true;
+
+  #
+  # Other hardware
+  #
+
+  hardware.rtl-sdr.enable = true;
 }
diff --git a/modules/personal/web-server.nix b/modules/personal/web-server.nix
index bb4a968..62bae7b 100644
--- a/modules/personal/web-server.nix
+++ b/modules/personal/web-server.nix
@@ -14,4 +14,8 @@
       };
     };
   };
+
+  networking.extraHosts = ''
+    127.0.0.1 synd.local
+  '';
 }