dendritic: first succesfull rebuild

modules/hosts/laptop.nix

@@ -6,8 +6,14 @@
     };
     modules = with self.nixosModules; [
 #inputs.home-manager.nixosModules.home-manager      
-inputs.home-manager.nixosModules.default
+#inputs.home-manager.nixosModules.default
 # keep this alphabetically organised
+
+
+home-manager-laptop
+      laptop
+      { nixpkgs.pkgs = self.pkgs; }
+
       anki
       audioAndMedia
       autoCleanup-laptop
@@ -25,12 +31,10 @@ inputs.home-manager.nixosModules.default
       games
       hardware-configuration-laptop
       hardwareUtils-laptop
-      home-manager-laptop
       hyprland
       IO
       kdrive
       latex
-      laptop
       ly
       mullvad
       networking
@@ -42,21 +46,53 @@ inputs.home-manager.nixosModules.default
       udev
       user
     ];};
-  flake.homeConfigurations.tomasr = inputs.home-manager.lib.homeManagerConfiguration {
-    pkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
+  flake.nixosModules.laptop = { ... }: {
+    # This value determines the NixOS release from which the default
+    # settings for stateful data, like file locations and database versions
+    # on your system were taken. It‘s perfectly fine and recommended to leave
+    # this value at the release version of the first install of this system.
+    # Before changing this value read the documentation for this option
+    # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+    system.stateVersion = "25.11"; # Did you read the comment?
 
-#    system = "x86_64-linux";
-    #specialArgs = {
-    #  inherit (self) pkgs pkgs-unstable;
-    #};
-    extraSpecialArgs = {
-      pkgs-unstable =
-        import inputs.nixpkgs-unstable {
-          system = "x86_64-linux";
-        };
+    /*#home-manager.users.tomasr = self.home.Configurations.tomasr;
+    #home-manager.nixosModule.home-manager.users.tomasr = self.homeConfigurations.tomasr;
+    home-manager.users.tomasr = {
+  imports = [
+      self.homeModules.tomasr
+  ];
+};*/
+  };
+  flake.nixosModules.home-manager-laptop = { pkgs, ... }: {
+    imports = [
+      inputs.home-manager.nixosModules.default # import official home-manager NixOS module
+    ];
+    
+    # Warning. Git is used in case I break everything up. It already saved me once
+    environment.systemPackages = [ pkgs.git ];
+    home-manager = {
+      useGlobalPkgs = true;
+      useUserPackages = true;
+
+      extraSpecialArgs = {
+         #inherit (self) pkgs-unstable;
+         pkgs-unstable = self.pkgs-unstable;
+         inherit self;
       };
-    modules = with self.homeModules; [
+    };
+
+    users.users.tomasr = {
+      isNormalUser = true;
+      #shell = pkgs.zsh;
+    };
+    home-manager.users.tomasr = self.homeModules.tomasrModule;
+  };
+  # we shouldn't use homeConfigurations as it makes a standalone home-manager config
+  flake.homeModules.tomasrModule = { ... }: {
+    imports = with self.homeModules; [
+      inputs.caelestia-shell.homeManagerModules.default
       anki
+      caelestia
       cursor
       eza
       fastfetch
@@ -74,46 +110,12 @@ inputs.home-manager.nixosModules.default
       sbb-tui
       ssh
       thunderbird
-      tomasr
+      #tomasr
      vivify
       zoxide
       zsh
       zsh-laptop
     ];
-  };
-  flake.nixosModules.laptop = { ... }: {
-    # This value determines the NixOS release from which the default
-    # settings for stateful data, like file locations and database versions
-    # on your system were taken. It‘s perfectly fine and recommended to leave
-    # this value at the release version of the first install of this system.
-    # Before changing this value read the documentation for this option
-    # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-    system.stateVersion = "25.11"; # Did you read the comment?
-
-    #home-manager.users.tomasr = self.home.Configurations.tomasr;
-    #home-manager.nixosModule.home-manager.users.tomasr = self.homeConfigurations.tomasr;
-    home-manager.users.tomasr = {
-  imports = [
-    self.homeModules.tomasr
-  ];
-};
-  };
-  flake.nixosModules.home-manager-laptop = { pkgs, ... }: {
-    imports = [
-      inputs.home-manager.nixosModules.default # import official home-manager NixOS module
-    ];
-    
-    # Warning. Git is used in case I break everything up. It already saved me once
-    environment.systemPackages = [ pkgs.git ];
-    home-manager = {
-      useGlobalPkgs = true;
-      useUserPackages = true;
-    };
-  };
-  flake.homeModules.tomasr = { ... }: {
-    imports = [
-      inputs.caelestia-shell.homeManagerModules.default
-    ];
     home.username = "tomasr";
     home.homeDirectory = "/home/tomasr";