Use plasma for main desktop

Move hyprland specific audio/bluetooth packages into hyprland expression
Increase frequency of nix cleanup, same duration

Vanguard.nix

@@ -6,6 +6,7 @@
     ./hardware/audio.nix
     ./hardware/bluetooth.nix
     ./locales/en_GB.nix
+    ./desktop/plasma.nix
     ./desktop/hyprland.nix
     ./desktop/steam.nix
     ./syncthing/Vanguard.nix
@@ -19,7 +20,7 @@
   services.openssh.enable = true;
   networking.firewall = { enable = true; allowedTCPPorts = [ 22 ]; };
 
-  services.xserver.displayManager.defaultSession = "steam";
+  services.xserver.displayManager.defaultSession = "plasmawayland";
 
   users.users.root.openssh.authorizedKeys.keys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII1tJFdbiyJApuVZFvo9E9kjlBwvXZeySqVuS2qGdxha tux@monarch"

common.nix

@@ -65,7 +65,7 @@
 
   nix.gc = {
     automatic = true;
-    dates = "weekly";
+    dates = "daily";
     options = "--delete-older-than 7d";
   };
 }

desktop/default.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-
-}

desktop/hyprland.nix

@@ -8,6 +8,12 @@
     })
   ];
   programs.dconf.enable = true;
+  services.blueman.enable = true;
+  environment.systemPackages = [
+    pkgs.pavucontrol
+    pkgs.pamixer
+    pkgs.pulseaudio
+  ];
   security.pam.services.swaylock = { };
   programs.hyprland = {
     enable = true;

desktop/plasma.nix

@@ -1,18 +1,8 @@
 { pkgs, ... }:
 {
-  imports = [
-    ./xserver.nix
-    ./sddm.nix
-  ];
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Enable the KDE Plasma Desktop Environment.
+  imports = [ ./xserver.nix ./sddm.nix ];
   services.xserver.desktopManager.plasma5.enable = true;
-  services.xserver.displayManager.defaultSession = "plasmawayland";
-
   programs.kdeconnect.enable = true;
-
   environment.systemPackages = with pkgs; [
     libsForQt5.lightly
     libsForQt5.qtstyleplugin-kvantum

desktop/sddm.nix

@@ -3,17 +3,12 @@ let
   sddm-catppuccin-macchiato = pkgs.callPackage ./pkgs/sddm-catppuccin-macchiato.nix { };
 in
 {
-  services.xserver.enable = true;
-  services.xserver.displayManager.sddm = {
-    enable = true;
-    theme = "catppuccin-macchiato";
-    settings = {
-      General = {
-        InputMethod = "";
-      };
-    };
-  };
   environment.systemPackages = [
     sddm-catppuccin-macchiato.sddm-catppuccin-macchiato
   ];
+  services.xserver.displayManager.sddm = {
+    enable = true;
+    theme = "catppuccin-macchiato";
+    settings = { General = { InputMethod = ""; }; };
+  };
 }

desktop/steam.nix

@@ -1,8 +1,7 @@
 { pkgs, ... }:
 {
-  environment.systemPackages = [
-    pkgs.mesa
-  ];
+  imports = [ ./xserver.nix ./sddm.nix ];
+  environment.systemPackages = [ pkgs.mesa ];
   programs.gamescope.enable = true;
   programs.steam = {
     enable = true;

desktop/xserver.nix

@@ -1,15 +1,10 @@
 { ... }:
 {
-  imports = [
-    ./default.nix
-  ];
   services.xserver = {
     enable = true;
     layout = "gb";
     xkbVariant = "";
   };
-
   console.keyMap = "uk";
-
   programs.dconf.enable = true;
 }

hardware/audio.nix

@@ -11,9 +11,4 @@
     pulse.enable = true;
   };
   programs.noisetorch.enable = true;
-  environment.systemPackages = [
-    pkgs.pavucontrol
-    pkgs.pamixer
-    pkgs.pulseaudio
-  ];
 }

hardware/bluetooth.nix

@@ -4,5 +4,4 @@
     enable = true;
     powerOnBoot = true;
   };
-  services.blueman.enable = true;
 }