aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.config/fish/config.fish8
-rw-r--r--.config/nvim/lazy-lock.json2
-rw-r--r--.config/nvim/lua/fzf.lua28
-rw-r--r--.config/nvim/lua/lsp.lua46
-rw-r--r--.config/nvim/lua/lspsaga_conf.lua2
-rw-r--r--.config/nvim/lua/mappings.lua2
-rw-r--r--.config/nvim/lua/plugins.lua11
-rw-r--r--.config/nvim/lua/settings.lua2
-rwxr-xr-xbin/rgf2
9 files changed, 66 insertions, 37 deletions
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 52c6b24..5fb4395 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -1,10 +1,11 @@
/opt/homebrew/bin/brew shellenv | source
if status is-interactive
# Commands to run in interactive sessions can go here
+ atuin init fish | source
end
# Add to PATH
-#fish_add_path ~/bin
+fish_add_path ~/bin
#fish_add_path ~/go/bin
#fish_add_path ~/.local/bin
@@ -13,6 +14,11 @@ end
# fish_add_path /home/algo/.zig/zig
#end
#fish_add_path --prepend $HOME/.cargo/bin
+source "$HOME/.cargo/env.fish"
+
+fish_add_path /Users/algo/.opencode/bin
+
+
# Set editor
set -gx EDITOR nvim
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index f9c68e6..ba15a52 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -9,7 +9,6 @@
"cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
"fzf-lua": { "branch": "main", "commit": "758173f499d15410ecb50c5519a41b27c33e645d" },
"gitsigns.nvim": { "branch": "main", "commit": "8b729e489f1475615dc6c9737da917b3bc163605" },
- "go.nvim": { "branch": "master", "commit": "e1b763cab2cfd3c60207873dbc925c9be49913c0" },
"jai.vim": { "branch": "master", "commit": "72c09c5f803b8ab2e708a3ad2b7c3704e2b4b3d8" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"leap.nvim": { "branch": "main", "commit": "212429314c5bfa41f4154bfa8805f7227ba6a880" },
@@ -29,6 +28,7 @@
"nvim-dap": { "branch": "master", "commit": "b0f983507e3702f073bfe1516846e58b56d4e42f" },
"nvim-lspconfig": { "branch": "master", "commit": "b8e7957bde4cbb3cb25a13a62548f7c273b026e9" },
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
+ "nvim-notify": { "branch": "master", "commit": "b5825cf9ee881dd8e43309c93374ed5b87b7a896" },
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
"nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
"odin.vim": { "branch": "master", "commit": "e7ce5f9d1804273986c661132de19798b0b2b267" },
diff --git a/.config/nvim/lua/fzf.lua b/.config/nvim/lua/fzf.lua
index 3dd5645..0dfb9fd 100644
--- a/.config/nvim/lua/fzf.lua
+++ b/.config/nvim/lua/fzf.lua
@@ -1,11 +1,25 @@
local fzf = require('fzf-lua')
+fzf.setup {
+ files = {
+ follow = true,
+ no_ignore = false
+ },
+ grep = {
+ follow = true,
+ no_ignore = false
+ }
+}
+
vim.keymap.set('n', '<c-b>', fzf.buffers, {})
vim.keymap.set('n', '<c-t>', fzf.marks, {})
-vim.keymap.set('n', '<leader>fb', fzf.lines, {})
-vim.keymap.set('n', '<leader>ff', fzf.files, {})
-vim.keymap.set('n', '<leader>fg', fzf.live_grep, {})
-vim.keymap.set('n', '<leader>fw', fzf.grep_cword, {})
-vim.keymap.set('n', '<leader>fW', fzf.grep_cWORD, {})
-vim.keymap.set('v', '<leader>ff', fzf.grep_visual, {})
+-- vim.keymap.set('n', '<leader>fb', fzf.lines, {})
+-- vim.keymap.set('n', '<leader>ff', fzf.files, {})
+vim.keymap.set('n', '<c-f>', fzf.live_grep, {})
+vim.keymap.set('n', '<leader>w', fzf.grep_cword, {})
+-- vim.keymap.set('n', '<c-w>', fzf.grep_cword, {})
+vim.keymap.set('n', '<leader>W', fzf.grep_cWORD, {})
+-- vim.keymap.set('n', '<c-W>', fzf.grep_cWORD, {})
+vim.keymap.set('v', '<c-f>', fzf.grep_visual, {})
+vim.keymap.set('v', '<leader>f>', fzf.grep_visual, {})
-vim.keymap.set('n', '<c-f>', fzf.grep_curbuf, {})
+vim.keymap.set('n', '<leader>f', fzf.grep_curbuf, {})
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua
index 116b9db..5767ddc 100644
--- a/.config/nvim/lua/lsp.lua
+++ b/.config/nvim/lua/lsp.lua
@@ -47,12 +47,12 @@ require("rust-tools").setup({
})
-- https://github.com/ray-x/go.nvim#lsp-cmp-support
-require('go').setup({
- lsp_cfg = {
- capabilities = capabilities,
- on_attach = on_attach
- }
-})
+-- require('go').setup({
+-- lsp_cfg = {
+-- capabilities = capabilities,
+-- on_attach = on_attach
+-- }
+-- })
local lspconfig = require('lspconfig')
lspconfig.zls.setup({
@@ -152,23 +152,23 @@ lspconfig.ols.setup({
enable_inlay_hints = true,
}
})
-local lsp = require("lsp-zero")
-local lspconfig = require("lspconfig")
-lsp.extend_lspconfig()
-
-local configs = require("lspconfig.configs")
-if not configs.jails then
- configs.jails = {
- default_config = {
- cmd = { "jails" },
- root_dir = lspconfig.util.root_pattern("jails.json", "build.jai", "main.jai"),
- filetypes = { "jai" },
- name = "Jails",
- },
- }
-end
-lspconfig.jails.setup({})
-vim.filetype.add({ extension = { jai = "jai", } })
+-- local lsp = require("lsp-zero")
+-- local lspconfig = require("lspconfig")
+-- lsp.extend_lspconfig()
+
+-- local configs = require("lspconfig.configs")
+-- if not configs.jails then
+-- configs.jails = {
+-- default_config = {
+-- cmd = { "jails" },
+-- root_dir = lspconfig.util.root_pattern("jails.json", "build.jai", "main.jai"),
+-- filetypes = { "jai" },
+-- name = "Jails",
+-- },
+-- }
+-- end
+-- lspconfig.jails.setup({})
+-- vim.filetype.add({ extension = { jai = "jai", } })
vim.api.nvim_create_autocmd('BufWritePre', {
pattern = '*.go',
diff --git a/.config/nvim/lua/lspsaga_conf.lua b/.config/nvim/lua/lspsaga_conf.lua
index b31aeff..79257d9 100644
--- a/.config/nvim/lua/lspsaga_conf.lua
+++ b/.config/nvim/lua/lspsaga_conf.lua
@@ -90,7 +90,7 @@ require('lspsaga').setup({
Nmap('<c-l>', ':Lspsaga outline<CR>')
-- Nmap('<c-d>', ':Lspsaga show_buf_diagnostics<CR>')
-Nmap('<c-w>', ':Lspsaga show_buf_diagnostics<CR>')
+Nmap('<c-x>', ':Lspsaga show_buf_diagnostics<CR>')
Nmap('<c-a>', ':Lspsaga code_action<CR>')
Nmap('<leader>ca', ':Lspsaga code_action<CR>')
Vmap('<leader>ca', ':Lspsaga code_action<CR>')
diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua
index ee54f1e..ab1641e 100644
--- a/.config/nvim/lua/mappings.lua
+++ b/.config/nvim/lua/mappings.lua
@@ -43,7 +43,7 @@ Nmap("<leader>l", ":wincmd l<CR>")
-- pane spawn
Nmap("<leader>t", ':split<CR>:wincmd j<CR>:term<CR>')
Nmap("<leader>s", ':vs<CR>:wincmd l<CR>')
-Nmap("<leader>wo", ':only<CR>')
+Nmap("<leader>ow", ':only<CR>')
-- escape terminal mode easier
Tmap('<Esc>', '<C-\\><C-n>')
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index dc855b9..d9f119a 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -71,7 +71,7 @@ return require('lazy').setup({
-- zig
'ziglang/zig.vim',
-- go
- 'ray-x/go.nvim',
+ -- 'ray-x/go.nvim',
-- rust
'rust-lang/rust.vim',
@@ -138,7 +138,7 @@ return require('lazy').setup({
event = "VeryLazy",
opts = {
},
- },
+ },
{
"VonHeikemen/lsp-zero.nvim",
branch = "v2.x",
@@ -149,4 +149,11 @@ return require('lazy').setup({
vim.g.lsp_zero_extend_lspconfig = 0
end,
},
+ {
+ 'rcarriga/nvim-notify',
+ commit = 'b5825cf9ee881dd8e43309c93374ed5b87b7a896',
+ opts = {
+ background_colour = "#000000"
+ }
+ },
})
diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua
index 9e54de8..cc81451 100644
--- a/.config/nvim/lua/settings.lua
+++ b/.config/nvim/lua/settings.lua
@@ -5,6 +5,8 @@ vim.cmd([[
HOME = os.getenv("HOME")
+vim.notify = require('notify')
+
vim.g.mapleader = ' '
vim.g.maplocalleader = ','
diff --git a/bin/rgf b/bin/rgf
index 881359d..49a9fe7 100755
--- a/bin/rgf
+++ b/bin/rgf
@@ -7,7 +7,7 @@ if [[ "${TRACE-0}" == "1" ]]; then
fi
main() {
- result=$(rg --ignore-case --color=always --line-number --no-heading "$@" |
+ result=$(rg -L --ignore-case --color=always --line-number --no-heading "$@" |
fzf --ansi \
--color 'hl:-1:underline,hl+:-1:underline:reverse' \
--delimiter ':' \
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-12-14 18:52:23 +0000