From 78120dca0cb5f839fd16ca1fb0460961b08965c0 Mon Sep 17 00:00:00 2001
From: kenny <theozuang@gmail.com>
Date: Sat, 15 Nov 2025 15:06:37 +0200
Subject: [PATCH] Made desktop env declarations common + sway scrsht

---
 flake.lock                            |  6 +++---
 hosts/puter/de/default.nix            | 31 ---------------------------
 hosts/puter/packages.nix              |  2 ++
 modules/common/pipewire.nix           | 17 +++++++++++++++
 {hosts/puter => modules}/de/gnome.nix |  0
 modules/de/multiple-dms.nix           | 13 +++++++++++
 {hosts/puter => modules}/de/sway.nix  |  4 ++++
 7 files changed, 39 insertions(+), 34 deletions(-)
 delete mode 100644 hosts/puter/de/default.nix
 create mode 100644 modules/common/pipewire.nix
 rename {hosts/puter => modules}/de/gnome.nix (100%)
 create mode 100644 modules/de/multiple-dms.nix
 rename {hosts/puter => modules}/de/sway.nix (87%)

diff --git a/flake.lock b/flake.lock
index a090b59..9050b51 100644
--- a/flake.lock
+++ b/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": {
diff --git a/hosts/puter/de/default.nix b/hosts/puter/de/default.nix
deleted file mode 100644
index bcb5b89..0000000
--- a/hosts/puter/de/default.nix
+++ /dev/null
@@ -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;
-  };
-}
diff --git a/hosts/puter/packages.nix b/hosts/puter/packages.nix
index 43cec7f..6e05256 100644
--- a/hosts/puter/packages.nix
+++ b/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;
diff --git a/modules/common/pipewire.nix b/modules/common/pipewire.nix
new file mode 100644
index 0000000..81e1d4d
--- /dev/null
+++ b/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;
+  };
+}
diff --git a/hosts/puter/de/gnome.nix b/modules/de/gnome.nix
similarity index 100%
rename from hosts/puter/de/gnome.nix
rename to modules/de/gnome.nix
diff --git a/modules/de/multiple-dms.nix b/modules/de/multiple-dms.nix
new file mode 100644
index 0000000..f13ffdc
--- /dev/null
+++ b/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;
+}
diff --git a/hosts/puter/de/sway.nix b/modules/de/sway.nix
similarity index 87%
rename from hosts/puter/de/sway.nix
rename to modules/de/sway.nix
index 9cec6c6..9301b5e 100644
--- a/hosts/puter/de/sway.nix
+++ b/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