wip(ghostty): adaptive theme

Author: tmm

nix/modules/colors.nix

@@ -27,7 +27,7 @@
     magenta = "#FF00FF";
     orange = "#e6b594";
     red = "#990000";
-    white = "#FDFCF7";
+    white = "#000000";
     yellow = "#ffff00";
   };
 }

nix/modules/home-manager.nix

@@ -92,7 +92,7 @@ in
       macos-titlebar-style = "tabs";
       mouse-hide-while-typing = true;
       shell-integration-features = "no-cursor";
-      theme = "light:tmm-bright,dark:tmm-dark";
+      theme = "dark:_dark,light:_light";
       unfocused-split-opacity = 1;
       window-height = 50;
       window-padding-balance = true;
@@ -103,7 +103,7 @@ in
     themes = {
       # TODO: Add light theme
       # https://github.com/mitchellh/ghostty/issues/809
-      tmm-dark = {
+      _dark = {
         background = colors.dark.background;
         cursor-color = colors.dark.cursor;
         foreground = colors.dark.foreground;
@@ -118,7 +118,7 @@ in
           "7=${colors.dark.white}"
         ];
       };
-      tmm-bright = {
+      _light = {
         background = colors.bright.background;
         cursor-color = colors.bright.cursor;
         foreground = colors.bright.foreground;
@@ -131,6 +131,14 @@ in
           "5=${colors.bright.orange}"
           "6=${colors.bright.cyan}"
           "7=${colors.bright.white}"
+          "8=${colors.bright.black}"
+          "9=${colors.bright.black}"
+          "10=${colors.bright.black}"
+          "11=${colors.bright.black}"
+          "12=${colors.bright.black}"
+          "13=${colors.bright.black}"
+          "14=${colors.bright.black}"
+          "15=${colors.bright.black}"
         ];
       };
     };

nix/modules/shell.nix

@@ -46,13 +46,15 @@
     ];
     shellAbbrs = {
       a = "ambr";
+      b = "bun";
       d = "docker";
       de = "delta";
       dc = "docker compose";
       g = "git";
       i = "iex";
       lsd = "eza -d .*";
       m = "mix";
+      n = "npm";
       o = "opencode";
       p = "pnpm";
       v = "nvim";

nvim/lazy-lock.json

@@ -3,22 +3,22 @@
   "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" },
   "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" },
-  "grug-far.nvim": { "branch": "main", "commit": "385d1949dc21d0c39e7a74b4f4a25da18817bc86" },
+  "gitsigns.nvim": { "branch": "main", "commit": "f780609807eca1f783a36a8a31c30a48fbe150c5" },
+  "grug-far.nvim": { "branch": "main", "commit": "50d9ee2b5a19634670441948e7e4afaa042f1059" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
   "lush.nvim": { "branch": "main", "commit": "9c60ec2279d62487d942ce095e49006af28eed6e" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
   "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
   "mini.icons": { "branch": "main", "commit": "f9a177c11daa7829389b7b6eaaec8b8a5c47052d" },
-  "mini.pairs": { "branch": "main", "commit": "6e1cc569130f25b2c6fa16d8b21b31ddb1420a4a" },
-  "mini.surround": { "branch": "main", "commit": "953fb53aa1d0b2ae4506d35fff0e0e7afc8ceb8d" },
+  "mini.pairs": { "branch": "main", "commit": "3738ea30ff33e0cbf2983dc67319a5468d25b0a9" },
+  "mini.surround": { "branch": "main", "commit": "e170a2dde4b0a8905c9bb218ed428be94ec0b255" },
   "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "nvim-lspconfig": { "branch": "master", "commit": "a3deebbd110016f50cc66b7b256120072f3804db" },
+  "nvim-lspconfig": { "branch": "master", "commit": "d89f4891f0720cd2598e4bdd60010d8784b2ac8a" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "dca8726fea2c14e1ce6adbaa76a04816fbfaff61" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "41847d3dafb5004464708a3db06b14f12bde548a" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
   "oil.nvim": { "branch": "master", "commit": "07f80ad645895af849a597d1cac897059d89b686" },
   "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
   "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },

nvim/lua/plugins.lua

@@ -492,7 +492,6 @@ return {
         find_left = "gsF", -- Find surrounding (to the left)
         highlight = "gsh", -- Highlight surrounding
         replace = "gsr", -- Replace surrounding
-        update_n_lines = "gsn", -- Update `n_lines`
       },
     },
   },
@@ -1162,6 +1161,75 @@ return {
       { "<leader>e", "<cmd>Oil<cr>", desc = "Explorer Oil", remap = true },
     },
     opts = {},
+    config = function(_, opts)
+      -- helper function to parse output
+      local function parse_output(proc)
+        local result = proc:wait()
+        local ret = {}
+        if result.code == 0 then
+          for line in vim.gsplit(result.stdout, "\n", { plain = true, trimempty = true }) do
+            -- Remove trailing slash
+            line = line:gsub("/$", "")
+            ret[line] = true
+          end
+        end
+        return ret
+      end
+
+      -- build git status cache
+      local function new_git_status()
+        return setmetatable({}, {
+          __index = function(self, key)
+            local ignore_proc = vim.system(
+              { "git", "ls-files", "--ignored", "--exclude-standard", "--others", "--directory" },
+              {
+                cwd = key,
+                text = true,
+              }
+            )
+            local tracked_proc = vim.system({ "git", "ls-tree", "HEAD", "--name-only" }, {
+              cwd = key,
+              text = true,
+            })
+            local ret = {
+              ignored = parse_output(ignore_proc),
+              tracked = parse_output(tracked_proc),
+            }
+            rawset(self, key, ret)
+            return ret
+          end,
+        })
+      end
+      local git_status = new_git_status()
+
+      -- Clear git status cache on refresh
+      local refresh = require("oil.actions").refresh
+      local orig_refresh = refresh.callback
+      refresh.callback = function(...)
+        git_status = new_git_status()
+        orig_refresh(...)
+      end
+
+      opts.view_options = {
+        is_hidden_file = function(name, bufnr)
+          local dir = require("oil").get_current_dir(bufnr)
+          local is_dotfile = vim.startswith(name, ".") and name ~= ".."
+          -- if no local directory (e.g. for ssh connections), just hide dotfiles
+          if not dir then
+            return is_dotfile
+          end
+          -- dotfiles are considered hidden unless tracked
+          if is_dotfile then
+            return not git_status[dir].tracked[name]
+          else
+            -- Check if file is gitignored
+            return git_status[dir].ignored[name]
+          end
+        end,
+      }
+
+      require("oil").setup(opts)
+    end,
   },
 
   -- snacks.nvim (https://github.com/folke/snacks.nvim)