diff --git a/config/foot/catppuccin-macchiato.ini b/config/foot/catppuccin-macchiato.ini
deleted file mode 100644
index 3dd9312..0000000
--- a/config/foot/catppuccin-macchiato.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[cursor]
-color=181926 f4dbd6
-
-[colors]
-foreground=cad3f5
-background=24273a
-
-regular0=494d64
-regular1=ed8796
-regular2=a6da95
-regular3=eed49f
-regular4=8aadf4
-regular5=f5bde6
-regular6=8bd5ca
-regular7=b8c0e0
-
-bright0=5b6078
-bright1=ed8796
-bright2=a6da95
-bright3=eed49f
-bright4=8aadf4
-bright5=f5bde6
-bright6=8bd5ca
-bright7=a5adcb
-
-16=f5a97f
-17=f4dbd6
-18=c6a0f6
-
-selection-foreground=cad3f5
-selection-background=454a5f
-
-search-box-no-match=181926 ed8796
-search-box-match=cad3f5 363a4f
-
-jump-labels=181926 f5a97f
-urls=8aadf4
diff --git a/config/foot/foot.ini b/config/foot/foot.ini
index 3190d53..6eca261 100644
--- a/config/foot/foot.ini
+++ b/config/foot/foot.ini
@@ -1,12 +1,14 @@
 # -*- conf -*-
 
-[main]
-include=~/.config/foot/catppuccin-macchiato.ini
-
 font=monospace:size=10
 
 [colors]
-alpha = .65
+ alpha = .65
+ foreground=dcdccc
+ background=393052
+
+[cursor]
+ color=111111 dcdccc
 
 [key-bindings]
  spawn-terminal=Control+Shift+n
diff --git a/config/nvim/lua/keymap.lua b/config/nvim/lua/keymap.lua
index bea7ae5..6336d20 100644
--- a/config/nvim/lua/keymap.lua
+++ b/config/nvim/lua/keymap.lua
@@ -33,7 +33,6 @@ map("n", "<leader>>", "<cmd>BufferLineMoveNext<CR>", { desc = "Move buffer right
 
 -- ToggleTerm Bindings
 map("n", "<leader>a", "<cmd>ToggleTerm name=main<CR>", { desc = "Floating Terminal", silent = true })
-map("n", "<leader>g", "<cmd>lua _lazygit_toggle()<CR>", {noremap = true, silent = true})
 
 -- Undotree
 map("n", "<leader>fu", "<cmd>Telescope undo<cr>")
diff --git a/config/nvim/nvim.lua b/config/nvim/nvim.lua
index 348b6b4..6ad3449 100644
--- a/config/nvim/nvim.lua
+++ b/config/nvim/nvim.lua
@@ -168,10 +168,3 @@ require("spaceman").setup({
   }
 })
 
--- Lazygit Panel
-local Terminal  = require('toggleterm.terminal').Terminal
-local lazygit = Terminal:new({ cmd = "lazygit", hidden = true })
-
-function _lazygit_toggle()
-  lazygit:toggle()
-end
diff --git a/flake.nix b/flake.nix
index 5367d17..be3e0c6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,6 +15,7 @@
         specialArgs = { inherit inputs; };
         modules = [
 
+          ./packages/default.nix
           ./hosts/malachite/default.nix
           ./users/stitchynyan/default.nix
           nixpkgs-xr.nixosModules.nixpkgs-xr
@@ -34,6 +35,7 @@
         modules = [
           nixos-hardware.nixosModules.framework-12th-gen-intel
 
+          ./packages/default.nix
           ./hosts/lappy/default.nix
           ./users/stitchynyan/default.nix
 
@@ -51,6 +53,7 @@
         specialArgs = { inherit inputs; };
         modules = [
 
+          ./packages/default.nix
           ./hosts/gemini/default.nix
           ./users/nyadmin/default.nix
           ./users/cirno/default.nix
@@ -70,6 +73,7 @@
         specialArgs = { inherit inputs; };
         modules = [
 
+          ./packages/default.nix
           ./hosts/tanzanite/default.nix
           ./users/nyadmin/default.nix
 
diff --git a/hosts/default.nix b/hosts/default.nix
index 84c5923..09b7e72 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -6,7 +6,7 @@ let
 in
 {
   options = {};
-  imports = [ ../packages/default.nix ../users/default.nix ];
+  imports = [ ../packages/default.nix ];
 
   config = {
     hardware = {