From ded474bf59000ca4e2f4d30caeeceb0f7885fcec Mon Sep 17 00:00:00 2001
From: aethrvmn <me@aethrvmn.gr>
Date: Fri, 24 Oct 2025 10:49:35 +0200
Subject: cleaned up modules

---
 modules/client/default.nix         | 3 +--
 modules/client/labwc/default.nix   | 6 ++++++
 modules/client/xserver/default.nix | 9 +++++++++
 modules/common/default.nix         | 8 ++++++--
 modules/common/xserver/default.nix | 9 ---------
 5 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 modules/client/xserver/default.nix
 delete mode 100644 modules/common/xserver/default.nix

(limited to 'modules')

diff --git a/modules/client/default.nix b/modules/client/default.nix
index f4216da..046f61f 100644
--- a/modules/client/default.nix
+++ b/modules/client/default.nix
@@ -2,9 +2,8 @@
   imports = [
     ./1password
     ./bluetooth
+    # ./cinnamon
     ./flatpak
     ./labwc
-    ./thunar
-    ./waybar
   ];
 }
diff --git a/modules/client/labwc/default.nix b/modules/client/labwc/default.nix
index 4344391..6512e7d 100644
--- a/modules/client/labwc/default.nix
+++ b/modules/client/labwc/default.nix
@@ -1,6 +1,12 @@
 { config, pkgs, ... }:
 # Set up a complete labwc instance system-side
 {
+  imports = [
+    ../thunar
+    ../waybar
+    ../xserver
+  ];
+  
   # Enable labwc
   programs.labwc.enable = true;
 
diff --git a/modules/client/xserver/default.nix b/modules/client/xserver/default.nix
new file mode 100644
index 0000000..7249ae2
--- /dev/null
+++ b/modules/client/xserver/default.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+# XServer
+{
+  services.xserver.xkb = {
+    layout = "us, gr";
+    options = "grp:alt_shift_toggle";
+  };
+}
diff --git a/modules/common/default.nix b/modules/common/default.nix
index f34cd8f..1eead49 100644
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 {
   imports =[
     # names are self explanatory
@@ -11,7 +11,7 @@
     ./searx
     ./ssh
     ./users
-    ./xserver
+    # ./xserver
   ];
 
   nix = {
@@ -21,6 +21,10 @@
 
       # Optimize storage
       auto-optimise-store = true;
+
+      # substituters = lib.mkForce [ ];
+      # trusted-substituters = lib.mkForce [ ];
+      # require-sigs = false;
     };
   };
 
diff --git a/modules/common/xserver/default.nix b/modules/common/xserver/default.nix
deleted file mode 100644
index 7249ae2..0000000
--- a/modules/common/xserver/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-
-# XServer
-{
-  services.xserver.xkb = {
-    layout = "us, gr";
-    options = "grp:alt_shift_toggle";
-  };
-}
-- 
cgit v1.2.3