From f9aa94d93e817e68316d442acb780b9c09d235c1 Mon Sep 17 00:00:00 2001
From: Michael Thomas <michaelhthomas@outlook.com>
Date: Fri, 22 Dec 2023 10:16:28 -0500
Subject: [PATCH 1/3] fix(kitchen): update configuration for latest nixos

---
 flake.nix                          | 5 +++++
 machines/kitchen/configuration.nix | 5 -----
 user/modules/gnome.nix             | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index a247418..659c618 100644
--- a/flake.nix
+++ b/flake.nix
@@ -87,6 +87,11 @@
           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
         ];
diff --git a/machines/kitchen/configuration.nix b/machines/kitchen/configuration.nix
index e11e616..19b7d29 100644
--- a/machines/kitchen/configuration.nix
+++ b/machines/kitchen/configuration.nix
@@ -30,11 +30,6 @@
     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;
diff --git a/user/modules/gnome.nix b/user/modules/gnome.nix
index 5b1a01d..d2dff73 100644
--- a/user/modules/gnome.nix
+++ b/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

From eed01fe24d509ccedb6c392c8d776f3c36528c76 Mon Sep 17 00:00:00 2001
From: Michael Thomas <michaelhthomas@outlook.com>
Date: Fri, 22 Dec 2023 10:16:45 -0500
Subject: [PATCH 2/3] fix(fonts): use updated option name

---
 modules/fonts.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/fonts.nix b/modules/fonts.nix
index 8968609..e9c1cf0 100644
--- a/modules/fonts.nix
+++ b/modules/fonts.nix
@@ -1,7 +1,7 @@
 {pkgs, ...}: {
   # Font Settings
   fonts = {
-    fonts = with pkgs; [
+    packages = with pkgs; [
       roboto
       inter
     ];

From bd81bbac9cd36f3a0ebb0d643fe796066fd415f1 Mon Sep 17 00:00:00 2001
From: Michael Thomas <michaelhthomas@outlook.com>
Date: Fri, 22 Dec 2023 10:17:02 -0500
Subject: [PATCH 3/3] feat(nixos): add nvim module

---
 user/environments/nixos/home.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user/environments/nixos/home.nix b/user/environments/nixos/home.nix
index 5e141e9..80caea4 100644
--- a/user/environments/nixos/home.nix
+++ b/user/environments/nixos/home.nix
@@ -6,6 +6,7 @@
     ../../modules/git.nix
     ../../modules/git_nixos.nix
     ../../modules/gnome.nix
+    ../../modules/nvim.nix
     ../../modules/vscode.nix
     ../../modules/zsh.nix
   ];