Made desktop env declarations common + sway scrsht

hosts/puter/de/default.nix

@@ -1,31 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
-  imports = [./gnome.nix ./sway.nix];
-
-  services.xserver = {
-    enable = true;
-    xkb.layout = "us";
-    xkb.variant = "intl";
-  };
-
-  services.displayManager.gdm.enable = true;
-
-  # Enable sound with pipewire.
-  services.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    #jack.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is en>
-    # no need to redefine it in your config for now)
-    #media-session.enable = true;
-  };
-}

hosts/puter/de/gnome.nix

@@ -1,35 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
-  services.desktopManager.gnome.enable = true;
-  programs.kdeconnect.enable = true;
-
-  environment.systemPackages = with pkgs; [
-    gnome-tweaks
-    # GNOME-specific packages
-    bustle
-    collision
-    commit
-    dialect
-    fretboard
-    #gaphor
-    hieroglyphic
-    junction
-    keypunch
-    letterpress
-    gnome-obfuscate
-    shortwave
-    solanum
-    wike
-    commit
-    wl-clipboard
-    gnomeExtensions.gsconnect
-    gnomeExtensions.astra-monitor
-    lm_sensors
-    iotop
-    gtop
-    wirelesstools
-  ];
-}

hosts/puter/de/sway.nix

@@ -1,20 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
-  programs.sway = {
-    enable = true;
-    wrapperFeatures.gtk = true;
-  };
-
-  environment.systemPackages = with pkgs; [
-    mako # Notification daemon for Sway
-    playerctl
-    pavucontrol
-    blueman
-    xorg.xhost
-    # Other Sway-specific packages
-  ];
-  programs.light.enable = true; # For brightness control
-}

hosts/puter/packages.nix

@@ -10,12 +10,14 @@
   nixpkgs.config = {chromium = {enableWideVine = true;};};
 
   imports = [
+    # Apps
     ../../modules/userapps/utils.nix
     #../../modules/common/steam.nix
     ../../modules/userapps/devutils.nix
     ../../modules/userapps/internet.nix
     ../../modules/userapps/media.nix
     ../../modules/userapps/productivity.nix
+    # Modules
   ];
 
   users.users.user.shell = pkgs.bash;