flake.nix

@@ -87,11 +87,6 @@
           home-manager.nixosModules.home-manager
           ./modules/common.nix
           ./modules/containers.nix
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.michael = import ./user/environments/nixos/home.nix;
-          }
 
           ./machines/kitchen/configuration.nix
         ];

machines/kitchen/configuration.nix

@@ -30,6 +30,11 @@
     gnome.gnome-tweaks
   ];
 
+  home-manager = {
+    users.michael = import ../../user/environments/nixos/home.nix pkgs;
+    useGlobalPkgs = true;
+  };
+
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;

modules/fonts.nix

@@ -1,7 +1,7 @@
 {pkgs, ...}: {
   # Font Settings
   fonts = {
-    packages = with pkgs; [
+    fonts = with pkgs; [
       roboto
       inter
     ];

user/environments/nixos/home.nix

@@ -6,7 +6,6 @@
     ../../modules/git.nix
     ../../modules/git_nixos.nix
     ../../modules/gnome.nix
-    ../../modules/nvim.nix
     ../../modules/vscode.nix
     ../../modules/zsh.nix
   ];

user/modules/gnome.nix

@@ -2,7 +2,7 @@
   home.packages = with pkgs; [
     gnomeExtensions.caffeine
     unstable.gnomeExtensions.paperwm
-    # gnomeExtensions.cleaner-overview
+    gnomeExtensions.cleaner-overview
     unstable.gnomeExtensions.vertical-overview
     gnomeExtensions.disable-workspace-switch-animation-for-gnome-40
     gnomeExtensions.blur-my-shell