move desktop shit again

modules/de/default.nix

@@ -1,15 +0,0 @@
-{...}: {
-  imports = [
-    ./audio.nix
-    ./home
-    ./dm.nix
-    ./tlp.nix
-    ./locale.nix
-    ./printing.nix
-    ./themeing.nix
-  ];
-  services.flatpak.enable = true;
-  security.polkit.enable = true;
-  services.illum.enable = true;
-  services.upower.enable = true;
-}

modules/default.nix

@@ -2,8 +2,8 @@
   imports = [
     ./shell
     ./desktop
+    ./desktop-legacy
     ./hardware
-    ./de
     ./net
     ./input
     ./media

modules/desktop-legacy/default.nix

@@ -0,0 +1,57 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; {
+  imports = [
+    ./gaming.nix
+    ./syncthing.nix
+    ./kdeconnect.nix
+    ./social.nix
+  ];
+
+  programs.seahorse.enable = true;
+  security.pam.services.jade.enableGnomeKeyring = true;
+
+  virtualisation.libvirtd.enable = true;
+
+  programs.xss-lock = {
+    enable = true;
+    lockerCommand = "${pkgs.i3lock}/bin/i3lock -c 1d2021";
+  };
+
+  services.illum.enable = true;
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    openFirewall = true;
+  };
+  services.smartd = {
+    enable = true;
+    notifications.test = true;
+  };
+
+  home-manager.users.jade = {pkgs, ...}: {
+    programs.ssh = {
+      controlMaster = "yes";
+    };
+    home.packages = with pkgs; [
+      just
+      bacon
+
+      magic-wormhole-rs
+
+      # filemanager
+      xfce.thunar
+      xfce.tumbler
+      xfce.thunar-archive-plugin
+      file-roller
+
+      # from environment.systemPackages cleanup
+      virt-manager
+      ddccontrol-db
+    ];
+  };
+}

modules/desktop/default.nix

@@ -1,57 +1,15 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; {
+{...}: {
   imports = [
-    ./gaming.nix
-    ./syncthing.nix
-    ./kdeconnect.nix
-    ./social.nix
+    ./audio.nix
+    ./home
+    ./dm.nix
+    ./tlp.nix
+    ./locale.nix
+    ./printing.nix
+    ./themeing.nix
   ];
-
-  programs.seahorse.enable = true;
-  security.pam.services.jade.enableGnomeKeyring = true;
-
-  virtualisation.libvirtd.enable = true;
-
-  programs.xss-lock = {
-    enable = true;
-    lockerCommand = "${pkgs.i3lock}/bin/i3lock -c 1d2021";
-  };
-
+  services.flatpak.enable = true;
+  security.polkit.enable = true;
   services.illum.enable = true;
-  services.avahi = {
-    enable = true;
-    nssmdns4 = true;
-    openFirewall = true;
-  };
-  services.smartd = {
-    enable = true;
-    notifications.test = true;
-  };
-
-  home-manager.users.jade = {pkgs, ...}: {
-    programs.ssh = {
-      controlMaster = "yes";
-    };
-    home.packages = with pkgs; [
-      just
-      bacon
-
-      magic-wormhole-rs
-
-      # filemanager
-      xfce.thunar
-      xfce.tumbler
-      xfce.thunar-archive-plugin
-      file-roller
-
-      # from environment.systemPackages cleanup
-      virt-manager
-      ddccontrol-db
-    ];
-  };
+  services.upower.enable = true;
 }