some improvnment

Author: polo871209

Brewfile

@@ -15,6 +15,7 @@ brew "atuin"
 brew "bat"
 brew "carapace"
 brew "cdebug"
+brew "cloud-sql-proxy"
 brew "crane"
 brew "direnv"
 brew "dive"

README.md

@@ -24,6 +24,12 @@ touch ~/.hushlogin
 ./zen-browser/install.sh
 ```
 
+### Setup Atuin
+
+```bash
+atuin setup
+```
+
 ### Setup SSH and Git Authentication
 
 ```bash

atuin/config.toml

@@ -44,7 +44,7 @@
 
 ## which search mode to use
 ## possible values: prefix, fulltext, fuzzy, skim
-# search_mode = "fuzzy"
+search_mode = "daemon-fuzzy"
 
 ## which filter mode to use by default
 ## possible values: "global", "host", "session", "session-preload", "directory", "workspace"
@@ -260,7 +260,8 @@ records = true
 
 [daemon]
 ## Enables using the daemon to sync. Requires the daemon to be running in the background. Start it with `atuin daemon`
-# enabled = false
+enabled = true
+autostart = true
 
 ## How often the daemon should sync in seconds
 # sync_frequency = 300
@@ -356,3 +357,6 @@ enabled = false
 ##
 ## Make directory expand instead of command:
 # columns = ["duration", "time", { type = "directory", expand = true }, { type = "command", expand = false }]
+
+[ai]
+enabled = true

nvim/lua/custom/opencode.lua

@@ -84,7 +84,7 @@ local function discover_instances()
     if env.code == 0 and env.stdout:match('TMUX=' .. tmux_env) then
       local port = find_port_for_pid(pid)
       if port then
-        local window = find_tmux_window(pid) or '?'
+        local window = find_tmux_window(pid)
         table.insert(instances, { pid = pid, port = port, window = window })
       end
     end
@@ -96,22 +96,24 @@ local function discover_instances()
 end
 
 --- Resolve the port to use. Only prompts when there are multiple instances.
----@param callback fun(port: string?, single_instance: boolean, window: string?)
+--- Caches the choice only when multiple instances exist.
+---@param callback fun(port: string?, window: string?)
 local function resolve_port(callback)
   if cache and (vim.uv.now() - cache.timestamp) < CACHE_TTL_MS then
-    callback(cache.port, true, cache.window)
+    callback(cache.port, cache.window)
     return
   end
 
   local instances, err = discover_instances()
   if #instances == 0 then
     notify(err or 'No OpenCode instance found', vim.log.levels.ERROR)
-    callback(nil, false, nil)
+    callback(nil, nil)
     return
   end
 
   if #instances == 1 then
-    callback(instances[1].port, true, instances[1].window)
+    -- Single instance: no cache needed, always resolve fresh
+    callback(instances[1].port, instances[1].window)
     return
   end
 
@@ -121,21 +123,22 @@ local function resolve_port(callback)
       format_item = function(item) return string.format('window %s', item.window) end,
     }, function(choice)
       if not choice then
-        callback(nil, false, nil)
+        callback(nil, nil)
         return
       end
-      callback(choice.port, false, choice.window)
+      -- Multiple instances: cache the picked port so we don't prompt again
+      cache = { port = choice.port, session_id = '', window = choice.window, timestamp = vim.uv.now() }
+      callback(choice.port, choice.window)
     end)
   end)
 end
 
---- Fetch sessions. Auto-picks the top session when `auto` is true, otherwise prompts. Caches the choice.
+--- Fetch sessions. Always auto-picks the top session (session ambiguity is per-instance, not surfaced).
 ---@param port string
----@param auto boolean
 ---@param window string?
 ---@param callback fun(session_id: string?)
-local function resolve_session(port, auto, window, callback)
-  if cache and cache.port == port and (vim.uv.now() - cache.timestamp) < CACHE_TTL_MS then
+local function resolve_session(port, window, callback)
+  if cache and cache.port == port and cache.session_id ~= '' and (vim.uv.now() - cache.timestamp) < CACHE_TTL_MS then
     callback(cache.session_id)
     return
   end
@@ -156,34 +159,20 @@ local function resolve_session(port, auto, window, callback)
       return
     end
 
-    if auto or #sessions == 1 then
+    -- Always auto-pick the top session; update cache if we're in multi-instance mode
+    if cache and cache.port == port then
       cache = { port = port, session_id = sessions[1].id, window = window, timestamp = vim.uv.now() }
-      callback(sessions[1].id)
-      return
     end
-
-    vim.schedule(function()
-      vim.ui.select(sessions, {
-        prompt = 'Pick session:',
-        format_item = function(s) return s.title or s.slug or s.id end,
-      }, function(choice)
-        if not choice then
-          callback(nil)
-          return
-        end
-        cache = { port = port, session_id = choice.id, window = window, timestamp = vim.uv.now() }
-        callback(choice.id)
-      end)
-    end)
+    callback(sessions[1].id)
   end)
 end
 
 --- Resolve port + session, then call back with both.
 ---@param callback fun(port: string, session_id: string, window: string?)
 local function resolve(callback)
-  resolve_port(function(port, single_instance, window)
+  resolve_port(function(port, window)
     if not port then return end
-    resolve_session(port, single_instance, window, function(session_id)
+    resolve_session(port, window, function(session_id)
       if not session_id then return end
       callback(port, session_id, window)
     end)

nvim/lua/custom/plugins/misc.lua

@@ -1,4 +1,5 @@
 return {
+  -- Navigation & Motion
   {
     'christoomey/vim-tmux-navigator',
     cmd = {
@@ -14,33 +15,23 @@ return {
       { '<c-l>', '<cmd><C-U>TmuxNavigateRight<cr>' },
     },
   },
-  { 'ekalinin/Dockerfile.vim' },
   {
     'folke/flash.nvim',
     event = 'VeryLazy',
     opts = {},
-  -- stylua: ignore
-  keys = {
-    { "s", mode = { "n" }, function() require("flash").jump() end, desc = "Flash" },
-    { "S", mode = { "n" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
-  },
-  },
-  {
-    'folke/which-key.nvim',
-    event = 'VimEnter',
-    opts = {
-      delay = 200,
-      spec = {
-        { '<leader><leader>', group = 'OpenCode Ask' },
-        { '<leader>b', group = 'De[B]ug' },
-        { '<leader>g', group = '[G]it' },
-        { '<leader>m', group = 'Split/Join' },
-        { '<leader>s', group = '[S]earch' },
-        { '<leader>t', group = '[T]oggle' },
-        { 'g', group = 'LSP Actions', mode = { 'n' } },
-      },
+    -- stylua: ignore
+    keys = {
+      { "s", mode = { "n" }, function() require("flash").jump() end, desc = "Flash" },
+      { "S", mode = { "n" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
     },
   },
+
+  -- Coding & Editing Support
+  { 'windwp/nvim-autopairs', event = 'InsertEnter', opts = {} },
+  { 'NMAC427/guess-indent.nvim', opts = {} },
+  { 'ekalinin/Dockerfile.vim' },
+
+  -- Version Control (Git)
   {
     'lewis6991/gitsigns.nvim',
     event = { 'BufReadPre', 'BufNewFile' },
@@ -54,19 +45,8 @@ return {
       },
     },
   },
-  { 'NMAC427/guess-indent.nvim', opts = {} },
   {
     'sindrets/diffview.nvim',
     cmd = { 'DiffviewOpen', 'DiffviewClose', 'DiffviewToggleFiles', 'DiffviewFocusFiles' },
   },
-  {
-    'stevearc/quicker.nvim',
-    ft = 'qf',
-    opts = {},
-  },
-  {
-    'windwp/nvim-autopairs',
-    event = 'InsertEnter',
-    opts = {},
-  },
 }

nvim/lua/custom/plugins/snacks.lua

@@ -26,6 +26,15 @@ return {
         },
       },
     },
+    gitbrowse = {
+      remote_patterns = {
+        { "^git@github%.com%-[^:]+:(.+)%.git$", "https://github.com/%1" },
+        { "^git@github%.com%-[^:]+:(.+)$", "https://github.com/%1" },
+        { "^(https?://.*)%.git$", "%1" },
+        { "^git@(.+):(.+)%.git$", "https://%1/%2" },
+        { "%.git$", "" },
+      },
+    },
     styles = {
       lazygit = { width = 0.99, height = 0.99 },
     },

nvim/lua/custom/plugins/style.lua

@@ -0,0 +1,89 @@
+return {
+  {
+    'catppuccin/nvim',
+    priority = 1000,
+    config = function()
+      require('catppuccin').setup {
+        transparent_background = true,
+        custom_highlights = function()
+          return {
+            -- Gruvbox-style popup backgrounds
+            NormalFloat = { bg = '#282828' },
+            FloatBorder = { bg = '#282828', fg = '#fabd2f' },
+          }
+        end,
+      }
+    end,
+    init = function()
+      vim.cmd.colorscheme 'catppuccin-mocha'
+      vim.cmd.hi 'Comment gui=none' -- Remove italic from comments
+    end,
+  },
+  {
+    'folke/todo-comments.nvim',
+    event = 'VimEnter',
+    dependencies = { 'nvim-lua/plenary.nvim' },
+    opts = { signs = false },
+  },
+  {
+    'wurli/visimatch.nvim',
+    opts = {},
+  },
+  {
+    'MeanderingProgrammer/render-markdown.nvim',
+    ft = { 'markdown', 'codecompanion' },
+  },
+  -- UI & Experience
+  {
+    'folke/which-key.nvim',
+    event = 'VimEnter',
+    opts = {
+      delay = 200,
+      spec = {
+        { '<leader><leader>', group = 'OpenCode Ask' },
+        { '<leader>b', group = 'De[B]ug' },
+        { '<leader>g', group = '[G]it' },
+        { '<leader>m', group = 'Split/Join' },
+        { '<leader>s', group = '[S]earch' },
+        { '<leader>t', group = '[T]oggle' },
+        { 'g', group = 'LSP Actions', mode = { 'n' } },
+      },
+    },
+  },
+  {
+    'folke/noice.nvim',
+    event = 'VeryLazy',
+    dependencies = {
+      'MunifTanjim/nui.nvim',
+    },
+    opts = {
+      presets = {
+        bottom_search = true,
+      },
+      cmdline = {
+        enabled = true,
+        view = 'cmdline_popup',
+      },
+      views = {
+        cmdline_popup = {
+          position = { row = 3, col = '50%' },
+        },
+      },
+      -- Disable everything else to prevent behavior changes
+      messages = { enabled = false },
+      popupmenu = { enabled = false },
+      notify = { enabled = false },
+      lsp = {
+        progress = { enabled = false },
+        hover = { enabled = false },
+        signature = { enabled = false },
+        message = { enabled = false },
+      },
+    },
+  },
+  {
+    'stevearc/quicker.nvim',
+    ft = 'qf',
+    opts = {},
+  },
+}

nvim/lua/custom/plugins/ui.lua

@@ -6,6 +6,7 @@
       "extensions": [".py"]
     }
   },
+  "plugin": ["opencode-gemini-auth@latest"],
   "lsp": {
     "cue": {
       "command": ["cue", "lsp", "serve"],

opencode/opencode.json

@@ -25,7 +25,6 @@ set -g mouse on
 set -g renumber-windows on
 set -g set-clipboard on
 set -g window-size largest
-set -g allow-passthrough on
 
 # Enable extended keys for proper modifier key support
 set -g extended-keys on