diff --git a/flake.nix b/flake.nix
index c3bd795..a7f2938 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,10 +1,6 @@
 {
   description = "My NixOS config flake";
-  outputs = inputs @ {
-    self,
-    nixpkgs,
-    ...
-  }: {
+  outputs = inputs @ {nixpkgs, ...}: {
     inherit (nixpkgs) lib;
     nixosConfigurations = import ./hosts {inherit inputs;};
   };
diff --git a/hosts/vali/hermit/configuration.nix b/hosts/vali/hermit/configuration.nix
index 991ff21..7cf1e38 100644
--- a/hosts/vali/hermit/configuration.nix
+++ b/hosts/vali/hermit/configuration.nix
@@ -36,10 +36,7 @@
       };
     };
   };
-  # boot.kernelModules = [ "v4l2loopback" ];
   boot.kernelPackages = pkgs.linuxPackages_xanmod_stable;
-  # boot.extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ];
-  #  services.picom.enable = true;
   modules = {
     other = {
       system = {
diff --git a/modules/editors/nvf/mappings/normal.nix b/modules/editors/nvf/mappings/normal.nix
index bb78e93..8f17df7 100644
--- a/modules/editors/nvf/mappings/normal.nix
+++ b/modules/editors/nvf/mappings/normal.nix
@@ -4,10 +4,11 @@
       # General
       "<leader>fd".action = ":lua vim.g.formatsave = not vim.g.formatsave<CR>";
       "<leader>zt".action = ":<C-U>let g:default_terminal = v:count1<CR>";
-      "<leader>e".action = ":NvimTreeToggle<CR>";
+      "<leader>e".action = ":<leader>tf";
       "<leader>ld".action = ":lua vim.diagnostic.setqflist({open = true})<CR>";
       "<leader>lf".action = ":lua vim.lsp.buf.format()<CR>";
       "<leader>li".action = ":lua vim.lsp.buf.implementation()<CR>";
+      "<leader>;".action = "A;<esc>"; # Append #
 
       # Diffview
       "<leader>gdq".action = ":DiffviewClose<CR>";
@@ -27,6 +28,11 @@
       "<leader>gD".action = "<cmd>Gitsigns diffthis HEAD<CR>";
       "<leader>gw".action = "<cmd>Gitsigns toggle_word_diff<CR>";
 
+      # Movement
+      "<C-h>".action = "<C-W>h";
+      "<C-j>".action = "<C-W>j";
+      "<C-k>".action = "<C-W>k";
+      "<C-l>".action = "<C-W>l";
       # Telescope
       "<M-f>".action = ":Telescope resume<CR>";
       "<leader>fq".action = ":Telescope quickfix<CR>";
diff --git a/modules/editors/nvf/plugins/settings/assistant.nix b/modules/editors/nvf/plugins/settings/assistant.nix
index bfe0a05..8b7fca6 100644
--- a/modules/editors/nvf/plugins/settings/assistant.nix
+++ b/modules/editors/nvf/plugins/settings/assistant.nix
@@ -1,6 +1,4 @@
-{config, ...}: let
-  inherit (config.modules.other.system) username;
-in {
+_:{
   programs.neovim-flake.settings.vim = {
     assistant.copilot = {
       enable = true;
diff --git a/modules/editors/nvf/plugins/settings/autocomplete.nix b/modules/editors/nvf/plugins/settings/autocomplete.nix
index f6a6fbb..9bb0f6f 100644
--- a/modules/editors/nvf/plugins/settings/autocomplete.nix
+++ b/modules/editors/nvf/plugins/settings/autocomplete.nix
@@ -1,6 +1,4 @@
-{config, ...}: let
-  inherit (config.modules.other.system) username;
-in {
+_:{
   programs.neovim-flake.settings.vim = {
     autocomplete = {
       enable = true;
@@ -12,6 +10,7 @@ in {
         previous = "<C-p>";
         scrollDocsDown = "<C-j>";
         scrollDocsUp = "<C-k>";
+      
       };
     };
   };
diff --git a/modules/editors/nvf/plugins/settings/binds.nix b/modules/editors/nvf/plugins/settings/binds.nix
index e09effb..631abb6 100644
--- a/modules/editors/nvf/plugins/settings/binds.nix
+++ b/modules/editors/nvf/plugins/settings/binds.nix
@@ -1,10 +1,8 @@
-{config, ...}: let
-  inherit (config.modules.other.system) username;
-in {
+_:{
   programs.neovim-flake.settings.vim = {
     binds = {
       whichKey.enable = true;
-      cheatsheet.enable = false;
+      cheatsheet.enable = true;
     };
   };
 }
diff --git a/modules/editors/nvf/plugins/settings/filetree.nix b/modules/editors/nvf/plugins/settings/filetree.nix
index a98dced..b66dfa5 100644
--- a/modules/editors/nvf/plugins/settings/filetree.nix
+++ b/modules/editors/nvf/plugins/settings/filetree.nix
@@ -8,7 +8,7 @@ in {
         openOnSetup = true;
 
         mappings = {
-          toggle = "<C-w>";
+          #toggle = "<C-w>";
         };
 
         setupOpts = {
diff --git a/modules/editors/nvf/plugins/settings/git.nix b/modules/editors/nvf/plugins/settings/git.nix
index 361b92f..3fb84d4 100644
--- a/modules/editors/nvf/plugins/settings/git.nix
+++ b/modules/editors/nvf/plugins/settings/git.nix
@@ -1,6 +1,4 @@
-{config, ...}: let
-  inherit (config.modules.other.system) username;
-in {
+_:{
   programs.neovim-flake.settings.vim = {
     git = {
       enable = true;
diff --git a/modules/editors/nvf/plugins/settings/languages.nix b/modules/editors/nvf/plugins/settings/languages.nix
index 5358045..776934e 100644
--- a/modules/editors/nvf/plugins/settings/languages.nix
+++ b/modules/editors/nvf/plugins/settings/languages.nix
@@ -1,11 +1,4 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
-  inherit (config.modules.other.system) username;
-in {
+_:{
   programs.neovim-flake.settings.vim = {
     languages = {
       enableLSP = true;
@@ -14,7 +7,6 @@ in {
       enableExtraDiagnostics = true;
 
       markdown.enable = true;
-      nix.enable = true;
       html.enable = true;
       css.enable = true;
       tailwind.enable = true;
@@ -33,6 +25,10 @@ in {
         lsp.neodev.enable = true;
       };
 
+      nix = {
+        enable = true;
+        lsp.enable = true;
+      };
       rust = {
         enable = true;
         crates.enable = true;
diff --git a/modules/editors/nvf/plugins/settings/lsp.nix b/modules/editors/nvf/plugins/settings/lsp.nix
index b600161..cfd45b1 100644
--- a/modules/editors/nvf/plugins/settings/lsp.nix
+++ b/modules/editors/nvf/plugins/settings/lsp.nix
@@ -1,6 +1,4 @@
-{config, ...}: let
-  inherit (config.modules.other.system) username;
-in {
+_:{
   programs.neovim-flake.settings.vim = {
     lsp = {
       formatOnSave = true;
diff --git a/modules/editors/nvf/plugins/settings/telescope.nix b/modules/editors/nvf/plugins/settings/telescope.nix
index ac0321f..e763638 100644
--- a/modules/editors/nvf/plugins/settings/telescope.nix
+++ b/modules/editors/nvf/plugins/settings/telescope.nix
@@ -1,6 +1,4 @@
-{config, ...}: let
-  inherit (config.modules.other.system) username;
-in {
+_: {
   programs.neovim-flake.settings.vim = {
     telescope.enable = true;
   };
diff --git a/modules/editors/nvf/plugins/settings/terminal.nix b/modules/editors/nvf/plugins/settings/terminal.nix
index ae15699..17f6bec 100644
--- a/modules/editors/nvf/plugins/settings/terminal.nix
+++ b/modules/editors/nvf/plugins/settings/terminal.nix
@@ -1,6 +1,4 @@
-{config, ...}: let
-  inherit (config.modules.other.system) username;
-in {
+_:{
   programs.neovim-flake.settings.vim = {
     terminal = {
       toggleterm = {
@@ -12,6 +10,7 @@ in {
           lazygit = {
             enable = true;
             direction = "tab";
+            mappings.open = "<leader>gg";
           };
         };
       };