feat(binto): move stuff from config.nix to desktop.nix

hosts/binto/configuration.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ ... }: {
   imports = [
     ./hardware-configuration.nix
 
@@ -6,8 +6,9 @@
     ../../modules/kmscon.nix
     ../../modules/printer.nix
 
-    ./modules/nvidia.nix
+    ./modules/desktop.nix
     ./modules/nix-gaming.nix
+    ./modules/nvidia.nix
   ];
 
   services.hostvars = {
@@ -15,25 +16,41 @@
     fontSize = 10;
   };
 
+  users.users.matt = {
+    isNormalUser = true;
+    extraGroups = [
+      "wheel"
+      "input"
+      "uinput"
+      "adm"
+      "mlocate"
+      "video"
+      "libvirtd"
+    ];
+  };
+
+  # TODO: use hm for tmux
+  home-manager.users = {
+    matt = {
+
+      imports = [
+        ../../modules/alacritty.nix
+        ../../modules/dconf.nix
+        ../../modules/firefox
+      ];
+
+      # No touchy
+      home.stateVersion = "23.11";
+    };
+  };
+
   networking = {
     hostName = "binto";
     networkmanager.enable = true;
     firewall.enable = false;
   };
-  # Enable the X11 windowing system.
-  services.xserver = {
-    enable = true;
-
-    # Enable the KDE Plasma Desktop Environment.
-    displayManager.sddm.enable = true;
-    desktopManager.plasma5.enable = true;
-  };
 
   services = {
-    dbus.enable = true;
-    gvfs.enable = true;
-    flatpak.enable = true;
-
     tailscale = {
       enable = true;
       extraUpFlags = [
@@ -51,48 +68,9 @@
     };
   };
 
-  environment.systemPackages = with pkgs; [
-    p7zip # for reshade
-    xclip
-  ];
-
-  environment.plasma5.excludePackages = with pkgs.libsForQt5; [
-    elisa
-    oxygen
-    khelpcenter
-    konsole
-    plasma-browser-integration
-  ];
-
-  users.users.matt = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" "input" "uinput" "adm" "mlocate" "video" "libvirtd" ];
-  };
-
-  programs.dconf.enable = true;
-
-  # TODO: use hm for tmux
-  home-manager.users = {
-    matt = {
-
-      imports = [
-        ../../modules/alacritty.nix
-        ../../modules/dconf.nix
-        ../../modules/firefox
-      ];
-
-      home.stateVersion = "23.11";
-    };
-  };
-
   # Set your time zone.
   time.timeZone = "America/Toronto";
 
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.11"; # Did you read the comment?
+  # No touchy
+  system.stateVersion = "23.11";
 }

hosts/binto/modules/desktop.nix

@@ -0,0 +1,29 @@
+{ pkgs, ... }: {
+  programs.dconf.enable = true;
+
+  services = {
+    xserver = {
+      enable = true;
+
+      # Enable the KDE Plasma Desktop Environment.
+      displayManager.sddm.enable = true;
+      desktopManager.plasma5.enable = true;
+    };
+    dbus.enable = true;
+    gvfs.enable = true;
+    flatpak.enable = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    p7zip # for reshade
+    xclip
+  ];
+
+  environment.plasma5.excludePackages = with pkgs.libsForQt5; [
+    elisa
+    oxygen
+    khelpcenter
+    konsole
+    plasma-browser-integration
+  ];
+}

hosts/wim/configuration.nix

@@ -21,8 +21,17 @@
 
   users.users.matt = {
     isNormalUser = true;
-    extraGroups = [ "wheel" "input" "uinput" "adm" "mlocate" "video" "libvirtd" ];
+    extraGroups = [
+      "wheel"
+      "input"
+      "uinput"
+      "adm"
+      "mlocate"
+      "video"
+      "libvirtd"
+    ];
   };
+
   # TODO: use hm for tmux
   home-manager.users = {
     matt = {