diff --git a/flake.lock b/flake.lock
index 628b39d..4bab839 100644
--- a/flake.lock
+++ b/flake.lock
@@ -19,11 +19,11 @@
     "flake-compat_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
         "type": "github"
       },
       "original": {
@@ -183,11 +183,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742649964,
-        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
+        "lastModified": 1747372754,
+        "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
+        "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
         "type": "github"
       },
       "original": {
@@ -249,11 +249,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744693102,
-        "narHash": "sha256-1Z4WPGVky4w3lrhrgs89OKsLzPdtkbi1bPLNFWsoLfY=",
+        "lastModified": 1747284884,
+        "narHash": "sha256-lTSKhRrassMcJ1ZsuUVunyl/F04vvCKY80HB/4rvvm4=",
         "owner": "hercules-ci",
         "repo": "hercules-ci-effects",
-        "rev": "5b6cec51c9ec095a0d3fd4c8eeb53eb5c59ae33e",
+        "rev": "7168f6002a6b48a9b6151e1e97e974a0722ecfdc",
         "type": "github"
       },
       "original": {
@@ -281,11 +281,11 @@
     "mini-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1746264830,
-        "narHash": "sha256-A3FIyfy/3VUBMPfWd6PLaqAhOAOA5ava0nc4Z9JCKCI=",
+        "lastModified": 1747734615,
+        "narHash": "sha256-Nym+lyfEkAdnEmUT6s8ejd+hTIMvC6tMUzJyZLmp6cg=",
         "owner": "echasnovski",
         "repo": "mini.nvim",
-        "rev": "ee23e1abc206efc6d6cce19ec8c0a3da7a897035",
+        "rev": "94cae4660a8b2d95dbbd56e1fbc6fcfa2716d152",
         "type": "github"
       },
       "original": {
@@ -305,11 +305,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1746256223,
-        "narHash": "sha256-a97mwMJcE0cYGfwB5N5v+Ey+by1poGTc/fsrd47Fom8=",
+        "lastModified": 1747786187,
+        "narHash": "sha256-9SSsln1nd3SnECH7I466UzLZ2luJS1phTOYG0ehRAxQ=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "02ec02529a5d602a9e9d273531d776d160fae182",
+        "rev": "1709adcc65a1779b6513db3470dad257de7c24ae",
         "type": "github"
       },
       "original": {
@@ -321,11 +321,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1746214751,
-        "narHash": "sha256-FlGgG3A9oJwGP0YTWU2Nw9fwdnqPMapjx3twonu0Vkg=",
+        "lastModified": 1747760768,
+        "narHash": "sha256-5oDiP8Yn93692CUEH81LJbZxPIprIozLHdkFt5N9Np4=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "5a2edc483dff93cc94847b6950713d80a51087c0",
+        "rev": "cd9d8469b22cedeb5ccad3def6e3cfee2877577f",
         "type": "github"
       },
       "original": {
@@ -336,11 +336,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1746152631,
-        "narHash": "sha256-zBuvmL6+CUsk2J8GINpyy8Hs1Zp4PP6iBWSmZ4SCQ/s=",
+        "lastModified": 1747728033,
+        "narHash": "sha256-NnXFQu7g4LnvPIPfJmBuZF7LFy/fey2g2+LCzjQhTUk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "032bc6539bd5f14e9d0c51bd79cfe9a055b094c3",
+        "rev": "2f9173bde1d3fbf1ad26ff6d52f952f9e9da52ea",
         "type": "github"
       },
       "original": {
@@ -380,11 +380,11 @@
     },
     "nixpkgs-uns": {
       "locked": {
-        "lastModified": 1746232882,
-        "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=",
+        "lastModified": 1747744144,
+        "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008",
+        "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f",
         "type": "github"
       },
       "original": {
@@ -396,11 +396,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1746314326,
-        "narHash": "sha256-2xqKEdmbFttKUwIxZgQAOG24rNqVvJ7c3LmA+ZnvWlc=",
+        "lastModified": 1747894227,
+        "narHash": "sha256-iMzxxhwF4ZqRDrMl7/kKPCiO0uWpnGywJ+oMPEvnP/Y=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0eb56ece14bc2e4301f756c342356ceceb90b6f9",
+        "rev": "ebcc1d6f281ceef7854bea032b65a5609ee45fad",
         "type": "github"
       },
       "original": {
@@ -410,22 +410,6 @@
         "type": "github"
       }
     },
-    "nvim-orgmode": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1747057841,
-        "narHash": "sha256-mLT3XnsRyG+ZldB9NrR9tjmaznRAISBsdVTVPSjhj0A=",
-        "owner": "nvim-orgmode",
-        "repo": "orgmode",
-        "rev": "8ff03c75f3d808e3ea1765b7aba0fb4783a5a83f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-orgmode",
-        "repo": "orgmode",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -433,8 +417,7 @@
         "mini-nvim": "mini-nvim",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
         "nixpkgs": "nixpkgs_2",
-        "nixpkgs-uns": "nixpkgs-uns",
-        "nvim-orgmode": "nvim-orgmode"
+        "nixpkgs-uns": "nixpkgs-uns"
       }
     },
     "systems": {
@@ -460,11 +443,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746216483,
-        "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=",
+        "lastModified": 1747469671,
+        "narHash": "sha256-bo1ptiFoNqm6m1B2iAhJmWCBmqveLVvxom6xKmtuzjg=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd",
+        "rev": "ab0378b61b0d85e73a8ab05d5c6029b5bd58c9fb",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index dd710c9..ea7e593 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,10 +14,6 @@
       url = "github:echasnovski/mini.nvim";
       flake = false;
     };
-    nvim-orgmode = {
-      url = "github:nvim-orgmode/orgmode";
-      flake = false;
-    };
     # Add bleeding-edge plugins here.
     # They can be updated with `nix flake update` (make sure to commit the generated flake.lock)
     # wf-nvim = {
@@ -57,6 +53,7 @@
           stylua
           luajitPackages.luacheck
           nvim-dev
+          alejandra
         ];
         shellHook = ''
           # symlink the .luarc.json generated in the overlay
diff --git a/nix/neovim-overlay.nix b/nix/neovim-overlay.nix
index 725f569..70217b8 100644
--- a/nix/neovim-overlay.nix
+++ b/nix/neovim-overlay.nix
@@ -9,10 +9,9 @@ with final.pkgs.lib; let
       inherit pname src;
       version = src.lastModifiedDate;
     };
-  mkNeovim = pkgs.callPackage ./mkNeovim.nix { inherit pkgs-wrapNeovim; };
+  mkNeovim = pkgs.callPackage ./mkNeovim.nix {inherit pkgs-wrapNeovim;};
 
   mini-nvim-git = mkNvimPlugin inputs.mini-nvim "mini.nvim";
-  nvim-orgmode = mkNvimPlugin inputs.nvim-orgmode "orgmode";
 
   all-plugins = with pkgs.vimPlugins; [
     blink-cmp
@@ -30,23 +29,9 @@ with final.pkgs.lib; let
     nightfox-nvim
     nvim-lint
     nvim-lspconfig
-    nvim-orgmode
     nvim-treesitter-context
     nvim-treesitter-textobjects
-    (nvim-treesitter.withPlugins (_:
-      nvim-treesitter.allGrammars ++
-      [(pkgs.tree-sitter.buildGrammar {
-        language = "org";
-        version = "2.0.1";
-        src = pkgs.fetchFromGitHub {
-          owner = "nvim-orgmode";
-          repo = "tree-sitter-org";
-          rev = "2.0.1";
-          hash = "sha256-k1g5+iyJvVWKOuAkFNaaKl42Xmmz9BN+vT0+IQ/4RQI=";
-        };
-        meta.homepage = "https://github.com/nvim-orgmode/tree-sitter-org";
-      })]
-    ))
+    nvim-treesitter.withAllGrammars
     oil-nvim
     refactoring-nvim
     render-markdown-nvim
diff --git a/nvim/lua/config/init.lua b/nvim/lua/config/init.lua
index e615f4e..e2e11a9 100644
--- a/nvim/lua/config/init.lua
+++ b/nvim/lua/config/init.lua
@@ -2,6 +2,7 @@ vim.opt.autowrite = true
 vim.opt.backspace = 'indent,eol,start'
 vim.opt.confirm = true
 vim.opt.completeopt = { 'menu', 'menuone', 'noselect' }
+vim.opt.cmdheight = 0
 vim.opt.diffopt = 'internal,filler,closeoff,inline:char'
 vim.opt.expandtab = true          -- insert tabs as spaces
 vim.opt.inccommand = 'split'      -- incremental live completion
@@ -61,6 +62,7 @@ vim.keymap.set('n', '<S-l>', vim.cmd.bnext, { noremap = true, silent = true })
 vim.keymap.set('n', '<S-h>', vim.cmd.bprev, { noremap = true, silent = true })
 vim.keymap.set('v', '<', '<gv')
 vim.keymap.set('v', '>', '>gv')
+vim.keymap.set('v', 'q:', '<Nop')
 
 -- resize splits if window got resized
 vim.api.nvim_create_autocmd({ 'VimResized' }, {
diff --git a/nvim/lua/plugins/completion.lua b/nvim/lua/plugins/completion.lua
index 57a11a8..aa21196 100644
--- a/nvim/lua/plugins/completion.lua
+++ b/nvim/lua/plugins/completion.lua
@@ -5,7 +5,6 @@ return {
     dependencies = {
       'mikavilpas/blink-ripgrep.nvim',
       'fang2hou/blink-copilot',
-      'nvim-orgmode/orgmode',
     },
     opts = {
       fuzzy = {
@@ -24,9 +23,6 @@ return {
           'ripgrep',
           'copilot',
         },
-        per_filetype = {
-          org = { 'orgmode' },
-        },
         providers = {
           snippets = {
             score_offset = -20,
@@ -51,11 +47,6 @@ return {
               },
             },
           },
-          orgmode = {
-            name = 'Orgmode',
-            module = 'orgmode.org.autocompletion.blink',
-            fallbacks = { 'buffer' },
-          },
         },
       },
       cmdline = {
diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua
index c3ab405..cc94128 100644
--- a/nvim/lua/plugins/lsp.lua
+++ b/nvim/lua/plugins/lsp.lua
@@ -176,6 +176,7 @@ return {
         puppet = { 'puppet-lint' },
         lua = { 'stylua' },
         python = { 'ruff' },
+        nix = { 'alejandra' },
         ['*'] = { 'trim_whitespace' },
       },
       format_on_save = function(bufnr)
diff --git a/nvim/lua/plugins/mini.lua b/nvim/lua/plugins/mini.lua
index 6bf864b..78cbdf1 100644
--- a/nvim/lua/plugins/mini.lua
+++ b/nvim/lua/plugins/mini.lua
@@ -89,12 +89,12 @@ return {
             local search = MiniStatusline.section_searchcount { trunc_width = 75 }
 
             return MiniStatusline.combine_groups {
-              { hl = mode_hl,                  strings = { mode } },
               '%<', -- Mark general truncate point
-              { hl = 'MiniStatuslineFilename', strings = { filename } },
+              { hl = 'MiniStatuslineFilename', strings = { '' } },
               '%=', -- End left alignment
               { hl = 'MiniStatusDevinfo', strings = { diff, diagnostics, lsp } },
-              { hl = mode_hl,             strings = { search } },
+              { hl = 'MiniStatuslineFilename', strings = { search } },
+              { hl = mode_hl, strings = { mode } },
             }
           end,
           inactive = function()
@@ -150,10 +150,10 @@ return {
             miniclue.gen_clues.registers(),
             miniclue.gen_clues.windows(),
             miniclue.gen_clues.z(),
-            { mode = 'n', keys = '<Leader>wj',     postkeys = '<Leader>w', desc = 'TS Down' },
-            { mode = 'n', keys = '<Leader>wk',     postkeys = '<Leader>w', desc = 'TS Up' },
-            { mode = 'n', keys = '<Leader>wh',     postkeys = '<Leader>w', desc = 'TS Left' },
-            { mode = 'n', keys = '<Leader>wl',     postkeys = '<Leader>w', desc = 'TS Right' },
+            { mode = 'n', keys = '<Leader>wj', postkeys = '<Leader>w', desc = 'TS Down' },
+            { mode = 'n', keys = '<Leader>wk', postkeys = '<Leader>w', desc = 'TS Up' },
+            { mode = 'n', keys = '<Leader>wh', postkeys = '<Leader>w', desc = 'TS Left' },
+            { mode = 'n', keys = '<Leader>wl', postkeys = '<Leader>w', desc = 'TS Right' },
             { mode = 'n', keys = '<Leader>w<C-J>', postkeys = '<Leader>w', desc = 'Swap TS Down' },
             { mode = 'n', keys = '<Leader>w<C-K>', postkeys = '<Leader>w', desc = 'Swap TS Up' },
             { mode = 'n', keys = '<Leader>w<C-H>', postkeys = '<Leader>w', desc = 'Swap TS Left' },
diff --git a/nvim/lua/plugins/misc.lua b/nvim/lua/plugins/misc.lua
index a8356ce..e09d7d1 100644
--- a/nvim/lua/plugins/misc.lua
+++ b/nvim/lua/plugins/misc.lua
@@ -118,6 +118,7 @@ return {
       vim.cmd('colorscheme terafox')
       vim.api.nvim_set_hl(0, 'StatusLine', { bg = 'none' })
       vim.api.nvim_set_hl(0, 'StatusLineNC', { bg = 'none' })
+      vim.api.nvim_set_hl(0, 'TablineFill', { bg = 'none' })
       vim.api.nvim_set_hl(0, 'MiniDiffSignAdd', { fg = 'green', bold = true })
       vim.api.nvim_set_hl(0, 'MiniDiffSignDelete', { fg = 'red', bold = true })
       vim.api.nvim_set_hl(0, 'MiniDiffSignChange', { fg = 'green', bold = true })
@@ -149,47 +150,4 @@ return {
     },
   },
   { 'ThePrimeagen/refactoring.nvim', event = 'VeryLazy', config = true },
-  {
-    'nvim-orgmode/orgmode',
-    event = 'VeryLazy',
-    ft = { 'org' },
-    dependencies = 'nvim-treesitter',
-    keys = {
-      {
-        '<leader>oR',
-        '<cmd>e ~/orgfiles/refile.org<CR>',
-        desc = 'open org refile',
-      },
-    },
-    config = function()
-      require('orgmode').setup {
-        org_agenda_files = '~/orgfiles/**/*',
-        org_default_notes_file = '~/orgfiles/refile.org',
-        org_todo_keywords = {
-          'TODO',
-          'IN_PROGRESS',
-          'BLOCKED',
-          '|',
-          'DONE',
-          'NOT DOING',
-        },
-        org_capture_templates = {
-          l = {
-            description = 'Work Log',
-            template = '* %?',
-            target = '~/orgfiles/worklog.org',
-          },
-        },
-      }
-      vim.api.nvim_create_autocmd('FileType', {
-        pattern = 'org',
-        callback = function()
-          vim.keymap.set({ 'n', 'i' }, '\\\\', '<cmd>lua require("orgmode").action("org_mappings.meta_return")<CR>', {
-            silent = true,
-            buffer = true,
-          })
-        end,
-      })
-    end,
-  },
 }
diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua
index c48c183..867b9c2 100644
--- a/nvim/lua/plugins/treesitter.lua
+++ b/nvim/lua/plugins/treesitter.lua
@@ -79,7 +79,7 @@ return {
           enable = true,
           keymaps = {
             init_selection = '<CR>',
-            node_incremental = '<TAB>',
+            node_incremental = 'v',
             node_decremental = '<S-TAB>',
           },
         },