diff --git a/git/.gitconfig b/git/.gitconfig index 04a06d9..e15401c 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -16,3 +16,8 @@ [init] templateDir = ~/.git-template +[filter "lfs"] + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true + clean = git-lfs clean -- %f diff --git a/nvim/.config/nvim/lua/ink/init.lua b/nvim/.config/nvim/lua/ink/init.lua index cddf5b3..6a728d3 100644 --- a/nvim/.config/nvim/lua/ink/init.lua +++ b/nvim/.config/nvim/lua/ink/init.lua @@ -21,8 +21,9 @@ vim.opt.writebackup = false vim.o.completeopt = "menuone,noinsert,popup,fuzzy" vim.opt.termguicolors = true -- set termguicolors to enable highlight groups vim.opt.whichwrap = "bs<>[]hl" -- which "horizontal" keys are allowed to travel to prev/next line -vim.opt.wrap = false -- display lines as one long line -vim.opt.linebreak = true -- companion to wrap don't split words +vim.o.wrap = true -- 1. Enable line wrapping by default +vim.o.linebreak = true -- 2. Break lines at word boundaries (improves readability) +vim.o.showbreak = "↪ " -- 3. Add a visual indicator for wrapped lines vim.opt.scrolloff = 4 -- minimal number of screen lines to keep above and below the cursor vim.opt.sidescrolloff = 8 -- minimal number of screen columns either side of cursor if wrap is `false` vim.opt.numberwidth = 2 -- set number column width to 2 {default 4} @@ -72,6 +73,11 @@ vim.api.nvim_create_autocmd({ "BufWritePre" }, { vim.fn.setpos(".", save_cursor) end, }) +-- +-- Set a keymap to toggle the 'wrap' option +vim.keymap.set("n", "w", function() + vim.opt.wrap:toggle() +end, { desc = "Toggle line wrapping" }) -- local uv = vim.uv local uv = vim.loop diff --git a/nvim/.config/nvim/lua/plugins/formatting.lua b/nvim/.config/nvim/lua/plugins/formatting.lua index 424d2ea..91557c1 100644 --- a/nvim/.config/nvim/lua/plugins/formatting.lua +++ b/nvim/.config/nvim/lua/plugins/formatting.lua @@ -89,9 +89,9 @@ return { -- install rust rust = { "rustfmt" }, -- brew install prettier - markdown = { "prettierd", "prettier" }, + markdown = { "markdownlint-cli2" }, json = { "prettierd", "prettier" }, - yaml = { "prettierd", "prettier" }, + yaml = { "yamlfmt" }, -- install terraform terraform = { "terraform_fmt" }, -- brew install shfmt diff --git a/nvim/.config/nvim/lua/plugins/linting.lua b/nvim/.config/nvim/lua/plugins/linting.lua index c578282..413d486 100644 --- a/nvim/.config/nvim/lua/plugins/linting.lua +++ b/nvim/.config/nvim/lua/plugins/linting.lua @@ -11,6 +11,8 @@ return { sh = { "shellcheck" }, -- brew install tflint terraform = { "tflint" }, + -- brew install markdownlint-cli2 + markdown = { "markdownlint-cli2" }, -- go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.0 go = { "golangcilint" }, } diff --git a/nvim/.config/nvim/lua/plugins/ui.lua b/nvim/.config/nvim/lua/plugins/ui.lua index 00fafe9..e8a8ab1 100644 --- a/nvim/.config/nvim/lua/plugins/ui.lua +++ b/nvim/.config/nvim/lua/plugins/ui.lua @@ -192,4 +192,16 @@ return { }, }, }, + { + "MeanderingProgrammer/render-markdown.nvim", + dependencies = { "nvim-treesitter/nvim-treesitter", "nvim-tree/nvim-web-devicons" }, + ---@module 'render-markdown' + ---@type render.md.UserConfig + opts = {}, + config = function() + require("render-markdown").setup({ + completions = { lsp = { enabled = true } }, + }) + end, + }, } diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index a355f1d..bd0bffe 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -97,6 +97,8 @@ set-option -g @ssh-split-v-key 'H' set-option -g @ssh-split-w-key "N" set-option -g @ssh-split-r-key "R" +set -g @plugin 'Morantron/tmux-fingers' + ############################################################################### ############################################################################### ### tmux-continuum ### diff --git a/zsh/.zprofile b/zsh/.zprofile index 8abd9b1..913fd9d 100644 --- a/zsh/.zprofile +++ b/zsh/.zprofile @@ -1,5 +1,4 @@ export PATH=~/.local/bin:$PATH -export PATH="$(go env GOPATH)/bin:$PATH" export PATH=$DOTFILES/scripts/hcf/:$PATH case "$(uname -s)" in @@ -12,3 +11,5 @@ case "$(uname -s)" in } ;; *) ;; esac + +export PATH="$(go env GOPATH)/bin:$PATH"