8 files changed, 25 insertions, 47 deletions
diff --git a/modules/client/1password/default.nix b/modules/1password/default.nix
index 7d01e3d..5e650cd 100644
--- a/modules/client/1password/default.nix
+++ b/modules/1password/default.nix
@@ -1,14 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, ... }:
 
 {
-  programs = {
-    _1password.enable = true;
-    _1password-gui = {
-      enable = true;
-      polkitPolicyOwners = [ "aethrvmn" ];
-    };
-  };
-
   environment.etc ={
     "1password/custom_allowed_browsers" = {
       text = ''
@@ -18,5 +10,17 @@
       mode = "0755";
     };
   };
+
+  nixpkgs.config = {
+    allowUnfree = lib.mkForce true;
+  };
+
+  programs = {
+    _1password.enable = true;
+    _1password-gui = {
+      enable = true;
+      polkitPolicyOwners = [ "aethrvmn" ];
+    };
+  };
 }
 
diff --git a/modules/client/cinnamon/default.nix b/modules/cinnamon/default.nix
index b73cda5..c75cf0d 100644
--- a/modules/client/cinnamon/default.nix
+++ b/modules/cinnamon/default.nix
@@ -1,12 +1,14 @@
 { pkgs, lib, ... }:
 {
-  imports = [
-    ../xserver
-  ];
-
   services = {
-    xserver = {
+    ## Just in case this needs to be enabled 
+    # cinnamon.apps.enable = true;
+ 
+    gnome = {
+      gnome-keyring.enable = true;
+    };
 
+    xserver = {
       desktopManager.cinnamon = {
         enable = true;
       };
@@ -20,15 +22,13 @@
           enable = true;
         };
       };
-    };
 
-    ## Just in case this needs to be enabled 
-    # cinnamon.apps.enable = true;
+      wacom.enable = true;
 
-    gnome = {
-      gnome-keyring.enable = true;
-      # disable gNOME's "usecase?" ssh-agent
-      gcr-ssh-agent.enable = lib.mkForce false;
+      xkb = {
+        layout = "us, gr";
+        options = "grp:alt_shift_toggle";
+      };
     };
   };
 
diff --git a/modules/client/bluetooth/default.nix b/modules/client/bluetooth/default.nix
deleted file mode 100644
index 2dfd66d..0000000
--- a/modules/client/bluetooth/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  services.blueman.enable = true;
-}
diff --git a/modules/client/default.nix b/modules/client/default.nix
deleted file mode 100644
index ea3f803..0000000
--- a/modules/client/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  imports = [
-    ./1password
-    ./bluetooth
-    ./cinnamon
-    ./flatpak
-    # ./labwc
-  ];
-}
diff --git a/modules/client/xserver/default.nix b/modules/client/xserver/default.nix
deleted file mode 100644
index 6cd0252..0000000
--- a/modules/client/xserver/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-# XServer
-{
-  services.xserver = {
-    enable = lib.mkForce true;
-    xkb = {
-      layout = "us, gr";
-      options = "grp:alt_shift_toggle";
-    };
-
-    wacom.enable = true;
-  };
-}
diff --git a/modules/client/flatpak/default.nix b/modules/flatpak/default.nix
index e5a636f..e5a636f 100644
--- a/modules/client/flatpak/default.nix
+++ b/modules/flatpak/default.nix
diff --git a/modules/client/thunar/default.nix b/modules/thunar/default.nix
index 0caaabf..0caaabf 100644
--- a/modules/client/thunar/default.nix
+++ b/modules/thunar/default.nix
diff --git a/modules/client/waybar/default.nix b/modules/waybar/default.nix
index ec27a77..ec27a77 100644
--- a/modules/client/waybar/default.nix
+++ b/modules/waybar/default.nix