more organization, or maybe disorganization...

hosts/desktop/configuration.nix

@@ -7,7 +7,6 @@ let
   user = "matt";
   password = "$y$j9T$EkPXmsmIMFFZ.WRrBYCxS1$P0kwo6e4.WM5DsqUcEqWC3MrZp5KfCjxffraMFZWu06";
   hostname = "matt-nixos";
-  timezone = "America/Chicago";
   # discover-wrapper is needed as of 1/24/24 since PackageKit does not work correctly so this removes error messages.
   discover-wrapped = pkgs.symlinkJoin
     {
@@ -23,12 +22,10 @@ in
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ./cachix/cachix.nix
+      ../../cachix/cachix.nix
+      ../default.nix
     ];
 
-  # Enable nix flakes and nix-command tools
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
   # Configure bootloader with lanzaboot and secureboot
   boot = {
     loader = {
@@ -65,34 +62,15 @@ in
 
     # Network option required using sysctl to let Ubisoft Connect work as of 7-12-2023
     kernel.sysctl."net.ipv4.tcp_mtu_probing" = 1;
-
-    # Enable AppImage
-    binfmt.registrations.appimage = {
-      wrapInterpreterInShell = false;
-      interpreter = "${pkgs.appimage-run}/bin/appimage-run";
-      recognitionType = "magic";
-      offset = 0;
-      mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'';
-      magicOrExtension = ''\x7fELF....AI\x02'';
-    };
   };
 
   # Hardware configs
   hardware = {
-    # Bluetooth
-    bluetooth.enable = true;
-
     # Xbox controllers
     xpadneo.enable = true;
 
     # Steam udev rules for remote play
     steam-hardware.enable = true;
-
-    # Enable all firmware
-    enableAllFirmware = true;
-
-    # Disable pulse audio in favor of pipewire
-    pulseaudio.enable = false;
     
     opengl.enable = true;
     # Enables support for 32bit libs that steam uses
@@ -101,9 +79,6 @@ in
 
   # Services configs
   services = {
-    # Enable firmware updates
-    fwupd.enable = true;
-    
     # Enable the X11 windowing system.
     xserver = {
       enable = true;
@@ -115,17 +90,6 @@ in
       };
       desktopManager.plasma6.enable = true;
     };
-    
-    # Enable CUPS to print documents.
-    printing.enable = true;
-    
-    # configure pipewire
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-    };
 
     # enable auto discovery of printers
     avahi = {
@@ -161,6 +125,7 @@ in
       fi
     '';
     wantedBy = [ "multi-user.target" ];
+    after = [ "NetworkManager.target" ];
   };
 
   # Networking configs
@@ -173,8 +138,6 @@ in
 
   # Time config
   time = {
-    # Set your time zone.
-    timeZone = timezone;
     hardwareClockInLocalTime = true;
   };