diff --git a/flake.lock b/flake.lock
index c2c4990..ffd384d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -44,11 +44,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1737885640,
-        "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=",
+        "lastModified": 1738843498,
+        "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4e96537f163fad24ed9eb317798a79afc85b51b7",
+        "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f",
         "type": "github"
       },
       "original": {
diff --git a/home/modules/aerospace/default.nix b/home/modules/aerospace/default.nix
index 2cb40ab..74c8ad2 100644
--- a/home/modules/aerospace/default.nix
+++ b/home/modules/aerospace/default.nix
@@ -4,10 +4,12 @@
     settings = {
       accordion-padding = 25;
       gaps = {
-        outer.left = 8;
-        outer.bottom = 8;
-        outer.top = 8;
-        outer.right = 8;
+        inner.horizontal = 6;
+        inner.vertical = 6;
+        outer.left = 6;
+        outer.bottom = 6;
+        outer.top = 6;
+        outer.right = 6;
       };
       workspace-to-monitor-force-assignment = {
         "1" = "main";
diff --git a/home/modules/nvim/config/.luarc.json b/home/modules/nvim/config/.luarc.json
new file mode 100644
index 0000000..b243cc8
--- /dev/null
+++ b/home/modules/nvim/config/.luarc.json
@@ -0,0 +1,6 @@
+{
+    "diagnostics.globals": [
+        "vim",
+        "Snacks"
+    ]
+}
\ No newline at end of file
diff --git a/home/modules/nvim/config/lazy-lock.json b/home/modules/nvim/config/lazy-lock.json
index 7c61b33..e9776ca 100644
--- a/home/modules/nvim/config/lazy-lock.json
+++ b/home/modules/nvim/config/lazy-lock.json
@@ -6,43 +6,37 @@
   "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "gitlinker.nvim": { "branch": "master", "commit": "296ad98061ca31706a7d890a0f13baed6e137c79" },
-  "gitsigns.nvim": { "branch": "main", "commit": "d8918f06624dd53b9a82bd0e29c31bcfd541b40d" },
-  "go.nvim": { "branch": "master", "commit": "6e5a74b866aa4a112ed85a1169befff2ef82c027" },
+  "codecompanion.nvim": { "branch": "main", "commit": "5a0c93ea807661dcc3fc2e0b8e81a94842d1750c" },
+  "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" },
+  "flash.nvim": { "branch": "main", "commit": "f899265876ecdcf7352dbc9f0adf87068cedefbb" },
+  "fzf-lua": { "branch": "main", "commit": "1176d512b1390f992c775f08dcb155d4e0ba01cf" },
+  "gitsigns.nvim": { "branch": "main", "commit": "c23bbd3ed2c7a3fdc3399e97e24f9e158f57612f" },
+  "go.nvim": { "branch": "master", "commit": "9ecbd0950bac754d9c449ca79e883ab6b230bda2" },
   "guihua.lua": { "branch": "master", "commit": "d783191eaa75215beae0c80319fcce5e6b3beeda" },
-  "harpoon": { "branch": "harpoon2", "commit": "a84ab829eaf3678b586609888ef52f7779102263" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" },
-  "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" },
-  "lazygit.nvim": { "branch": "main", "commit": "77a0d42943d8265271e6e6beaed72da54eeb17e7" },
+  "lazy.nvim": { "branch": "main", "commit": "f15a93907ddad3d9139aea465ae18336d87f5ce6" },
   "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" },
-  "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" },
+  "mason-tool-installer.nvim": { "branch": "main", "commit": "374c78d3ebb5c53f43ea6bd906b6587b5e899b9e" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
-  "none-ls-extras.nvim": { "branch": "main", "commit": "6557f20e631d2e9b2a9fd27a5c045d701a3a292c" },
-  "none-ls.nvim": { "branch": "main", "commit": "ed8f80849ef1ad31c2f74679fafdef7801091247" },
+  "mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" },
   "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" },
   "nvim-lspconfig": { "branch": "master", "commit": "0ef64599b8aa0187ee5f6d92cb39c951f348f041" },
   "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" },
-  "nvim-treesitter": { "branch": "master", "commit": "51562d44fc6280f92bb9a3d87e7b3cb327377ca5" },
-  "nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" },
-  "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
-  "oil.nvim": { "branch": "master", "commit": "52f1683c7664819508e1d2fc85051d4a20c5d643" },
-  "orgmode": { "branch": "master", "commit": "056c21762df23e4f2263aca0c717a064fd2095ff" },
+  "nvim-treesitter": { "branch": "master", "commit": "62911c78a868bac24c8a86f2c1c412d0b799f885" },
+  "nvim-web-devicons": { "branch": "master", "commit": "402377242b04be3f4f0f3720bd952df86e946c30" },
+  "oil.nvim": { "branch": "master", "commit": "add50252b5e9147c0a09d36480d418c7e2737472" },
+  "org-bullets.nvim": { "branch": "main", "commit": "21437cfa99c70f2c18977bffd423f912a7b832ea" },
+  "orgmode": { "branch": "master", "commit": "09c1595d8d6dc203d0e17cc1894e95613feb239f" },
   "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
-  "rose-pine": { "branch": "main", "commit": "42f0724e0bca9f57f0bcfa688787c37b8d4befe8" },
-  "schemastore.nvim": { "branch": "main", "commit": "bb52c530698654355bbddb9f0035dc35cea401a5" },
-  "substitute.nvim": { "branch": "main", "commit": "97f49d16f8eea7967d41db4f657dd63af53eeba1" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
-  "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
+  "rose-pine": { "branch": "main", "commit": "20c7940da844aa4f162a64e552ae3c7e9fdc3b93" },
+  "schemastore.nvim": { "branch": "main", "commit": "118e563101169e8c5096023bc45c460e4c4fb77c" },
+  "snacks.nvim": { "branch": "main", "commit": "790d257c48f0455304c86366c197e5ffe2d80844" },
   "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
   "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" },
-  "vim-dadbod": { "branch": "master", "commit": "96997dac981d50717a63d4dbd48d4a43e09ecf57" },
-  "vim-dadbod-completion": { "branch": "master", "commit": "95cbcf21ea7a5c8c025f387280c2e261b8cb3a89" },
+  "vim-dadbod": { "branch": "master", "commit": "9f0ca8bcef704659820a95c3bbd2c262583a66a1" },
+  "vim-dadbod-completion": { "branch": "master", "commit": "c7f1be21a08b8fc9d927a19db89a4aa995402787" },
   "vim-dadbod-ssh": { "branch": "master", "commit": "9bce775ee76c3dd6d7508dcd9eb276b36133d710" },
-  "vim-dadbod-ui": { "branch": "master", "commit": "65454e2011c029922c2c972d63f8bf04282de033" },
+  "vim-dadbod-ui": { "branch": "master", "commit": "f4d37b7312ae6489e5c04bee654ca521baac188a" },
   "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
-  "which-key.nvim": { "branch": "main", "commit": "6cebd86917df559a88de0f806b2989799c6e6423" },
-  "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }
+  "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" }
 }
diff --git a/home/modules/nvim/config/lua/plugins/conform.nvim b/home/modules/nvim/config/lua/plugins/conform.lua
similarity index 100%
rename from home/modules/nvim/config/lua/plugins/conform.nvim
rename to home/modules/nvim/config/lua/plugins/conform.lua
diff --git a/home/modules/nvim/config/lua/plugins/flash.lua b/home/modules/nvim/config/lua/plugins/flash.lua
new file mode 100644
index 0000000..7d9e2e4
--- /dev/null
+++ b/home/modules/nvim/config/lua/plugins/flash.lua
@@ -0,0 +1,13 @@
+return {
+  "folke/flash.nvim",
+  event = "VeryLazy",
+  opts = {},
+  -- stylua: ignore
+  keys = {
+    { "s",     mode = { "n", "x", "o" }, function() require("flash").jump() end,              desc = "Flash" },
+    { "S",     mode = { "n", "x", "o" }, function() require("flash").treesitter() end,        desc = "Flash Treesitter" },
+    { "r",     mode = "o",               function() require("flash").remote() end,            desc = "Remote Flash" },
+    { "R",     mode = { "o", "x" },      function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
+    { "<c-s>", mode = { "c" },           function() require("flash").toggle() end,            desc = "Toggle Flash Search" },
+  },
+}
diff --git a/home/modules/nvim/config/lua/plugins/gitlinker.lua b/home/modules/nvim/config/lua/plugins/gitlinker.lua
deleted file mode 100644
index 84da08a..0000000
--- a/home/modules/nvim/config/lua/plugins/gitlinker.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-return {
-  "linrongbin16/gitlinker.nvim",
-  cmd = "GitLink",
-  opts = {},
-}
diff --git a/home/modules/nvim/config/lua/plugins/gitsigns.lua b/home/modules/nvim/config/lua/plugins/gitsigns.lua
deleted file mode 100644
index f90bfb1..0000000
--- a/home/modules/nvim/config/lua/plugins/gitsigns.lua
+++ /dev/null
@@ -1,42 +0,0 @@
-return {
-  "lewis6991/gitsigns.nvim",
-  opts = {
-    signs = {
-      add = { text = "│" },
-      change = { text = "│" },
-      delete = { text = "_" },
-      topdelete = { text = "‾" },
-      changedelete = { text = "~" },
-      untracked = { text = "┆" },
-    },
-    signcolumn = true, -- Toggle with `:Gitsigns toggle_signs`
-    numhl = false, -- Toggle with `:Gitsigns toggle_numhl`
-    linehl = false, -- Toggle with `:Gitsigns toggle_linehl`
-    word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff`
-    watch_gitdir = {
-      interval = 1000,
-      follow_files = true,
-    },
-    attach_to_untracked = true,
-    current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame`
-    current_line_blame_opts = {
-      virt_text = true,
-      virt_text_pos = "eol", -- 'eol' | 'overlay' | 'right_align'
-      delay = 1000,
-      ignore_whitespace = false,
-    },
-    current_line_blame_formatter = "<author>, <author_time:%Y-%m-%d> - <summary>",
-    sign_priority = 6,
-    update_debounce = 100,
-    status_formatter = nil, -- Use default
-    max_file_length = 40000, -- Disable if file is longer than this (in lines)
-    preview_config = {
-      -- Options passed to nvim_open_win
-      border = "single",
-      style = "minimal",
-      relative = "cursor",
-      row = 0,
-      col = 1,
-    },
-  },
-}
diff --git a/home/modules/nvim/config/lua/plugins/ibl.lua b/home/modules/nvim/config/lua/plugins/ibl.lua
deleted file mode 100644
index 1fbd4ce..0000000
--- a/home/modules/nvim/config/lua/plugins/ibl.lua
+++ /dev/null
@@ -1,16 +0,0 @@
-return {
-  "lukas-reineke/indent-blankline.nvim",
-  main = "ibl",
-  ---@module "ibl"
-  ---@type ibl.config
-  opts = {
-    indent = {
-      smart_indent_cap = false,
-      char = "╎",
-    },
-    scope = {
-      show_start = false,
-      show_end = false,
-    },
-  },
-}
diff --git a/home/modules/nvim/config/lua/plugins/neogit.lua b/home/modules/nvim/config/lua/plugins/neogit.lua
deleted file mode 100644
index f835722..0000000
--- a/home/modules/nvim/config/lua/plugins/neogit.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-return {
-  "NeogitOrg/neogit",
-  dependencies = {
-    "nvim-lua/plenary.nvim",
-    "sindrets/diffview.nvim",
-    "ibhagwan/fzf-lua",
-  },
-  config = true,
-}
\ No newline at end of file
diff --git a/home/modules/nvim/config/lua/plugins/oil.lua b/home/modules/nvim/config/lua/plugins/oil.lua
index 093b214..5676b96 100644
--- a/home/modules/nvim/config/lua/plugins/oil.lua
+++ b/home/modules/nvim/config/lua/plugins/oil.lua
@@ -4,5 +4,21 @@ return {
     keymaps = {
       ["q"] = "actions.close",
     },
+    columns = {
+      "icon",
+      "permissions",
+      "size",
+      -- "mtime",
+    },
+    float = {
+      padding = 4,
+      border = "rounded",
+      preview_split = "auto",
+    },
   },
+  -- stylua: ignore
+  keys = {
+    { "<leader>n", "<cmd>Oil --float<cr>", desc = "Open file browser", mode = "n" },
+  }
+,
 }
diff --git a/home/modules/nvim/config/lua/plugins/snacks.lua b/home/modules/nvim/config/lua/plugins/snacks.lua
new file mode 100644
index 0000000..5eeabe6
--- /dev/null
+++ b/home/modules/nvim/config/lua/plugins/snacks.lua
@@ -0,0 +1,41 @@
+return {
+  "folke/snacks.nvim",
+  priority = 1000,
+  lazy = false,
+  opts = {
+    bigfile = { enabled = true },
+    dashboard = {
+      enabled = true,
+      sections = {
+        { section = "keys", gap = 1, padding = 1 },
+        { section = "startup" },
+        {
+          section = "terminal",
+          cmd = "pokemon-colorscripts -r --no-title; sleep .1",
+          random = 10,
+          pane = 2,
+          indent = 8,
+          height = 30,
+        },
+      },
+    },
+    git = { enabled = true },
+    gitbrowse = { enabled = true },
+    indent = { enabled = true },
+    lazygit = {
+      enabled = true,
+      configure = true,
+    },
+    statuscolumn = { enabled = true },
+    zen = { enabled = true },
+  },
+  -- stylua: ignore
+  keys = {
+    -- Git
+    { "<leader>gg", function() Snacks.lazygit() end, desc = "Lazygit" },
+    { "<leader>gb", function() Snacks.git.blame_line() end, desc = "Show git blame for current line" },
+    { "<leader>gl", function() Snacks.gitbrowse() end, desc = "Open link to line at git remote" },
+    -- Zen Mode
+    { "<leader>z",  function() Snacks.zen() end, desc = "Toggle Zen Mode" }
+  },
+}
diff --git a/home/modules/nvim/config/lua/plugins/substitute.lua b/home/modules/nvim/config/lua/plugins/substitute.lua
deleted file mode 100644
index 71231f3..0000000
--- a/home/modules/nvim/config/lua/plugins/substitute.lua
+++ /dev/null
@@ -1,16 +0,0 @@
-return {
-  "gbprod/substitute.nvim",
-  opts = {
-    -- your configuration comes here
-    -- or leave it empty to use the default settings
-    -- refer to the configuration section below
-  },
-  config = function()
-    require("substitute").setup({})
-
-    vim.keymap.set("n", "s", require("substitute").operator, { noremap = true })
-    vim.keymap.set("n", "ss", require("substitute").line, { noremap = true })
-    vim.keymap.set("n", "S", require("substitute").eol, { noremap = true })
-    vim.keymap.set("x", "s", require("substitute").visual, { noremap = true })
-  end,
-}
diff --git a/home/modules/nvim/config/lua/plugins/which-key.lua b/home/modules/nvim/config/lua/plugins/which-key.lua
index afc5049..434eaff 100644
--- a/home/modules/nvim/config/lua/plugins/which-key.lua
+++ b/home/modules/nvim/config/lua/plugins/which-key.lua
@@ -48,7 +48,7 @@ return {
       mode = "n",
     },
     { "<leader>c", group = "code", mode = "n" },
-    { "<leader>ca", "<cmd>FzfLua lsp_code_actions", desc = "Code actions", mode = "n" },
+    { "<leader>ca", "<cmd>FzfLua lsp_code_actions<cr>", desc = "Code actions", mode = "n" },
     { "<leader>cd", "<cmd>FzfLua diagnostics_document<cr>", desc = "Show diagnostics", mode = "n" },
     {
       "<leader>cf",
@@ -76,27 +76,6 @@ return {
       desc = "Save currently opened file",
       mode = "n",
     },
-    { "<leader>g", group = "git", mode = "n" },
-    {
-      "<leader>gb",
-      "<cmd>Gitsigns toggle_current_line_blame<cr>",
-      desc = "Toggle git line blame",
-      mode = "n",
-    },
-    { "<leader>gg", "<cmd>Neogit<CR>", desc = "Opens neogit", mode = "n" },
-    {
-      "<leader>glo",
-      "<cmd>GitLink!<cr>",
-      desc = "Open permalink in browser",
-      mode = "n",
-    },
-    { "<leader>gly", "<cmd>GitLink<cr>", desc = "Copy permalink", mode = "n" },
-    {
-      "<leader>n",
-      "<cmd>Oil --float<cr>",
-      desc = "Open file browser",
-      mode = "n",
-    },
     { "<leader>q", "<cmd>qa!<cr>", desc = "Leave neovim", mode = "n" },
     { "<leader>s", group = "search", mode = "n" },
     { "<leader>ss", "<cmd>FzfLua live_grep_native<CR>", desc = "Live Grep", mode = "n" },
@@ -191,7 +170,6 @@ return {
       mode = "n",
     },
     { "<leader>xr", "<cmd>source $MYVIMRC<cr>", desc = "Reload config", mode = "n" },
-    { "<leader>z", "<cmd>ZenMode<cr>", desc = "Toggle ZenMode", mode = "n" },
     { "<leader>do", "<cmd>DiffviewOpen<cr>", desc = "Open diff view", mode = "n" },
     { "<leader>dh", "<cmd>DiffviewFileHistory<cr>", desc = "Open file history diff", mode = "n" },
   },
diff --git a/home/modules/nvim/config/lua/plugins/zen-mode.lua b/home/modules/nvim/config/lua/plugins/zen-mode.lua
deleted file mode 100644
index bd97926..0000000
--- a/home/modules/nvim/config/lua/plugins/zen-mode.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-return {
-  "folke/zen-mode.nvim",
-  opts = {
-    window = {
-      backdrop = 1,
-      width = 100,
-      options = {
-        number = false,
-        relativenumber = false,
-        signcolumn = "no",
-      },
-    },
-  },
-}
diff --git a/hosts/dnsc-air/default.nix b/hosts/dnsc-air/default.nix
index 11e703d..4563256 100644
--- a/hosts/dnsc-air/default.nix
+++ b/hosts/dnsc-air/default.nix
@@ -76,7 +76,6 @@
       "mullvadvpn"
       "vlc"
       "alfred"
-      "signal"
       "wezterm"
       "arc"
       "hiddenbar"
@@ -112,7 +111,6 @@
         show-recents = false;
         persistent-apps = [
           "/Applications/Arc.app"
-          "/Applications/Emacs.app"
           "/Applications/WezTerm.app"
           "/Applications/Photomator.app"
           "/System/Applications/System Settings.app/"