config/nix/hm/common.nix

@@ -1,6 +1,5 @@
 { pkgs, config, ... }:
 {
-  home.stateVersion = "23.05";
 
   programs = {
     home-manager.enable = true;
@@ -53,8 +52,9 @@
     fzf.enable = true;
     # TODO highlight or bat
   };
-
-  home.packages = with pkgs; [
+  home = {
+    stateVersion = "23.05";
+    packages = with pkgs; [
       # dotfiles dependencies
       coreutils
       bash
@@ -132,4 +132,5 @@
       syncthing
 
     ];
+  };
 }

config/nix/hm/desktop.nix

@@ -1,6 +1,8 @@
 { pkgs, config, lib, ... }:
 {
-  xsession.windowManager.i3 = {
+  xsession = {
+    windowManager = {
+      i3 = {
         enable = true;
         config =
           let
@@ -320,7 +322,9 @@
               forEachWorkspace ({ w, workspace }: { output = builtins.elemAt x11_screens (lib.mod w (builtins.length x11_screens)); workspace = workspace.name; });
           };
       };
-  xsession.numlock.enable = true; # FIXME Only on computers with a separate one
+    };
+    numlock.enable = true; # FIXME Only on computers with a separate one
+  };
 
   programs = {
     # Browser
@@ -432,7 +436,8 @@
     autorandr.enable = true;
   };
 
-  home.packages = with pkgs; [
+  home = {
+    packages = with pkgs; [
       # remote
       tigervnc
 
@@ -482,5 +487,6 @@
       pass
       thunderbird
     ];
+  };
 
 }