diff --git a/modules/emacs/init.el b/modules/emacs/init.el
index f93f8997..3cff189c 100644
--- a/modules/emacs/init.el
+++ b/modules/emacs/init.el
@@ -108,6 +108,8 @@
   ((text-mode prog-mode) . electric-pair-mode)
   :custom
   (inhibit-startup-screen t "Don't show default startup screen")
+  (auth-sources '(password-store))
+  (auth-source-pass-filename "~/repos/passwords")
   :config
   ;; Only ask for y/n, never for yes/no.
   (defalias 'yes-or-no-p 'y-or-n-p)
@@ -149,6 +151,10 @@
   :config (global-flycheck-mode)
   )
 
+;; Magit GitHub/GitLab integration
+(use-package forge
+  :after magit)
+
 ;; Groovy (gradle) language support
 (use-package groovy-mode
   :mode "\\.gradle\\'")
diff --git a/modules/git.nix b/modules/git.nix
index dc34366b..f8f75a49 100644
--- a/modules/git.nix
+++ b/modules/git.nix
@@ -32,6 +32,9 @@
             pull = {
               rebase = true;
             };
+            github = {
+              user = "chvp";
+            };
           };
           ignores = [
             ".direnv"