diff --git a/.config/nvim/lua/lazyvim/config/autocmds.lua b/.config/nvim/lua/lazyvim/config/autocmds.lua old mode 100755 new mode 100644 index 986375c..98751ff --- a/.config/nvim/lua/lazyvim/config/autocmds.lua +++ b/.config/nvim/lua/lazyvim/config/autocmds.lua @@ -60,14 +60,14 @@ vim.cmd('autocmd BufEnter * setlocal formatoptions-=cro') -- Set filetype to tex for .tex files? vim.cmd([[autocmd BufRead,BufNewFile *.tex set filetype=tex]]) --- Trim whitespace from files on save -vim.cmd([[ -autocmd BufWritePre * let currPos = getpos(".") -autocmd BufWritePre * %s/\s\+$//e -autocmd BufWritePre * %s/\n\+\%$//e -autocmd BufWritePre *.[ch] %s/\%$/\r/e -autocmd BufWritePre * cal cursor(currPos[1], currPos[2]) -]]) +-- -- Trim whitespace from files on save, also have utils.trim_whitespace() +-- vim.cmd([[ +-- autocmd BufWritePre * let currPos = getpos(".") +-- autocmd BufWritePre * %s/\s\+$//e +-- autocmd BufWritePre * %s/\n\+\%$//e +-- autocmd BufWritePre *.[ch] %s/\%$/\r/e +-- autocmd BufWritePre * cal cursor(currPos[1], currPos[2]) +-- ]]) -- Run custom textclear command when exiting a .tex file (cleanup files) vim.cmd([[autocmd VimLeave *.tex !texclear %]]) diff --git a/.config/nvim/lua/lazyvim/config/keymaps.lua b/.config/nvim/lua/lazyvim/config/keymaps.lua old mode 100755 new mode 100644 diff --git a/.config/nvim/lua/lazyvim/plugins/whichkey.lua b/.config/nvim/lua/lazyvim/plugins/whichkey.lua index 9364f46..34d133f 100644 --- a/.config/nvim/lua/lazyvim/plugins/whichkey.lua +++ b/.config/nvim/lua/lazyvim/plugins/whichkey.lua @@ -73,6 +73,17 @@ return { { "T", group = "term" }, }) + whichkey.add({ + mode = { "n", "v" }, + { + "bt", + function() + require "lazyvim.utils".trim_whitespace() + end, + desc = "Trim whitespace from current buffer" + }, + }) + -- Z = { "ZenMode", "Zen" }, -- u = { "UndotreeToggle", "Undo Tree" }, -- ["'"] = { "close", "Close split" }, diff --git a/.config/nvim/lua/lazyvim/utils/init.lua b/.config/nvim/lua/lazyvim/utils/init.lua index 152ea40..094b4af 100644 --- a/.config/nvim/lua/lazyvim/utils/init.lua +++ b/.config/nvim/lua/lazyvim/utils/init.lua @@ -86,10 +86,10 @@ function M.toggle(option, silent, values) end end -local enabled = true +local diagnostics_enabled = true function M.toggle_diagnostics() - enabled = not enabled - if enabled then + diagnostics_enabled = not diagnostics_enabled + if diagnostics_enabled then vim.diagnostic.enable() vim.notify("Enabled diagnostics", vim.log.levels.INFO, { title = "Diagnostics" }) else @@ -147,4 +147,12 @@ function M.setColorscheme(scheme) end end +function M.trim_whitespace() + pcall(vim.cmd, 'let currPos = getpos(".")') + pcall(vim.cmd, [[%s/\s\+$//e]]) + pcall(vim.cmd, [[%s/\n\+\%$//e]]) + pcall(vim.cmd, [[.[ch] %s/\%$/\r/e]]) + pcall(vim.cmd, 'cal cursor(currPos[1], currPos[2])') +end + return M diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 5b84b9b..a0a2fb4 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -31,7 +31,7 @@ set -g base-index 1 setw -g pane-base-index 1 # Enable full mouse support. -set -g mouse on +# set -g mouse on # gross gross gross # ----------------------------------------------------------------------------- # Key Binds diff --git a/.local/bin/compiler b/.local/bin/compiler index 1c83910..d4a3790 100755 --- a/.local/bin/compiler +++ b/.local/bin/compiler @@ -19,7 +19,7 @@ case "${ext}" in c) cc "${file}" -o "${base}" && "./${base}" ;; cob) cobc -x -o "$base" "$file" && "$base" ;; cpp) g++ "${file}" -o "${base}" && "./${base}" ;; - cs) mcs "${file}" && mono "${base}.exe" ;; + cs) cd - && dotnet run ;; go) go run "${file}" ;; h) sudo make install ;; java) javac -d classes "${file}" && java -cp classes "${base}" ;;