From fb53edd9e30e480760a692d4d9de4601c41c6977 Mon Sep 17 00:00:00 2001
From: Tomas Rivera <tomas.riveral@icloud.com>
Date: Sun, 17 May 2026 09:26:58 +0200
Subject: [PATCH] windowManager: separated into new file

---
 hosts/laptop/configuration.nix  | 36 +--------------------------
 modules/nixos/windowManager.nix | 43 +++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 35 deletions(-)
 create mode 100644 modules/nixos/windowManager.nix

diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index 89f1782..2880c62 100755
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -28,6 +28,7 @@
     ../../hostsModules/laptop/nixos/networking.nix # firewall, ssh, networkmanager, etc.
     ../../modules/nixos/bluetooth.nix
     ../../modules/nixos/audioAndMedia.nix
+    ../../modules/nixos/windowManager.nix
   ];
 
 
@@ -53,16 +54,6 @@
     "/share/applications"
     "/share/xdg-desktop-portal"
   ];
-  xdg.portal = {
-    enable = true;
-
-    extraPortals = [
-      pkgs.xdg-desktop-portal-wlr
-      pkgs.xdg-desktop-portal-gtk
-    ];
-  };
-  # removes uxterm
-  services.xserver.excludePackages = [pkgs.xterm];
 
   # Set your time zone.
   time.timeZone = "Europe/Zurich";
@@ -70,9 +61,6 @@
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
 
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
   # zsh dont want to work if it is not initialzed here.
   programs.zsh.enable = true;
 
@@ -80,7 +68,6 @@
   programs.fuse.userAllowOther =  true;
   programs.fuse.enable = true;
 
-
   security.wrappers.gsr-kms-server = {
     # to remove the password prompt when using gpu-screen-recorder
     owner = "root";
@@ -89,26 +76,6 @@
     source = "${pkgs.gpu-screen-recorder}/bin/gsr-kms-server";
   };
 
-
-  # Enable the GNOME Desktop Environment.
-  #  services.displayManager.gdm.enable = true;
-  #  services.desktopManager.gnome.enable = true;
-  # we dont use gnome but some utils yes -> see pckgs
-  #enable sddm
-  #services.displayManager.sddm = {
-  #	enable = true;
-  #	wayland.enable = true;
-  #};
-  # we use ly as the displayManager. see ../../modules/nixos/ly.nix
-
-  # enable hyprland WM
-  programs.hyprland = {
-    enable = true;
-    package = pkgs-unstable.hyprland; # we use the unstable branch to get the latest features
-    withUWSM = true;
-    xwayland.enable = true;
-  };
-
   services.upower.enable = true;
 
   # Configure keymap in X11
@@ -186,7 +153,6 @@
     cmatrix
     tomato-c # pomodoro timer
     #hyprshot
-    xdg-utils
     mailcap
     pkgs-unstable.vimPluginsUpdater # used for building plugins
     hyprcursor
diff --git a/modules/nixos/windowManager.nix b/modules/nixos/windowManager.nix
new file mode 100644
index 0000000..3dde05a
--- /dev/null
+++ b/modules/nixos/windowManager.nix
@@ -0,0 +1,43 @@
+# customization is in ../home-manager/hyprland.nix
+{
+  pkgs-unstable,
+  pkgs,
+  ...
+}:
+{
+  # Enable the X11 windowing system.
+  services.xserver.enable = true;
+
+  # Enable the GNOME Desktop Environment.
+  #  services.displayManager.gdm.enable = true;
+  #  services.desktopManager.gnome.enable = true;
+  # we dont use gnome but some utils yes -> see pckgs
+  #enable sddm
+  #services.displayManager.sddm = {
+  #	enable = true;
+  #	wayland.enable = true;
+  #};
+  # we use ly as the displayManager. see ../../modules/nixos/ly.nix
+
+  # enable hyprland WM
+  programs.hyprland = {
+    enable = true;
+    package = pkgs-unstable.hyprland; # we use the unstable branch to get the latest features
+    withUWSM = true;
+    xwayland.enable = true;
+  };
+
+    xdg.portal = {
+    enable = true;
+    extraPortals = [
+      pkgs.xdg-desktop-portal-wlr
+      pkgs.xdg-desktop-portal-gtk
+    ];
+  };
+  # removes uxterm
+  services.xserver.excludePackages = [pkgs.xterm];
+
+  environment.systemPackages = with pkgs; [
+    xdg-utils
+  ];
+}