diff --git a/modules/user/direnv.nix b/modules/user/direnv.nix
new file mode 100644
index 0000000..59df7bf
--- /dev/null
+++ b/modules/user/direnv.nix
@@ -0,0 +1,9 @@
+{ config, ...}: {
+  programs.direnv = {
+    enable = true;
+    nix-direnv = {
+      enable = true;
+      enableFlakes = true;
+    };
+  };
+}
diff --git a/modules/user/git.nix b/modules/user/git.nix
new file mode 100644
index 0000000..beea776
--- /dev/null
+++ b/modules/user/git.nix
@@ -0,0 +1,14 @@
+{ config, ... }: {
+  programs.git = {
+    enable = true;
+    userName = "LavaDesu";
+    userEmail = "me@lava.moe";
+    signing = {
+      key = "059F098EBF0E9A13E10A46BF6500251E087653C9";
+      signByDefault = true;
+    };
+    extraConfig = {
+      core.abbrev = 11;
+    };
+  };
+}
diff --git a/modules/user/gpg.nix b/modules/user/gpg.nix
new file mode 100644
index 0000000..a8ab12f
--- /dev/null
+++ b/modules/user/gpg.nix
@@ -0,0 +1,10 @@
+{ config, enableGUI, ... }: {
+  programs.gpg = {
+    enable = true;
+    homedir = "${config.xdg.dataHome}/gnupg";
+  };
+  services.gpg-agent = {
+    enable = true;
+    pinentryFlavor = if enableGUI then "gnome3" else "tty";
+  };
+}
diff --git a/users/rin.nix b/users/rin.nix
index 88c8471..15fe3c9 100644
--- a/users/rin.nix
+++ b/users/rin.nix
@@ -69,6 +69,9 @@
     };
 
     imports = with modules.user; [
+      direnv
+      git
+      gpg
       neovim
       npm
       zsh
@@ -89,43 +92,6 @@
       bspwm
     ];
 
-    programs = {
-      feh.enable = enableGUI;
-
-      direnv = {
-        enable = true;
-        nix-direnv = {
-          enable = true;
-          enableFlakes = true;
-        };
-      };
-      git = {
-        enable = true;
-        userName = "LavaDesu";
-        userEmail = "me@lava.moe";
-        signing = {
-          key = "059F098EBF0E9A13E10A46BF6500251E087653C9";
-          signByDefault = true;
-        };
-        extraConfig = {
-          core.abbrev = 11;
-        };
-      };
-      gpg = {
-        enable = true;
-        homedir = "${config.xdg.dataHome}/gnupg";
-      };
-    };
-
-    services = {
-      # TODO: borked
-      clipmenu.enable = false;
-      gpg-agent = {
-        enable = true;
-        pinentryFlavor = if enableGUI then "gnome3" else "tty";
-      };
-    };
-
     home.file.".local/bin/ipc-bridge.exe".source = builtins.fetchurl {
       url = "https://github.com/0e4ef622/wine-discord-ipc-bridge/releases/download/v0.0.1/winediscordipcbridge.exe";
       sha256 = "1swn9spxpq6blm74kjmfz4ipq6a8qjzccvb2msb25pf5b1z7jnns";