Split Rory into geneirc and client

3 files changed, 42 insertions, 33 deletions

diff --git a/modules/base-client.nix b/modules/base-client.nix
index 7304ffe..90b074d 100755
--- a/modules/base-client.nix
+++ b/modules/base-client.nix
@@ -4,6 +4,7 @@
   imports =
     [
       ./base.nix
+      ./users/Rory.client.nix
     ];
 
   networking = {
diff --git a/modules/users/Rory.client.nix b/modules/users/Rory.client.nix
new file mode 100755
index 0000000..43a9f57
--- /dev/null
+++ b/modules/users/Rory.client.nix
@@ -0,0 +1,41 @@
+{ config, lib, pkgs, home-manager, ... }:
+
+{
+  home-manager.users.Rory = {
+    services.gnome-keyring.enable = lib.mkForce false;
+    
+    # keepassxc, maybe?
+    systemd.user.services.keepassxc = {
+      Unit = {
+        Description = "KeePassXC password manager";
+        #After = [ "graphical-session-pre.target" ];
+        PartOf = [ "default.target" ];
+      };
+
+      Install = { WantedBy = [ "default.target" ]; };
+
+      Service = { 
+        ExecStart = "${pkgs.keepassxc}/bin/keepassxc ~/.secrets.kdbx";
+        Restart = "always";
+      };
+    };
+
+    systemd.user.services.easyeffects = {
+      Unit = {
+        Description = "EasyEffects";
+        #After = [ "graphical-session-pre.target" ];
+        PartOf = [ "default.target" ];
+      };
+
+      Install = { WantedBy = [ "default.target" ]; };
+
+      Service = { 
+        ExecStart = "${pkgs.easyeffects}/bin/easyeffects";
+        Restart = "always";
+      };
+    };
+
+    home.stateVersion = "22.11";
+  };
+}
+
diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix
index e57c220..29aa6e8 100755
--- a/modules/users/Rory.nix
+++ b/modules/users/Rory.nix
@@ -69,8 +69,6 @@
             #} 
         ];
 
-
-
         localVariables = {
           POWERLEVEL9K_LEFT_PROMPT_ELEMENTS = [
             "os_icon"
@@ -117,37 +115,6 @@
       };
     };
 
-    # keepassxc, maybe?
-    systemd.user.services.keepassxc = {
-      Unit = {
-        Description = "KeePassXC password manager";
-        #After = [ "graphical-session-pre.target" ];
-        PartOf = [ "default.target" ];
-      };
-
-      Install = { WantedBy = [ "default.target" ]; };
-
-      Service = { 
-        ExecStart = "${pkgs.keepassxc}/bin/keepassxc ~/.secrets.kdbx";
-        Restart = "always";
-      };
-    };
-
-    systemd.user.services.easyeffects = {
-      Unit = {
-        Description = "EasyEffects";
-        #After = [ "graphical-session-pre.target" ];
-        PartOf = [ "default.target" ];
-      };
-
-      Install = { WantedBy = [ "default.target" ]; };
-
-      Service = { 
-        ExecStart = "${pkgs.easyeffects}/bin/easyeffects";
-        Restart = "always";
-      };
-    };
-
     programs.neovim.plugins = with pkgs.vimPlugins; [
       pkgs.vimPlugins.nvim-tree-lua
       {