diff options
| -rw-r--r-- | bash/.bash_aliases | 9 | ||||
| -rw-r--r-- | nvim/.config/nvim/lsp/intelephense.lua | 55 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/config/keymaps.lua | 20 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/agentic-nvim.lua | 16 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/blink-cmp.lua | 3 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/init.lua | 1 | ||||
| -rw-r--r-- | nvim/.config/nvim/nvim-pack-lock.json | 4 | ||||
| -rwxr-xr-x | ssh/.ssh/config | 4 | ||||
| -rw-r--r-- | ssh/.ssh/github_id_ed25519.pub | 1 | ||||
| -rw-r--r-- | tmux/.config/tmux/tmux.conf | 13 |
10 files changed, 122 insertions, 4 deletions
diff --git a/bash/.bash_aliases b/bash/.bash_aliases index 0099a19..a443389 100644 --- a/bash/.bash_aliases +++ b/bash/.bash_aliases @@ -11,6 +11,15 @@ alias gc='git commit' alias gd='git diff' alias go='git checkout' alias gl='git log --pretty=format:"%h %ad | %s%d [%an]" --graph --date=short' +alias k9s-stage='k9s --context fa-stage' +alias k9s-prod='k9s --context fa-prod' +alias dts-tilt='TILT_PROFILE=dts task up' +alias k-contexts='kubectl config get-contexts' +alias k-local='kubectl config use-context k3d-local-dev' +alias k-stage='kubectl config use-context fa-stage' +alias k-prod='kubectl config use-context fa-prod' +alias k-pods='kubectl get pods' +alias k-desc-pod='kubectl describe pod' # Nixos alias ras='sudo nixos-rebuild switch --flake .#' diff --git a/nvim/.config/nvim/lsp/intelephense.lua b/nvim/.config/nvim/lsp/intelephense.lua index 333b97d..99a0191 100644 --- a/nvim/.config/nvim/lsp/intelephense.lua +++ b/nvim/.config/nvim/lsp/intelephense.lua @@ -11,6 +11,61 @@ return { telemetry = { enabled = false, }, + stubs = { + "bcmath", + "bz2", + "calendar", + "Core", + "curl", + "date", + "dom", + "fileinfo", + "filter", + "gd", + "gettext", + "hash", + "iconv", + "imap", + "json", + "libxml", + "mbstring", + "mcrypt", + "mongodb", + "mysqli", + "oci8", + "odbc", + "openssl", + "password", + "pcntl", + "pcre", + "PDO", + "pdo_mysql", + "pdo_pgsql", + "pdo_sqlite", + "Phar", + "posix", + "readline", + "Reflection", + "session", + "SimpleXML", + "soap", + "sockets", + "SPL", + "standard", + "superglobals", + "sysvmsg", + "sysvsem", + "sysvshm", + "tokenizer", + "wddx", + "xml", + "xmlreader", + "xmlrpc", + "xmlwriter", + "xsl", + "zip", + "zlib", + }, }, }, } diff --git a/nvim/.config/nvim/lua/config/keymaps.lua b/nvim/.config/nvim/lua/config/keymaps.lua index a9bf961..90332ed 100644 --- a/nvim/.config/nvim/lua/config/keymaps.lua +++ b/nvim/.config/nvim/lua/config/keymaps.lua @@ -252,3 +252,23 @@ end, { desc = "Format File" }) set("n", "<leader>ll", function() require("lint").try_lint() end, { desc = "Format File" }) + +-- Agentic. +set({ "n", "v" }, "<leader>aa", function() + require("agentic").toggle() +end, { desc = "Toggle Agentic Chat" }) +set({ "n", "v" }, "<leader>af", function() + require("agentic").add_selection_or_file_to_context() +end, { desc = "Add file or selection to Agentic to Contet" }) +set({ "n", "v" }, "<leader>an", function() + require("agentic").new_session() +end, { desc = "New Agentic Session" }) +set({ "n", "v" }, "<leader>ar", function() + require("agentic").restore_session() +end, { desc = "Agentic Restore session", silent = true }) +set("n", "<leader>ad", function() + require("agentic").add_current_line_diagnostics() +end, { desc = "Add current line diagnostic to Agentic" }) +set("n", "<leader>aD", function() + require("agentic").add_buffer_diagnostics() +end, { desc = "Add all buffer diagnostics to Agentic" }) diff --git a/nvim/.config/nvim/lua/plugins/agentic-nvim.lua b/nvim/.config/nvim/lua/plugins/agentic-nvim.lua new file mode 100644 index 0000000..e63ca8f --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/agentic-nvim.lua @@ -0,0 +1,16 @@ +vim.pack.add({ { src = "https://github.com/carlos-algms/agentic.nvim" } }) + +require("agentic").setup({ + provider = "cursor-acp", + + acp_providers = { + ["cursor-acp"] = { + args = { "acp", "--model", "auto" }, + }, + }, + + ui = { + position = "right", + width = 0.3, + }, +}) diff --git a/nvim/.config/nvim/lua/plugins/blink-cmp.lua b/nvim/.config/nvim/lua/plugins/blink-cmp.lua index edb1465..81fe913 100644 --- a/nvim/.config/nvim/lua/plugins/blink-cmp.lua +++ b/nvim/.config/nvim/lua/plugins/blink-cmp.lua @@ -27,6 +27,9 @@ require("blink.cmp").setup({ "path", "buffer", }, + per_filetype = { + AgenticInput = {}, + }, }, fuzzy = { implementation = "prefer_rust_with_warning", diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index 5a73421..ff31bbd 100644 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -6,3 +6,4 @@ require("plugins.blink-cmp") require("plugins.mini") require("plugins.conform") require("plugins.nvim-lint") +require("plugins.agentic-nvim") diff --git a/nvim/.config/nvim/nvim-pack-lock.json b/nvim/.config/nvim/nvim-pack-lock.json index 840a6d8..9a8d44b 100644 --- a/nvim/.config/nvim/nvim-pack-lock.json +++ b/nvim/.config/nvim/nvim-pack-lock.json @@ -1,5 +1,9 @@ { "plugins": { + "agentic.nvim": { + "rev": "cfa49d9dc3d9712ed10a963706caa55cc0eb62aa", + "src": "https://github.com/carlos-algms/agentic.nvim" + }, "blink.cmp": { "rev": "49f211fe5d729df53df4c042d7c3464cf47d199e", "src": "https://github.com/saghen/blink.cmp", diff --git a/ssh/.ssh/config b/ssh/.ssh/config index 495e6cb..c25c7c1 100755 --- a/ssh/.ssh/config +++ b/ssh/.ssh/config @@ -3,3 +3,7 @@ Host box.sadlersmtp.com Host davidtsadler.com User gemini + +Host github.com + User davidsadler + IdentityFile ~/.ssh/github_id_ed25519 diff --git a/ssh/.ssh/github_id_ed25519.pub b/ssh/.ssh/github_id_ed25519.pub new file mode 100644 index 0000000..882c6c7 --- /dev/null +++ b/ssh/.ssh/github_id_ed25519.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINPrGpr5FjG++CFuUqaupJ6iex34qypmbOj3WQXCA0Ws david@flashacademy.com diff --git a/tmux/.config/tmux/tmux.conf b/tmux/.config/tmux/tmux.conf index 59b1d33..a2d19b5 100644 --- a/tmux/.config/tmux/tmux.conf +++ b/tmux/.config/tmux/tmux.conf @@ -26,10 +26,15 @@ bind k select-pane -UZ bind l select-pane -RZ # Alt+hjkl,cursor keys to switch panes without prefix. -bind -n M-h select-pane -LZ -bind -n M-j select-pane -DZ -bind -n M-k select-pane -UZ -bind -n M-l select-pane -RZ +# Temp on WSL as somehow I keep getting swapped to different panes. +unbind -n M-h +unbind -n M-j +unbind -n M-k +unbind -n M-l +# bind -n M-h select-pane -LZ +# bind -n M-j select-pane -DZ +# bind -n M-k select-pane -UZ +# bind -n M-l select-pane -RZ bind -n M-Left select-pane -LZ bind -n M-Down select-pane -DZ bind -n M-Up select-pane -UZ |