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.

machines/vm/default.nix

@@ -4,11 +4,6 @@
     ../../modules/nixos
   ];
 
-  home-manager.users.larstvei.imports = [
-    ../../modules/home/minimal
-    ../../modules/desktop
-  ];
-
   networking.hostName = "larstvei-vm";
 
   # VM-friendly bits

modules/desktop/default.nix

@@ -1,12 +1,5 @@
 { pkgs, zen-browser, ... }:
 {
-  services.greetd = {
-    enable = true;
-    settings.default_session = {
-      command = "hyprland";
-      user = "larstvei";
-    };
-  };
 
   home.packages = [
     pkgs.adwaita-icon-theme

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 = {
@@ -30,6 +34,14 @@
 
   console.keyMap = "us";
 
+  services.greetd = {
+    enable = true;
+    settings.default_session = {
+      command = "hyprland";
+      user = "larstvei";
+    };
+  };
+
   fonts = {
     fontconfig = {
       enable = true;

modules/tools/academic/default.nix

@@ -1,6 +1,6 @@
 { pkgs, ... }:
 {
   home.packages = with pkgs; [
-    zotero
+    # zotero
   ];
 }