machines/macbook/default.nix

@@ -18,6 +18,6 @@
     useGlobalPkgs = true;
     useUserPackages = true;
     extraSpecialArgs = { inherit emacs-larstvei; };
-    users.larstvei.imports = [ ../../modules/home/full ];
+    users.larstvei.imports = [ ../../modules/home ];
   };
 }

machines/thinkpad/default.nix

@@ -6,11 +6,6 @@
     ../../modules/nixos
   ];
 
-  home-manager.users.larstvei.imports = [
-    ../../modules/home/full
-    ../../modules/desktop
-  ];
-
   networking.hostName = "larstvei-think";
 
   # Bootloader.

modules/base/default.nix

@@ -9,6 +9,8 @@
     package = pkgs.nix;
 
     settings = {
+      auto-optimise-store = true;
+
       experimental-features = [
         "nix-command"
         "flakes"
@@ -33,8 +35,6 @@
         "larstvei.cachix.org-1:mJq98qeTBnm2xNNibn2BEwN1ggi6uQg+5hWASdG1Vys="
       ];
     };
-
-    optimise.automatic = true;
   };
 
   environment.systemPackages = [

modules/darwin/default.nix

@@ -4,20 +4,7 @@
     ../homebrew
   ];
 
-  nix.linux-builder = {
+  nix.linux-builder.enable = true;
-    enable = true;
-    ephemeral = true;
-    maxJobs = 4;
-    config = {
-      virtualisation = {
-        darwin-builder = {
-          diskSize = 200 * 1024;
-          memorySize = 8 * 1024;
-        };
-        cores = 6;
-      };
-    };
-  };
 
   system = {
     stateVersion = 4;

modules/home/default.nix

@@ -1,4 +1,9 @@
 {
+  imports = [
+    ../languages
+    ../tools
+  ];
+
   programs.home-manager.enable = true;
 
   home.stateVersion = "24.11";

modules/home/full/default.nix

@@ -1,7 +0,0 @@
-{
-  imports = [
-    ../.
-    ../../languages
-    ../../tools
-  ];
-}

modules/home/medium/default.nix

@@ -1,13 +0,0 @@
-{
-  imports = [
-    ../.
-    ../../languages/c
-    ../../languages/clojure
-    ../../languages/nix
-    ../../languages/python
-    ../../tools/editor
-    ../../tools/git
-    ../../tools/shell
-    ../../tools/utils
-  ];
-}

modules/home/minimal/default.nix

@@ -1,8 +0,0 @@
-{
-  imports = [
-    ../.
-    ../../tools/editor
-    ../../tools/git
-    ../../tools/shell
-  ];
-}

modules/nixos/default.nix

@@ -15,6 +15,10 @@
     useGlobalPkgs = true;
     useUserPackages = true;
     extraSpecialArgs = { inherit nanostatus emacs-larstvei zen-browser; };
+    users.larstvei.imports = [
+      ../home
+      ../desktop
+    ];
   };
 
   users.users.larstvei = {