Made desktop env declarations common + sway scrsht

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1762596750,
-        "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=",
+        "lastModified": 1762977756,
+        "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e",
+        "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
         "type": "github"
       },
       "original": {

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/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;

modules/common/pipewire.nix

@@ -0,0 +1,17 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  # 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;
+  };
+}

modules/de/multiple-dms.nix

@@ -0,0 +1,13 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  services.xserver = {
+    enable = true;
+    xkb.layout = "us";
+    xkb.variant = "intl";
+  };
+
+  services.displayManager.gdm.enable = true;
+}

modules/de/sway.nix

@@ -14,6 +14,10 @@
     pavucontrol
     blueman
     xorg.xhost
+    # Screenshots
+    wl-copy
+    grim
+    slurp
     # Other Sway-specific packages
   ];
   programs.light.enable = true; # For brightness control