snapshot pre-cleanup-2026-05-23T19-39-41Z

modules/hosts/laptop.nix

@@ -1,7 +1,13 @@
 { inputs, self, ...}: {
-  flake.nixosConfiguration.laptop = inputs.nixpkgs.lib.nixosSystem {
+  flake.nixosConfigurations.laptop = inputs.nixpkgs.lib.nixosSystem {
+    system = "x86_64-linux";
+    specialArgs = {
+      inherit (self) pkgs pkgs-unstable;
+    };
     modules = with self.nixosModules; [
-      # keep this alphabetically organised
+#inputs.home-manager.nixosModules.home-manager      
+inputs.home-manager.nixosModules.default
+# keep this alphabetically organised
       anki
       audioAndMedia
       autoCleanup-laptop
@@ -24,6 +30,7 @@
       IO
       kdrive
       latex
+      laptop
       ly
       mullvad
       networking
@@ -34,11 +41,20 @@
       printer
       udev
       user
-    ];
-  };
-  flake.homeConfiguration.tomasr = inputs.home-manager.lib.homeManagerConfiguration {
+    ];};
+  flake.homeConfigurations.tomasr = inputs.home-manager.lib.homeManagerConfiguration {
     pkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
-    pkgs-unstable = import inputs.nixpkgs-unstable { system = "x86_64-linux"; };
+
+#    system = "x86_64-linux";
+    #specialArgs = {
+    #  inherit (self) pkgs pkgs-unstable;
+    #};
+    extraSpecialArgs = {
+      pkgs-unstable =
+        import inputs.nixpkgs-unstable {
+          system = "x86_64-linux";
+        };
+      };
     modules = with self.homeModules; [
       anki
       cursor
@@ -58,8 +74,8 @@
       sbb-tui
       ssh
       thunderbird
-      tomasrModule
-      vivify
+      tomasr
+     vivify
       zoxide
       zsh
       zsh-laptop
@@ -74,19 +90,27 @@
     # (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.USERNAME = self.homeModules.USERNAMEModule;
+    #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 = { ... }: {
+  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.tomasrModule = { ... }: {
+  flake.homeModules.tomasr = { ... }: {
     imports = [
       inputs.caelestia-shell.homeManagerModules.default
     ];