diff --git a/nvim/.config/nvim/lua/commands.lua b/nvim/.config/nvim/lua/commands.lua index 668ebfa..1ba2786 100644 --- a/nvim/.config/nvim/lua/commands.lua +++ b/nvim/.config/nvim/lua/commands.lua @@ -82,33 +82,3 @@ vim.api.nvim_create_autocmd("LspProgress", { }) end, }) - -vim.api.nvim_create_autocmd({ 'FileType' }, { - pattern = { 'netrw' }, - group = vim.api.nvim_create_augroup('NetrwOnRename', { clear = true }), - callback = function() - vim.keymap.set("n", "R", function() - local original_file_path = vim.b.netrw_curdir .. '/' .. vim.fn["netrw#Call"]("NetrwGetWord") - - vim.ui.input({ prompt = 'Move/rename to:', default = original_file_path }, - function(target_file_path) - if target_file_path and target_file_path ~= "" then - local file_exists = vim.uv.fs_access(target_file_path, "W") - - if not file_exists then - vim.uv.fs_rename(original_file_path, target_file_path) - - Snacks.rename.on_rename_file(original_file_path, target_file_path) - else - vim.notify( - "File '" .. target_file_path .. "' already exists! Skipping...", - vim.log.levels.ERROR) - end - - -- Refresh netrw - vim.cmd(':Ex ' .. vim.b.netrw_curdir) - end - end) - end, { remap = true, buffer = true }) - end -}) diff --git a/nvim/.config/nvim/lua/configs.lua b/nvim/.config/nvim/lua/configs.lua index 0ff6374..4df91d2 100644 --- a/nvim/.config/nvim/lua/configs.lua +++ b/nvim/.config/nvim/lua/configs.lua @@ -23,11 +23,9 @@ if vim.g.neovide then vim.g.neovide_opacity = 0.8 vim.o.guifont = "ComicShannsMono Nerd Font" - local function save() vim.cmd.write() end local function copy() vim.cmd([[normal! "+y]]) end local function paste() vim.api.nvim_paste(vim.fn.getreg("+"), true, -1) end - vim.keymap.set({ "n", "i", "v" }, "", save) vim.keymap.set("v", "", copy, { silent = true }) vim.keymap.set({ "n", "i", "v", "c", "t" }, "", paste) end diff --git a/nvim/.config/nvim/lua/keymaps.lua b/nvim/.config/nvim/lua/keymaps.lua index bc4a619..e796aa7 100644 --- a/nvim/.config/nvim/lua/keymaps.lua +++ b/nvim/.config/nvim/lua/keymaps.lua @@ -4,6 +4,7 @@ keymap("n", "", ":nohlsearch") keymap("n", "en", ":edit $MYVIMRC") keymap("n", "ez", ":edit ~/.zshrc") +keymap("n", "eo", ":edit ~/dotfiles/oxwm/.config/oxwm/config.lua") keymap("v", "J", ":m '>+1gv=gv") keymap("v", "K", ":m '<-2gv=gv") @@ -28,13 +29,13 @@ vim.keymap.set('n', 'p', function() end vim.ui.select(dirs, { prompt = 'Pick dir:' }, function(choice) if not choice then return end - vim.cmd('cd ' .. vim.fn.fnameescape(choice)) - vim.notify('cd -> ' .. choice, vim.log.levels.INFO) + local escapedChoice = vim.fn.fnameescape(choice) + vim.cmd("cd " .. escapedChoice) + vim.cmd("Explore " .. escapedChoice) + vim.notify("cd -> " .. choice, vim.log.levels.INFO) end) end) - - keymap("n", "lf", vim.lsp.buf.format) keymap({ "n", "t" }, "", function() diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua index 7b64557..3307b11 100644 --- a/nvim/.config/nvim/lua/plugins.lua +++ b/nvim/.config/nvim/lua/plugins.lua @@ -3,10 +3,7 @@ vim.g.mapleader = " " vim.pack.add { { src = "https://github.com/nvim-mini/mini.pick" }, { src = "https://github.com/rafamadriz/friendly-snippets" }, - { - src = "https://github.com/saghen/blink.cmp", - version = "1.*", - }, + { src = "https://github.com/saghen/blink.cmp" }, { src = "https://github.com/nvim-lualine/lualine.nvim" }, { src = "https://github.com/sphamba/smear-cursor.nvim" }, diff --git a/nvim/.config/nvim/nvim-pack-lock.json b/nvim/.config/nvim/nvim-pack-lock.json index e7997f1..2981f87 100644 --- a/nvim/.config/nvim/nvim-pack-lock.json +++ b/nvim/.config/nvim/nvim-pack-lock.json @@ -6,8 +6,7 @@ }, "blink.cmp": { "rev": "d0c5196dae32c53cde1208161554906f5b982de8", - "src": "https://github.com/saghen/blink.cmp", - "version": "'1.*'" + "src": "https://github.com/saghen/blink.cmp" }, "blink.lib": { "rev": "b127d48bf8e9ac9cf41f6e0fbead317503f76558", diff --git a/oxwm/.config/oxwm/config.lua b/oxwm/.config/oxwm/config.lua index f536341..49a3851 100644 --- a/oxwm/.config/oxwm/config.lua +++ b/oxwm/.config/oxwm/config.lua @@ -188,6 +188,11 @@ oxwm.key.chord({ { {}, "C" } }, oxwm.spawn({ "$HOME/wpilib/2026/frccode/frccode2026" })) +oxwm.key.chord({ + { { modkey }, "R" }, + { {}, "P" } +}, oxwm.spawn({ "pathplanner" })) + oxwm.autostart("~/walls/set") oxwm.autostart("fastcompmgr") oxwm.autostart("gentoo-pipewire-launcher") diff --git a/zsh/.zprofile b/zsh/.zprofile index c91675f..a739ad9 100644 --- a/zsh/.zprofile +++ b/zsh/.zprofile @@ -1,6 +1,3 @@ -export PATH="$HOME/.local/bin:$PATH" -export PATH="$HOME/.cargo/bin:$PATH" - export XDG_DOWNLOAD_DIR="$HOME/downloads" export XDG_PROJECTS_DIR="$HOME/programming" @@ -17,5 +14,13 @@ export SUDO_EDITOR=nvim export GOPATH="$HOME/.local/go" -export PATH="$HOME/.local/bin:$HOME/.local/go/bin:$HOME/opt/bin:$HOME/.cargo/bin:$PATH" +export PATH="$HOME/.local/bin:$HOME/.local/go/bin:$HOME/.cargo/bin:$PATH" export LD_LIBRARY_PATH="$HOME/opt/lib:${LD_LIBRARY_PATH:-}" + +for d in "$HOME/opt"/*; do + [ -d "$d" ] || continue + case ":$PATH:" in + *:"$d":*) ;; + *) PATH="$PATH:$d" ;; + esac +done