diff --git a/home/cli.nix b/home/cli.nix
index c6460ee..c5ebb9f 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -19,9 +19,6 @@ in {
     sessionPath = [ "$HOME/.local/bin" "$HOME/.emacs.d/bin" ];
   };
 
-  # do not show home-manager notifications
-  news.display = "silent";
-
   home.packages = with pkgs; [
     # archives
     #p7zip
@@ -41,16 +38,6 @@ in {
     sqlite.dev
     sqlite
 
-    # editing
-    nil # nix language server
-
-    # system tools
-    htop-vim # htop with vim bindings
-    erdtree # du+tree had sex
-    dua # ncdu but better
-    bat # better cat
-    exa # better ls
-
     gcc
     cmake
     graphviz
@@ -98,8 +85,6 @@ in {
   };
 
   programs = {
-    bash = { enable = true; };
-
     zsh = {
       enable = true;
       enableAutosuggestions = true;
@@ -154,8 +139,7 @@ in {
 
     password-store = {
       enable = true;
-      #      package = pkgs.pass.withExtensions (exts: [ exts.pass-otp ]);
-      package = pkgs.gopass;
+      package = pkgs.pass.withExtensions (exts: [ exts.pass-otp ]);
       settings = { PASSWORD_STORE_DIR = "$HOME/.local/share/password-store"; };
     };
 
diff --git a/outputs/homeConfigurations/default.nix b/outputs/homeConfigurations/default.nix
index 8b9ac20..366e89b 100644
--- a/outputs/homeConfigurations/default.nix
+++ b/outputs/homeConfigurations/default.nix
@@ -4,41 +4,67 @@ let
   pkgs = import nixpkgs-unstable {
     system = "x86_64-linux";
     config.allowUnfree = true;
-    overlays = [ emacs.overlay ];
+    overlays = [ ];
   };
 in {
   "alex@dregil" = home-manager-unstable.lib.homeManagerConfiguration {
     inherit pkgs;
-    modules = [
-      ../../home/cli.nix
-      {
-        home = {
-          packages = with pkgs; [
-            alacritty # fast terminal
-            firefox # the browser with the fox
+    modules = [{
+      programs.home-manager.enable = true;
 
-            # 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"
+      home = {
+        username = "alex";
+        homeDirectory = "/home/alex";
+        stateVersion = "22.11";
+        packages = with pkgs; [
+          alacritty # fast terminal
+          firefox # the browser with the fox
 
-            # editing
+          # 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"
 
-            # system tools
-            uhk-agent # my keyboard
-            mosh # ssh via udp
+          # editing
+          helix # vim like editor
+          nil # nix language server
 
-            # gaming support
-            lutris
-          ];
-        };
+          # 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
 
-        services.gpg-agent = {
-          enable = true;
-          enableSshSupport = true;
-          sshKeys = [ "9027AB16B9A7C20BD29F30F55CBA054430BF014C" ];
-        };
-      }
-    ];
+          # 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" ];
+      };
+    }];
   };
 }