diff --git a/home/cli.nix b/home/cli.nix
index c5ebb9f..0c6b37f 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -19,6 +19,9 @@ in {
     sessionPath = [ "$HOME/.local/bin" "$HOME/.emacs.d/bin" ];
   };
 
+  # do not show home-manager notifications
+  news.display = "silent";
+
   home.packages = with pkgs; [
     # archives
     #p7zip
@@ -85,6 +88,8 @@ in {
   };
 
   programs = {
+    bash = { enable = true; };
+
     zsh = {
       enable = true;
       enableAutosuggestions = true;
@@ -139,7 +144,8 @@ in {
 
     password-store = {
       enable = true;
-      package = pkgs.pass.withExtensions (exts: [ exts.pass-otp ]);
+      #      package = pkgs.pass.withExtensions (exts: [ exts.pass-otp ]);
+      package = pkgs.gopass;
       settings = { PASSWORD_STORE_DIR = "$HOME/.local/share/password-store"; };
     };
 
diff --git a/outputs/homeConfigurations/default.nix b/outputs/homeConfigurations/default.nix
index 366e89b..3cf9ce5 100644
--- a/outputs/homeConfigurations/default.nix
+++ b/outputs/homeConfigurations/default.nix
@@ -4,67 +4,47 @@ let
   pkgs = import nixpkgs-unstable {
     system = "x86_64-linux";
     config.allowUnfree = true;
-    overlays = [ ];
+    overlays = [ emacs.overlay ];
   };
 in {
   "alex@dregil" = home-manager-unstable.lib.homeManagerConfiguration {
     inherit pkgs;
-    modules = [{
-      programs.home-manager.enable = true;
+    modules = [
+      ../../home/cli.nix
+      {
+        home = {
+          packages = with pkgs; [
+            alacritty # fast terminal
+            firefox # the browser with the fox
 
-      home = {
-        username = "alex";
-        homeDirectory = "/home/alex";
-        stateVersion = "22.11";
-        packages = with pkgs; [
-          alacritty # fast terminal
-          firefox # the browser with the fox
+            # social
+            jitsi-meet-electron # jitsi as a stand-alone app
+            discord # talk to other people
+            #inputs.simplex-chat.packages."x86_64-linux"."exe:simplex-chat"
 
-          # social
-          jitsi-meet-electron # jitsi as a stand-alone app
-          discord # talk to other people
-          #inputs.simplex-chat.packages."x86_64-linux"."exe:simplex-chat"
+            # editing
+            helix # vim like editor
+            nil # nix language server
 
-          # editing
-          helix # vim like editor
-          nil # nix language server
+            # system tools
+            htop-vim # htop with vim bindings
+            erdtree # du+tree had sex
+            dua # ncdu but better
+            bat # better cat
+            uhk-agent # my keyboard
+            mosh # ssh via udp
 
-          # system tools
-          htop-vim # htop with vim bindings
-          erdtree # du+tree had sex
-          dua # ncdu but better
-          bat # better cat
-          uhk-agent # my keyboard
-          mosh # ssh via udp
+            # gaming support
+            lutris
+          ];
+        };
 
-          # gaming support
-          lutris
-        ];
-      };
-
-      programs.bash = { enable = true; };
-
-      programs.zsh = { enable = true; };
-
-      programs.git = {
-        enable = true;
-        userName = "Alexander Kobjolke";
-        userEmail = "me@failco.de";
-      };
-
-      programs.password-store = {
-        enable = true;
-        package = pkgs.gopass;
-      };
-
-      # do not show home-manager notifications
-      news.display = "silent";
-
-      services.gpg-agent = {
-        enable = true;
-        enableSshSupport = true;
-        sshKeys = [ "9027AB16B9A7C20BD29F30F55CBA054430BF014C" ];
-      };
-    }];
+        services.gpg-agent = {
+          enable = true;
+          enableSshSupport = true;
+          sshKeys = [ "9027AB16B9A7C20BD29F30F55CBA054430BF014C" ];
+        };
+      }
+    ];
   };
 }