diff --git a/flake.lock b/flake.lock
index 03296ae..5c74d4f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -161,16 +161,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1695108154,
-        "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
+        "lastModified": 1702676849,
+        "narHash": "sha256-XqcREaTS38/QOsN8fk8PP325/UXHyF9enbP5ZPw5aiA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "07682fff75d41f18327a871088d20af2710d4744",
+        "rev": "aa99c2f4e9847cbb7e46fac0844ea1eb164b3b3a",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.05",
+        "ref": "release-23.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -307,16 +307,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1701615100,
-        "narHash": "sha256-7VI84NGBvlCTduw2aHLVB62NvCiZUlALLqBe5v684Aw=",
+        "lastModified": 1702346276,
+        "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e9f06adb793d1cca5384907b3b8a4071d5d7cb19",
+        "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.05",
+        "ref": "nixos-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index c6b6a3d..9365bdf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,14 +5,14 @@
 
   inputs = {
     # Track channels with commits tested and built by hydra
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     nixpkgs-master.url = "github:nixos/nixpkgs/master";
 
     flake-compat.url = "github:edolstra/flake-compat";
     flake-compat.flake = false;
 
-    home-manager.url = "github:nix-community/home-manager/release-23.05";
+    home-manager.url = "github:nix-community/home-manager/release-23.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     flake-parts.url = "github:hercules-ci/flake-parts";
@@ -79,8 +79,8 @@
 
             deploy-rs
 
-            terraform
-            terraform-backend-git
+            # terraform
+            # terraform-backend-git
           ];
 
           shellHook = ''
diff --git a/modules/desktop-extended/default.nix b/modules/desktop-extended/default.nix
index 45b3f84..19fea7a 100644
--- a/modules/desktop-extended/default.nix
+++ b/modules/desktop-extended/default.nix
@@ -40,7 +40,7 @@ in {
   ];
 
   fonts = {
-    fonts = with pkgs; [
+    packages = with pkgs; [
       dejavu_fonts
       fira-code
       fira-code-symbols
diff --git a/modules/gaming/default.nix b/modules/gaming/default.nix
index ba654d1..d9fbe52 100644
--- a/modules/gaming/default.nix
+++ b/modules/gaming/default.nix
@@ -14,7 +14,7 @@ in {
 
   users.users."${psCfg.user.name}".packages = with pkgs; [
     playonlinux
-    godot
+    godot3
     obs-studio
     obs-studio-plugins.wlrobs
   ];
diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix
index f4bfc53..3ceb75c 100644
--- a/modules/graphical/default.nix
+++ b/modules/graphical/default.nix
@@ -73,11 +73,11 @@ in {
     services.yubikey-agent.enable = true;
 
     fonts = {
-      fonts = with pkgs; [
+      packages = with pkgs; [
         dejavu_fonts
         powerline-fonts
       ];
-      enableDefaultFonts = true;
+      enableDefaultPackages = true;
       fontconfig.enable = true;
       fontconfig.defaultFonts = {
         monospace = ["DejaVu Sans Mono for Powerline"];
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index cba27db..fd3099b 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -11,7 +11,7 @@
     "steam-run"
     "hplip"
     "cups-brother-hl3140cw"
-    "uhk-agent-2.1.2"
+    "uhk-agent"
     "uhk-udev-rules"
   ];
 
diff --git a/modules/terminal-life/bash/default.nix b/modules/terminal-life/bash/default.nix
index 17cc41e..136fd85 100644
--- a/modules/terminal-life/bash/default.nix
+++ b/modules/terminal-life/bash/default.nix
@@ -99,8 +99,8 @@ in {
     vi = "nvim";
     vim = "nvim";
     mutt = "neomutt";
-    ls = "exa";
-    la = "exa --group-directories-first -lag";
+    ls = "eza";
+    la = "eza --group-directories-first -lag";
     wget = "wget --hsts-file=$XDG_CACHE_HOME/wget-hsts";
     irssi = "irssi --config=$XDG_CONFIG_HOME/irssi/config --home=$XDG_DATA_HOME/irssi";
     drone = "DRONE_TOKEN=$(secret-tool lookup drone token) drone";
diff --git a/modules/terminal-life/default.nix b/modules/terminal-life/default.nix
index 76fa7b2..f5fafcf 100644
--- a/modules/terminal-life/default.nix
+++ b/modules/terminal-life/default.nix
@@ -26,7 +26,7 @@ in {
       asciinema
       bat
       blesh
-      exa
+      eza
       fd
       jump
       (nnn.overrideAttrs (o: {
diff --git a/overlays/default.nix b/overlays/default.nix
index 8030fe4..7f61250 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -37,7 +37,6 @@
           })
           (import ../pkgs)
           (import ./blesh.nix)
-          (import ./manix.nix)
           (import ./rnix-lsp.nix)
           (import ./neovim-plugins.nix)
           (import ./signal-desktop.nix)
diff --git a/overlays/manix.nix b/overlays/manix.nix
deleted file mode 100644
index c98724b..0000000
--- a/overlays/manix.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-final: prev: {
-  manix = prev.manix.overrideAttrs (o: rec {
-    inherit (prev.sources.manix) pname version src;
-  });
-}
diff --git a/overlays/neovim-plugins.nix b/overlays/neovim-plugins.nix
index 9bb3d73..1bb2c39 100644
--- a/overlays/neovim-plugins.nix
+++ b/overlays/neovim-plugins.nix
@@ -2,22 +2,22 @@ final: prev: {
   vimPlugins =
     prev.vimPlugins
     // {
-      instant-nvim-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
+      instant-nvim-nvfetcher = prev.vimUtils.buildVimPlugin {
         inherit (prev.sources.instant-nvim-nvfetcher) pname version src;
       };
-      vimagit-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
+      vimagit-nvfetcher = prev.vimUtils.buildVimPlugin {
         inherit (prev.sources.vimagit-nvfetcher) pname version src;
       };
-      vim-caddyfile-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
+      vim-caddyfile-nvfetcher = prev.vimUtils.buildVimPlugin {
         inherit (prev.sources.vim-caddyfile-nvfetcher) pname version src;
       };
-      vim-workspace-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
+      vim-workspace-nvfetcher = prev.vimUtils.buildVimPlugin {
         inherit (prev.sources.vim-workspace-nvfetcher) pname version src;
       };
-      vim-beautify-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
+      vim-beautify-nvfetcher = prev.vimUtils.buildVimPlugin {
         inherit (prev.sources.vim-beautify-nvfetcher) pname version src;
       };
-      vim-apprentice-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
+      vim-apprentice-nvfetcher = prev.vimUtils.buildVimPlugin {
         inherit (prev.sources.vim-apprentice-nvfetcher) pname version src;
       };
     };
diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix
index eaf5b46..007aae7 100644
--- a/pkgs/_sources/generated.nix
+++ b/pkgs/_sources/generated.nix
@@ -3,17 +3,17 @@
 {
   blesh-nvfetcher = {
     pname = "blesh-nvfetcher";
-    version = "4089c4e1cb411121472180189953664b978d8972";
+    version = "d1a1d538e15adb04cc30e421f3ac094589c0a2f5";
     src = fetchFromGitHub {
       owner = "akinomyoga";
       repo = "ble.sh";
-      rev = "4089c4e1cb411121472180189953664b978d8972";
+      rev = "d1a1d538e15adb04cc30e421f3ac094589c0a2f5";
       fetchSubmodules = true;
       deepClone = false;
       leaveDotGit = true;
-      sha256 = "sha256-ZLkiBm3vsRe42crLffM9Z8F5yzKvNRV2/AqK9RkuU+8=";
+      sha256 = "sha256-Pvnk/JnewbczdrUHpvDgJaIjVm/8FcDpUGfRGfnBDIE=";
     };
-    date = "2023-07-18";
+    date = "2023-12-13";
   };
   instant-nvim-nvfetcher = {
     pname = "instant-nvim-nvfetcher";
@@ -27,18 +27,6 @@
     };
     date = "2022-06-25";
   };
-  manix = {
-    pname = "manix";
-    version = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4";
-    src = fetchFromGitHub {
-      owner = "mlvzk";
-      repo = "manix";
-      rev = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4";
-      fetchSubmodules = false;
-      sha256 = "sha256-GqPuYscLhkR5E2HnSFV4R48hCWvtM3C++3zlJhiK/aw=";
-    };
-    date = "2021-04-20";
-  };
   rnix-lsp-nvfetcher = {
     pname = "rnix-lsp-nvfetcher";
     version = "95d40673fe43642e2e1144341e86d0036abd95d9";
diff --git a/pkgs/sources.toml b/pkgs/sources.toml
index 929cecb..c5460fd 100644
--- a/pkgs/sources.toml
+++ b/pkgs/sources.toml
@@ -1,8 +1,4 @@
 # nvfetcher.toml
-[manix]
-src.git = "https://github.com/mlvzk/manix"
-fetch.github = "mlvzk/manix"
-
 [rnix-lsp-nvfetcher]
 src.git = "https://github.com/nix-community/rnix-lsp"
 fetch.github = "nix-community/rnix-lsp"