From d0e012e79b1901171d219a32d9ee2d0e0d8ccccf Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Fri, 7 Apr 2023 00:40:59 +0200
Subject: [PATCH] dregil: Move packages for alex from system config to hm
 config

---
 hosts/dregil/configuration.nix         | 23 +----------------
 modules/common-system.nix              |  6 -----
 outputs/homeConfigurations/default.nix | 35 ++++++++++++++++++++++++--
 3 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/hosts/dregil/configuration.nix b/hosts/dregil/configuration.nix
index b01e985..0c532fd 100644
--- a/hosts/dregil/configuration.nix
+++ b/hosts/dregil/configuration.nix
@@ -93,28 +93,7 @@ in
     extraGroups = [ "wheel" # Enable ‘sudo’ for the user.
                     "input"
                   ];
-    packages = with pkgs; [
-      # gui tool
-      alacritty
-      firefox
-      jitsi-meet-electron
-
-      # editing
-      helix
-      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
-      
-      # gaming support
-      lutris
-      #inputs.simplex-chat.packages."x86_64-linux"."exe:simplex-chat"
-    ];
-  };
+ };
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
diff --git a/modules/common-system.nix b/modules/common-system.nix
index 2210474..a640d0f 100644
--- a/modules/common-system.nix
+++ b/modules/common-system.nix
@@ -20,12 +20,6 @@
 
   networking.firewall.enable = true;
 
-  users.users.alex = {
-      isNormalUser = true;
-      extraGroups = [ "wheel" "input" ];
-      shell = pkgs.zsh;
-  };
-
   nix = {
       gc = {
         automatic = true;
diff --git a/outputs/homeConfigurations/default.nix b/outputs/homeConfigurations/default.nix
index 5c8a4f9..ea49a02 100644
--- a/outputs/homeConfigurations/default.nix
+++ b/outputs/homeConfigurations/default.nix
@@ -18,18 +18,49 @@ in
           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"
+
+            # 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
+
+            # gaming support
             lutris
-            discord
-            mosh
           ];
         };
 
+        programs.bash = {
+          enable = true;
+        };
+
+        programs.zsh = {
+          enable = true;
+        };
+
         programs.git = {
           enable = true;
           userName = "Alexander Kobjolke";
           userEmail = "me@failco.de";
         };
 
+        programs.password-store = {
+          enable = true;
+        };
+
         # do not show home-manager notifications
         news.display = "silent";
       }