diff --git a/users/rouven/modules/default.nix b/users/rouven/modules/default.nix
index 7b9d043..23cafbb 100644
--- a/users/rouven/modules/default.nix
+++ b/users/rouven/modules/default.nix
@@ -7,6 +7,7 @@
       ./flameshot
       ./fzf
       ./git
+      ./gpg
       ./kdeconnect
       ./neovim
       ./picom
diff --git a/users/rouven/modules/git/default.nix b/users/rouven/modules/git/default.nix
index 99eb876..0d42a43 100644
--- a/users/rouven/modules/git/default.nix
+++ b/users/rouven/modules/git/default.nix
@@ -11,4 +11,11 @@
       commit.gpgsign = true;
     };
   };
+  programs.gh = {
+    enable = true;
+    settings = {
+      editor = "nvim";
+      git_protocol = "ssh";
+    };
+  };
 }
diff --git a/users/rouven/modules/gpg/default.nix b/users/rouven/modules/gpg/default.nix
new file mode 100644
index 0000000..e68f2da
--- /dev/null
+++ b/users/rouven/modules/gpg/default.nix
@@ -0,0 +1,14 @@
+{ config, ... }:
+{
+  programs.gpg = {
+    enable = true;
+    mutableKeys = true;
+    publicKeys = [
+      {
+        source = ../../../../keys/pgp/rouven.asc;
+        trust = 5;
+      }
+    ];
+    scdaemonSettings = { disable-ccid = true; };
+  };
+}
diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix
index baf98c1..8d06473 100644
--- a/users/rouven/modules/packages.nix
+++ b/users/rouven/modules/packages.nix
@@ -13,8 +13,6 @@
     okular
     gimp
 
-    gh # github cli tool
-
     # sound
     pavucontrol