safety commit

.gitignore

@@ -1 +1,2 @@
 local/
+.aider*

.tmux.conf

@@ -94,11 +94,10 @@ set -g @tpm_plugins '            \
 set-option -g set-clipboard on
 # bind C-c run "tmux save-buffer - | xclip -selection clipboard"
 #
-bind-key v capture-pane -S -1000 \; save-buffer /tmp/tmux-buffer \; new-window -n '[scrollback]' 'n /tmp/tmux-buffer; rm /tmp/tmux-buffer; tmux kill-window'
+# bind-key v capture-pane -S -1000 \; save-buffer /tmp/tmux-buffer \; new-window -n '[scrollback]' 'n /tmp/tmux-buffer; rm /tmp/tmux-buffer; tmux kill-window'
 
 # bind-key v capture-pane -S -1000 \; save-buffer /tmp/tmux-buffer \; split-window -h "nvim /tmp/tmux-buffer"
 #
-
 bind C-c copy-mode
 bind C-v run "tmux set-buffer \"$(xclip -selection clipboard -o)\"; tmux paste-buffer"
 setw -g mode-keys vi

nvim/lazyvim.json

@@ -1,6 +1,5 @@
 {
   "extras": [
-
   ],
   "install_version": 7,
   "news": {

nvim/lua/config/autocmds.lua

@@ -25,3 +25,10 @@ vim.api.nvim_create_autocmd("FileType", {
   end,
 })
 -- END TODO APP MAPPINGS
+--
+-- vim.api.nvim_create_autocmd("User", {
+--   pattern = "BlinkCmpMenuOpen",
+--   callback = function()
+--     vim.b.copilot_suggestion_hidden = false
+--   end,
+-- })

nvim/lua/config/keymaps.lua

@@ -108,6 +108,7 @@ map("n", "<leader>agr", "<cmd>GpChatRespond<cr>", { desc = "gp chat respond" })
 
 -- JSON FORMAT
 map("n", "<leader>cjf", "<cmd>%!jq .<cr>", { desc = "Json Format" })
+vim.keymap.set("n", "s", "<Plug>(leap-anywhere)")
 
 local function jump_to_file_line()
   local line = vim.api.nvim_get_current_line()
@@ -241,3 +242,14 @@ function choose_timer()
     },
   })
 end
+
+-- Remap arrow keys to hjkl in Normal and Visual modes
+vim.keymap.set({ "n", "v" }, "<Up>", "k", { noremap = true, silent = true })
+vim.keymap.set({ "n", "v" }, "<Down>", "j", { noremap = true, silent = true })
+vim.keymap.set({ "n", "v" }, "<Left>", "h", { noremap = true, silent = true })
+vim.keymap.set({ "n", "v" }, "<Right>", "l", { noremap = true, silent = true })
+
+vim.keymap.set({ "n", "v" }, "<C-Up>", "k", { noremap = true, silent = true })
+vim.keymap.set({ "n", "v" }, "<C-Down>", "j", { noremap = true, silent = true })
+vim.keymap.set({ "n", "v" }, "<C-Left>", "h", { noremap = true, silent = true })
+vim.keymap.set({ "n", "v" }, "<C-Right>", "l", { noremap = true, silent = true })

nvim/lua/plugins/ai.lua

@@ -1,6 +1,7 @@
 return {
   {
     "olimorris/codecompanion.nvim",
+    enabled = vim.loop.os_uname().sysname == "Darwin",
     opts = {},
     dependencies = {
       "nvim-lua/plenary.nvim",
@@ -8,6 +9,7 @@ return {
   },
   {
     "zbirenbaum/copilot.lua",
+    enabled = vim.loop.os_uname().sysname == "Darwin",
     optional = false,
     opts = function()
       require("copilot.api").status = require("copilot.status")

nvim/lua/plugins/plugins.lua

@@ -6,6 +6,20 @@ local function masterBranch(dep)
 end
 
 return {
+  -- {
+  --   "folke/flash.nvim",
+  --   event = "VeryLazy",
+  --   ---@type Flash.Config
+  --   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" },
+  --   },
+  -- },
   {
     "nvim-treesitter/nvim-treesitter",
     opts = {
@@ -253,11 +267,11 @@ return {
         ollama = {
           endpoint = "http://localhost:11434/v1/chat/completions",
         },
-        openai = {
+        openrouter = {
-          endpoint = "https://api.openai.com/v1/chat/completions",
+          endpoint = "https://openrouter.ai/api/v1",
           secret = {
             "echo ",
-            "$OPENAI_API_KEY",
+            "$OPENROUTER_API_KEY",
           },
         },
       },

nvim/lua/plugins/themes.lua

@@ -16,10 +16,10 @@ return {
   {
     "rebelot/kanagawa.nvim",
     opts = {
-      theme = "lotus",
+      theme = "wave",
       background = {
-        dark = "lotus",
+        dark = "wave",
-        light = "lotus",
+        light = "wave",
       },
     },
   },