machines/thinkpad/default.nix

@@ -1,3 +1,10 @@
+{
+  pkgs,
+  nanostatus,
+  emacs-larstvei,
+  zen-browser,
+  ...
+}:
 {
   imports = [
     ./keyboard
@@ -6,11 +13,48 @@
     ../../modules/nixos
   ];
 
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    extraSpecialArgs = { inherit nanostatus emacs-larstvei zen-browser; };
+    users.larstvei.imports = [
+      ../../modules/home
+      ../../modules/desktop
+    ];
+  };
+
   networking.hostName = "larstvei-think";
 
+  users.users.larstvei = {
+    isNormalUser = true;
+    description = "Lars Tveito";
+    home = "/home/larstvei";
+    shell = pkgs.fish;
+    extraGroups = [
+      "networkmanager"
+      "wheel"
+    ];
+  };
+
+  console.keyMap = "us";
+
+  services.greetd = {
+    enable = true;
+    settings.default_session = {
+      command = "hyprland";
+      user = "larstvei";
+    };
+  };
+
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  system.stateVersion = "25.05";
+  # 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.05"; # Did you read the comment?
 }

modules/base/default.nix

@@ -9,8 +9,6 @@
     package = pkgs.nix;
 
     settings = {
-      auto-optimise-store = true;
-
       experimental-features = [
         "nix-command"
         "flakes"

modules/home/default.nix

@@ -6,5 +6,13 @@
 
   programs.home-manager.enable = true;
 
+  # This value determines the Home Manager release that your
+  # configuration is compatible with. This helps avoid breakage
+  # when a new Home Manager release introduces backwards
+  # incompatible changes.
+  #
+  # You can update Home Manager without changing this value. See
+  # the Home Manager release notes for a list of state version
+  # changes in each release.
   home.stateVersion = "24.11";
 }

modules/nixos/default.nix

@@ -1,47 +1,10 @@
-{
+{ pkgs, ... }:
-  pkgs,
-  nanostatus,
-  emacs-larstvei,
-  zen-browser,
-  ...
-}:
 {
 
   imports = [
     ../fonts
   ];
 
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    extraSpecialArgs = { inherit nanostatus emacs-larstvei zen-browser; };
-    users.larstvei.imports = [
-      ../home
-      ../desktop
-    ];
-  };
-
-  users.users.larstvei = {
-    isNormalUser = true;
-    description = "Lars Tveito";
-    home = "/home/larstvei";
-    shell = pkgs.fish;
-    extraGroups = [
-      "networkmanager"
-      "wheel"
-    ];
-  };
-
-  console.keyMap = "us";
-
-  services.greetd = {
-    enable = true;
-    settings.default_session = {
-      command = "hyprland";
-      user = "larstvei";
-    };
-  };
-
   fonts = {
     fontconfig = {
       enable = true;