diff --git a/dotfiles/neovim/lua/my/paq.lua b/dotfiles/neovim/lua/my/paq.lua
index 2bba4c7..b0479e5 100644
--- a/dotfiles/neovim/lua/my/paq.lua
+++ b/dotfiles/neovim/lua/my/paq.lua
@@ -44,7 +44,11 @@ function M.setup()
     "easymotion/vim-easymotion", -- removes the need for spamming w or e
     "tpope/vim-surround", -- work with brackets, quotes, tags, etc
     "MunifTanjim/nui.nvim", -- ui stuff required by idris2
-    "ShinKage/idris2-nvim" -- idris2 support
+    "ShinKage/idris2-nvim", -- idris2 support
+    "udalov/kotlin-vim", -- kotlin support
+    -- Git stuff
+    "ruifm/gitlinker.nvim", -- generate permalinks for code
+    "TimUntersberger/neogit" -- magit clone
   }
 
   for _, v in ipairs(themePackages) do
diff --git a/dotfiles/neovim/lua/my/plugins/init.lua b/dotfiles/neovim/lua/my/plugins/init.lua
index c073242..d47a1a8 100644
--- a/dotfiles/neovim/lua/my/plugins/init.lua
+++ b/dotfiles/neovim/lua/my/plugins/init.lua
@@ -3,7 +3,10 @@ local M = {}
 
 function M.setup()
   require('nvim-autopairs').setup()
-  --
+  require "gitlinker".setup()
+  require('neogit').setup()
+
+
   vscode.unless(function()
     require("presence"):setup({})
     require("my.plugins.dashboard").setup()
@@ -14,13 +17,14 @@ function M.setup()
     require("my.plugins.nvim-tree").setup()
     require("my.plugins.vimtex").setup()
     require("my.plugins.lean").setup()
+    require("my.plugins.lualine").setup()
+    require("my.plugins.vimux").setup()
   end)
 
+
   require("my.plugins.vim-tmux-navigator").setup()
-  require("my.plugins.lualine").setup()
   require("my.plugins.comment").setup()
   require("my.plugins.telescope").setup()
-  require("my.plugins.vimux").setup()
 
   -- require("my.plugins.idris").setup()
   -- require("which-key").setup()
diff --git a/dotfiles/neovim/lua/my/plugins/lualine.lua b/dotfiles/neovim/lua/my/plugins/lualine.lua
index 2a4c140..0740bd4 100644
--- a/dotfiles/neovim/lua/my/plugins/lualine.lua
+++ b/dotfiles/neovim/lua/my/plugins/lualine.lua
@@ -1,24 +1,24 @@
 local M = {}
 
 function M.setup()
-    require('lualine').setup({
-        theme = vim.g.lualineTheme,
-        options = {
-            section_separators = {left = '', right = ''},
-            component_separators = {left = '', right = ''}
-        },
-        sections = {
-            lualine_a = {'mode'},
-            lualine_b = {'branch', 'diff', 'diagnostics'},
-            lualine_c = {'filename'},
-            lualine_x = {},
-            -- lualine_y = {'encoding', 'fileformat', 'filetype'},
-            lualine_y = {'filetype'},
-            lualine_z = {'location'}
-        },
-        -- Integration with other plugins
-        extensions = {"nvim-tree"}
-    })
+  require('lualine').setup({
+    theme = vim.g.lualineTheme,
+    options = {
+      section_separators = { left = '', right = '' },
+      component_separators = { left = '', right = '' }
+    },
+    sections = {
+      lualine_a = { 'mode' },
+      lualine_b = { 'branch', 'diff', 'diagnostics' },
+      lualine_c = { 'filename' },
+      lualine_x = {},
+      -- lualine_y = {'encoding', 'fileformat', 'filetype'},
+      lualine_y = { 'filetype' },
+      lualine_z = { 'location' }
+    },
+    -- Integration with other plugins
+    extensions = { "nvim-tree" }
+  })
 end
 
 return M
diff --git a/dotfiles/neovim/lua/my/plugins/treesitter.lua b/dotfiles/neovim/lua/my/plugins/treesitter.lua
index 348a7c1..6515f46 100644
--- a/dotfiles/neovim/lua/my/plugins/treesitter.lua
+++ b/dotfiles/neovim/lua/my/plugins/treesitter.lua
@@ -5,13 +5,15 @@ function M.setup()
     ensure_installed = {
       "bash", "javascript", "typescript", "c", "cpp", "css", "dockerfile",
       "elixir", "fish", "html", "json", "latex", "python", "rust", "scss",
-      "toml", "tsx", "vim", "yaml", "nix"
+      "toml", "tsx", "vim", "yaml", "nix", "kotlin"
     },
     sync_install = false,
     indent = { enable = true },
     highlight = {
       enable = true,
 
+      disable = { "kotlin" },
+
       -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
       -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
       -- Using this option may slow down your editor, and you may see some duplicate highlights.
diff --git a/modules/applications/neovim.nix b/modules/applications/neovim.nix
index ed3415b..8dbceab 100644
--- a/modules/applications/neovim.nix
+++ b/modules/applications/neovim.nix
@@ -3,8 +3,8 @@ let
   paq = pkgs.fetchFromGitHub {
     owner = "savq";
     repo = "paq-nvim";
-    rev = "cbbb8a550e35b1e6c9ddf7b098b25e6c2d8b1e86";
-    sha256 = "0fsbww2kqwayi1azhglsjal6mwh68n03ylxxqzq17v7sar17vx4c";
+    rev = "bc5950b990729464f2493b1eaab5a7721bd40bf5";
+    sha256 = "0rsv3j5rxfv7ys9zvq775f63vy6w880b0xhyr164y8fcadhpypb3";
   };
 
   theme = pkgs.myThemes.current;
diff --git a/modules/dev/kotlin.nix b/modules/dev/kotlin.nix
index f001a3b..14e293e 100644
--- a/modules/dev/kotlin.nix
+++ b/modules/dev/kotlin.nix
@@ -3,6 +3,8 @@
     home.packages = with pkgs; [
       kotlin
       gradle
+      jdk
+      android-studio
     ];
   };
 }
diff --git a/modules/overlays/flakes.nix b/modules/overlays/flakes.nix
index 1e463c1..b2b7742 100644
--- a/modules/overlays/flakes.nix
+++ b/modules/overlays/flakes.nix
@@ -52,6 +52,7 @@ in
   };
 
 
+
   # Vim plugins
   myVimPlugins = {
     githubNvimTheme = foreign.githubNvimTheme;
diff --git a/modules/themes/themes.nix b/modules/themes/themes.nix
index 8983d47..6190af0 100644
--- a/modules/themes/themes.nix
+++ b/modules/themes/themes.nix
@@ -7,8 +7,8 @@ lib.lists.map (theme: pkgs.callPackage theme { }) [
   (catppuccin {
     # wallpaper = "os/nix-magenta-pink-1920x1080.png";
     # wallpaper = "minimalistic/tetris.png";
-    # wallpaper = "os/nix-black-4k.png";
-    wallpaper = "misc/comfy-home.png";
+    wallpaper = "os/nix-black-4k.png";
+    # wallpaper = "misc/comfy-home.png";
     # wallpaper = "landscapes/forrest.png";
     # wallpaper = "landscapes/salty_mountains.png";
     # wallpaper = "misc/rainbow.png";
diff --git a/modules/xserver.nix b/modules/xserver.nix
index b99bb13..8229c2d 100644
--- a/modules/xserver.nix
+++ b/modules/xserver.nix
@@ -56,6 +56,7 @@ in
         accelSpeed = "3.5";
 
         tappingDragLock = false;
+        disableWhileTyping = true;
       };
     };
   };