home-manager: Update the home-manager config for nicer usability

Author: RaHoni

flake.nix

@@ -176,7 +176,7 @@
             homeManagerModules = nixpkgs.lib.attrsets.foldAttrs (item: acc: item ++ acc) [ ] [
               {
                 root = [
-                  ./generic/users/root/home-manager.nix
+                  ./generic/users/raoul.nix
                 ];
               }
               homeManagerModules
@@ -385,8 +385,8 @@
               secureboot = false;
               genericHomeManagerModules = [ ];
               homeManagerModules = {
-                root = [ ./generic/users/root/home-manager.nix ];
-                nixos = [ ./generic/users/default.nix ];
+                root = [ ./generic/users/raoul.nix ];
+                nixos = [ ];
               };
             };
           };
@@ -406,8 +406,8 @@
               secureboot = false;
               genericHomeManagerModules = [ ];
               homeManagerModules = {
-                root = [ ./generic/users/root/home-manager.nix ];
-                nixos = [ ./generic/users/default.nix ];
+                root = [ ./generic/users/raoul.nix ];
+                nixos = [ ];
               };
             };
           };

generic/newDefault.nix

@@ -78,7 +78,7 @@ in
       the following will change the users to attribute sets with home manager config
     */
     users = builtins.mapAttrs (userName: modules: {
-      imports = modules;
+      imports = modules ++ [ ./users/default.nix ];
 
       home.username = userName;
       home.homeDirectory = if userName == "root" then "/root" else "/home/${userName}";

generic/users/default.nix

@@ -12,21 +12,15 @@ in
 {
   home.file = {
     ".ssh/keys".source = ../sshPubkeys;
-    ".p10k.zsh".source = ./p10k.zsh;
     #".zshrc".source = ./zshrc;
   };
 
-  home.packages = with pkgs; [
-    grepcidr
-  ];
-
   programs.zsh = {
     enable = true;
     enableVteIntegration = true;
     autosuggestion.enable = true;
     initExtra = "[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh";
     localVariables = {
-      YSU_HARDCORE = 1;
       YSU_IGNORED_ALIASES = [ "g" ];
     };
   };
@@ -41,7 +35,6 @@ in
     ssh = {
       enable = true;
       extraConfig = ''
-        user raoul
         identitiesOnly yes
       '';
       matchBlocks = rec {
@@ -133,20 +126,4 @@ in
     };
   };
 
-  # Signal start in tray fix
-  home.file.".local/share/applications/signal-desktop.desktop" = {
-    enable = osConfig.services.desktopManager.plasma6.enable;
-    text = ''
-      [Desktop Entry]
-      Name=Signal
-      Exec=LANGUAGE="de-DE:en-US" ${pkgs.signal-desktop}/bin/signal-desktop --no-sandbox --start-in-tray %U
-      Terminal=false
-      Type=Application
-      Icon=signal-desktop
-      StartupWMClass=Signal
-      Comment=Private messaging from your desktop
-      MimeType=x-scheme-handler/sgnl;x-scheme-handler/signalcaptcha;
-      Categories=Network;InstantMessaging;Chat;
-    '';
-  };
 }

generic/users/raoul.nix

@@ -0,0 +1,19 @@
+{
+  ...
+}:
+{
+  home.file = {
+    ".p10k.zsh".source = ./p10k.zsh;
+
+  };
+
+  programs.zsh = {
+    localVariables.YSU_HARDCORE = 1;
+  };
+
+  programs.ssh = {
+    extraConfig = ''
+      user raoul
+    '';
+  };
+}

generic/users/raoul/home-manager.nix

@@ -7,7 +7,10 @@
 }:
 with lib;
 {
-  imports = [ ./../default.nix ];
+  imports = [
+    ./../default.nix
+    ../raoul.nix
+  ];
   #  home.stateVersion = "23.05";
 
   home.packages = with pkgs; [