laptop config has now integrated the module refactoring. Also updated flake.lock and fixed missing git aliases from previous commit

hosts/laptop/config.nix

@@ -1,7 +1,10 @@
 {pkgs, config, ...}: {
   system.stateVersion = "24.05";
   nixpkgs.config.allowUnfree = true;
-  imports = [ ./hardware.nix ];
+  imports = [
+    ./hardware.nix
+    ./home.nix
+  ];
 
   powerProfiles.enable = true;
   boot = {
@@ -14,21 +17,31 @@
       ++ [pkgs.cpupower-gui];
   };
 
-    environment = {
-      variables = {
-        PATH = "${pkgs.clang-tools}/bin:$PATH";
-      };
-      shells = with pkgs; [
-        zsh
-        bash
-      ];
-      systemPackages = with pkgs; [
-        acpi
-        brightnessctl
-        cpupower-gui
-        powertop
-      ];
+  networkModule.enable = true;
+  nixSettings.enable = true;
+  bootLoader.enable = true;
+  issue.enable = true;
+  sddmConfig.enable = true;
+  stylixConfig.enable = true;
+  sysPkgs.enable = true;
+  sysProgs.enable = true;
+  sysServices.enable = true;
+
+  environment = {
+    variables = {
+      PATH = "${pkgs.clang-tools}/bin:$PATH";
     };
+    shells = with pkgs; [
+      zsh
+      bash
+    ];
+    systemPackages = with pkgs; [
+      acpi
+      brightnessctl
+      cpupower-gui
+      powertop
+    ];
+  };
 
 
 }

hosts/laptop/home.nix

@@ -0,0 +1,96 @@
+{
+  host,
+  pkgs,
+  self,
+  inputs,
+  username,
+  wallpaper,
+  lib,
+  scheme,
+  config,
+  ...
+}: let
+  nur = config.nur;
+in {
+  imports = [inputs.home-manager.nixosModules.home-manager];
+  home-manager = {
+    useUserPackages = true;
+    useGlobalPkgs = true;
+    backupFileExtension = "backup";
+    extraSpecialArgs = {inherit self inputs host wallpaper scheme username nur;};
+    users = {
+      ${username} = {
+        programs.home-manager.enable = true;
+        imports = [
+          inputs.spicetify-nix.homeManagerModules.default
+          inputs.self.outputs.homeManagerModules.default
+        ];
+
+        # My custom home-manager modules
+
+        # modules/home/files
+        homeFiles.enable = true;
+
+        # modules/home/environment
+        hyprlandConfig.enable   = true;
+        autojumpConfig.enable   = true;
+        stylixHomeConfig.enable = true;
+        waybarConfig.enable     = true;
+        gtkConfig.enable        = true;
+        spicetifyConfig.enable  = true;
+        starshipConfig.enable   = true;
+
+        # modules/home/programs
+        btopConfig.enable       = true;
+        swayncConfig.enable     = true;
+        userPkgs.enable         = true;
+        cavaConfig.enable       = true;
+        ezaConfig.enable        = true;
+        firefoxConfig.enable    = true;
+        fuzzelConfig.enable     = true;
+        fzfConfig.enable        = true;
+        gitConfig.enable        = true;
+        kittyConfig.enable      = true;
+        yaziConfig.enable       = true;
+        zshConfig.enable        = true;
+        passConfig.enable       = true;
+        batConfig.enable        = true;
+
+        # modules/home/scripts
+        movScripts.enable = true;
+        movScripts.commandScripts.enable = true;
+        movScripts.hyprlandControls.enable = true;
+        movScripts.nixShortcuts.enable = true;
+
+        dconf.settings = lib.mkIf config.virtConfig.enable {
+          "org/virt-manager/virt-manager/connections" = {
+            autoconnect = ["qemu:///system"];
+            uris = ["qemu:///system"];
+          };
+        };
+        home = {
+          username = "${username}";
+          homeDirectory = "/home/${username}";
+          stateVersion = "24.05";
+        };
+      };
+    };
+  };
+
+  users = {
+    groups.persist = {};
+    users = {
+      root.initialPassword = "1234";
+      ${username} = {
+        isNormalUser = true;
+        initialPassword = "1234";
+        shell = pkgs.zsh;
+        extraGroups = ["wheel" "persist" "libvirtd"];
+      };
+    };
+  };
+  security.sudo.extraConfig = ''
+    ${username} ALL=(ALL) NOPASSWD: /etc/profiles/per-user/${username}/bin/rebuild
+  '';
+  nix.settings.allowed-users = ["${username}"];
+}