Compare commits

...
19 Commits
Author SHA1 Message Date
proctor 6dcf6771db nvim: update mason to new Github org and not pin to a tag 2026-06-23 17:08:30 -05:00
proctor da79188cd7 bash: profile updates 2026-06-19 15:49:56 -05:00
proctor 181bb98015 nvim: telescope plugin updates 2026-06-19 15:49:27 -05:00
proctor 812a3b7b11 nvim: lsp plugin updates 2026-06-19 15:49:01 -05:00
proctor d79264dede nvim: add dap (debugger protocol) plugins 2026-06-19 15:48:09 -05:00
proctor 34c9c6301f nvim: Change to use NeoGit, and set ConjureClientState on branch change 2026-06-15 09:48:38 -05:00
proctor 8467be3c43 git: update gitconfig settings 2026-06-10 15:36:47 -05:00
proctor 8cade13a72 nvim: Try Neogit instead of Fugitive 2026-06-03 15:13:09 -05:00
proctor 9a29dd8433 nvim: add todo-comments plugin 2026-04-13 18:07:52 -05:00
proctor 1e32c6293a git: update gitconfig 2026-04-13 17:58:44 -05:00
proctor 6fd4baa9fe nvim: update zoom-toggle keybindings 2026-04-13 17:48:53 -05:00
proctor 4e79e2da69 nvim: update package dependency versions 2026-04-13 17:20:15 -05:00
proctor 89a9823459 nvim: remove references to packer 2026-04-13 17:19:46 -05:00
proctor bdc89102ae nvim: update smartsplit keybinding loading 2026-04-13 17:19:11 -05:00
proctor 3e9ae79508 bash: Add asdf to bash_profile 2026-04-13 17:15:33 -05:00
proctor ce9847370c iTerm2: add iTerm2 settings to dotfiles
Add iTerm2 settings for capture/historical changes and syncing
between computers
2026-03-26 13:44:07 -05:00
proctor 329c9fe07f tmux: Update tmux.conf to attempt to fix nvim and tmux unicode shifting 2026-03-26 13:43:19 -05:00
proctor 644e8c26d3 bash: export LC_ALL to attempt to fix nvim and tmux unicode shifting 2026-03-26 13:39:14 -05:00
proctor a96c155f43 nvim: Continue migration of plugins to lazy.nvim 2026-03-26 13:38:14 -05:00
43 changed files with 3626 additions and 265 deletions

No files matched your search

+15 -17
View File
@@ -1,12 +1,12 @@
shopt -s globstar shopt -s globstar
[[ -f ~/.bashrc ]] && . ~/.bashrc PATH="${ASDF_DATA_DIR:-$HOME/.asdf}/shims:$PATH"
PATH=/usr/local/sbin:/usr/local/bin:~/bin:/usr/local/share/npm/bin:$PATH PATH=/usr/local/sbin:/usr/local/bin:~/bin:/usr/local/share/npm/bin:$PATH
PATH=$PATH:$HOME export PATH=$PATH:$HOME
MANPATH=$MANPATH:/usr/local/opt/erlang/lib/erlang/man MANPATH=$MANPATH:/usr/local/opt/erlang/lib/erlang/man
export XDG_CONFIG_HOME=$HOME/.config export XDG_CONFIG_HOME=$HOME/.config
export LC_ALL=en_US.UTF-8
set -o vi set -o vi
export EDITOR='nvim' export EDITOR='nvim'
@@ -18,14 +18,13 @@ if which brew 2>/dev/null && [[ -f $(brew --prefix)/etc/bash_completion ]]; then
fi fi
# came from Aaron Lasseigne (AaronLasseigne on GitHub) # came from Aaron Lasseigne (AaronLasseigne on GitHub)
battery_status() battery_status() {
{
HEART='♥ ' HEART='♥ '
NON='\[\e[0m\]' NON='\[\e[0m\]'
RED='\[\e[0;31m\]' RED='\[\e[0;31m\]'
battery_info=`ioreg -rc AppleSmartBattery` battery_info=$(ioreg -rc AppleSmartBattery)
current_charge=$(echo $battery_info | grep -o '"CurrentCapacity" = [0-9]\+' | cut -d ' ' -f 3) current_charge=$(echo $battery_info | grep -o '"CurrentCapacity" = [0-9]\+' | cut -d ' ' -f 3)
total_charge=$(echo $battery_info | grep -o '"MaxCapacity" = [0-9]\+' | cut -d ' ' -f 3) total_charge=$(echo $battery_info | grep -o '"MaxCapacity" = [0-9]\+' | cut -d ' ' -f 3)
@@ -35,11 +34,11 @@ battery_status()
fi fi
echo -n "${RED}" echo -n "${RED}"
for i in `seq 1 $charged_slots`; do echo -n "$HEART"; done for i in $(seq 1 $charged_slots); do echo -n "$HEART"; done
echo -n "${NON}" echo -n "${NON}"
if [[ $charged_slots -lt 10 ]]; then if [[ $charged_slots -lt 10 ]]; then
for i in `seq 1 $(echo "10-$charged_slots" | bc)`; do echo -n "$HEART"; done for i in $(seq 1 $(echo "10-$charged_slots" | bc)); do echo -n "$HEART"; done
fi fi
} }
@@ -54,16 +53,15 @@ safesource ~/.bash/aliases
safesource ~/.bash_local safesource ~/.bash_local
### Added by the Heroku Toolbelt ### Added by the Heroku Toolbelt
export PATH="/usr/local/heroku/bin:$PATH" #export PATH="/usr/local/heroku/bin:$PATH"
function repeat() { function repeat() {
local count=$1; local count=$1
shift; shift
echo "running '$@' for $count times" echo "running '$@' for $count times"
for i in $(eval echo "{1..$count}") for i in $(eval echo "{1..$count}"); do
do
$@ || break $@ || break
done done
} }
@@ -89,13 +87,11 @@ function my_git_user_name() {
git config --get user.name git config --get user.name
} }
function my_commits_for_this_past_year() function my_commits_for_this_past_year() {
{
git log --author="$(my_git_user_name)" --after="$(end_of_last_year)" origin/master git log --author="$(my_git_user_name)" --after="$(end_of_last_year)" origin/master
} }
function truncate_logs() function truncate_logs() {
{
find log -type f -name "*.log" | xargs -I {} bash -c 'echo "" > {}' find log -type f -name "*.log" | xargs -I {} bash -c 'echo "" > {}'
} }
@@ -116,3 +112,5 @@ export LESS_TERMCAP_us=$'\e'"[1;32m"
[ -s "$HOME/.config/broot/launcher/bash/br" ] && source "$HOME/.config/broot/launcher/bash/br" [ -s "$HOME/.config/broot/launcher/bash/br" ] && source "$HOME/.config/broot/launcher/bash/br"
# source /Users/proctor/.config/broot/launcher/bash/br # source /Users/proctor/.config/broot/launcher/bash/br
#
[[ -f ~/.bashrc ]] && . ~/.bashrc
+9 -7
View File
@@ -1,21 +1,19 @@
# Test for an interactive shell. There is no need to set anything # Test for an interactive shell. There is no need to set anything
# past this point for scp and rcp, and it's important to refrain from # past this point for scp and rcp, and it's important to refrain from
# outputting anything in those cases. # outputting anything in those cases.
if [[ $- != *i* ]] ; then if [[ $- != *i* ]]; then
# Shell is non-interactive. Be done now! # Shell is non-interactive. Be done now!
return return
fi fi
# came from Aaron Lasseigne (AaronLasseigne on GitHub) # came from Aaron Lasseigne (AaronLasseigne on GitHub)
battery_status() battery_status() {
{
HEART='♥ ' HEART='♥ '
NON='\[\e[0m\]' NON='\[\e[0m\]'
RED='\[\e[0;31m\]' RED='\[\e[0;31m\]'
battery_info=`ioreg -rc AppleSmartBattery` battery_info=$(ioreg -rc AppleSmartBattery)
current_charge=$(echo $battery_info | grep -o '"CurrentCapacity" = [0-9]\+' | cut -d ' ' -f 3) current_charge=$(echo $battery_info | grep -o '"CurrentCapacity" = [0-9]\+' | cut -d ' ' -f 3)
total_charge=$(echo $battery_info | grep -o '"MaxCapacity" = [0-9]\+' | cut -d ' ' -f 3) total_charge=$(echo $battery_info | grep -o '"MaxCapacity" = [0-9]\+' | cut -d ' ' -f 3)
@@ -25,11 +23,11 @@ battery_status()
fi fi
echo -n "${RED}" echo -n "${RED}"
for i in `seq 1 $charged_slots`; do echo -n "$HEART"; done for i in $(seq 1 $charged_slots); do echo -n "$HEART"; done
echo -n "${NON}" echo -n "${NON}"
if [[ $charged_slots -lt 10 ]]; then if [[ $charged_slots -lt 10 ]]; then
for i in `seq 1 $(echo "10-$charged_slots" | bc)`; do echo -n "$HEART"; done for i in $(seq 1 $(echo "10-$charged_slots" | bc)); do echo -n "$HEART"; done
fi fi
} }
@@ -41,3 +39,7 @@ export XML_CATALOG_FILES=/usr/local/etc/xml/catalog
export PATH="$PATH:$HOME/.rvm/bin" export PATH="$PATH:$HOME/.rvm/bin"
# source ~/.config/broot/launcher/bash/br # source ~/.config/broot/launcher/bash/br
if which direnv 2>/dev/null; then
eval "$(direnv hook bash)"
fi
+32 -7
View File
@@ -1,32 +1,57 @@
# This is Git's per-user configuration file.
[user] [user]
email = steven.proctor@gmail.com
name = Proctor name = Proctor
email = steven.proctor@gmail.com
[core] [core]
editor = nvim editor = nvim
excludesFile = ~/.gitignore.global excludesFile = ~/.gitignore.global
[color]
ui = true
[pull]
ff = only
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f
[init] [init]
defaultBranch = main defaultBranch = main
[alias] ; Command aliases for the git[1] command wrapper [alias] ; Command aliases for the git[1] command wrapper
last = cat-file commit HEAD last = cat-file commit HEAD
[diff]
algorithm = histogram
colorMoved = zebra # plain
mnemonicPrefix = true
renames = true
[branch] [branch]
autoSetupRebase = always autoSetupRebase = always
[checkout] [checkout]
defaultRemote = origin defaultRemote = origin
[gpg]
format = ssh
[commit]
gpgsign = true
[fetch]
all = true
prune = true
pruneTags = true
[tag]
gpgsign = true
sort = version:refname
[gpg "ssh"]
allowedSignersFile = ~/.ssh/allowed_signers
[help]
autocorrect = prompt
[merge] [merge]
conflitstyle = zdiff3
ff = only ff = only
[push] [push]
default = current
autoSetupRemote = true autoSetupRemote = true
default = upstream followTags = true
[rerere] [rerere]
enabled = true enabled = true
autoupdate = true
[remote] [remote]
pushDefault = origin pushDefault = origin
;; This is last, take in any other local file overrides ;; This is last, take in any other local file overrides
[include] [include]
path = ~/.gitconfig.local ; find ".gitconfig.local" in your `$HOME` directory path = ~/.gitconfig.local ; find ".gitconfig.local" in your `$HOME` directory
[pull]
ff = only
File diff suppressed because it is too large. Load diff
+11 -11
View File
@@ -1,14 +1,14 @@
(local mason (require :mason)) ; (local mason (require :mason))
(local mason-lspconf (require :mason-lspconfig)) ; (local mason-lspconf (require :mason-lspconfig))
(local lspconfig (require :dotfiles.plugin.lspconfig)) ; (local lspconfig (require :dotfiles.plugin.lspconfig))
;
(fn setup [] ; (fn setup []
(mason.setup {:ui {:icons {:package_installed "✓"}}}) ; (mason.setup {:ui {:icons {:package_installed "✓"}}})
(when mason-lspconf ; (when mason-lspconf
(mason-lspconf.setup {:ensure_installed [:lua_ls] :automatic_enable true}) ; (mason-lspconf.setup {:ensure_installed [:lua_ls] :automatic_enable true})
(lspconfig.setup-handlers (mason-lspconf.get_installed_servers)))) ; (lspconfig.setup-handlers (mason-lspconf.get_installed_servers))))
;
(setup) ; (setup)
;; (mason.setup) ;; (mason.setup)
;; ;;
;; (when-let [mason-lspconfig (require :mason-lspconfig)] ;; (when-let [mason-lspconfig (require :mason-lspconfig)]
@@ -16,31 +16,14 @@
;; (use (core.assoc opts 1 name)))))) ;; (use (core.assoc opts 1 name))))))
;; ;;
;; (local packages { ;; (local packages {
;; :Olical/nfnl {}
;; :Olical/conjure {:mod :conjure}
;; :Olical/fennel.vim {}
;; :ahmedkhalf/project.nvim {} ;; :ahmedkhalf/project.nvim {}
;; :airblade/vim-gitgutter {}
;; :akinsho/toggleterm.nvim {:mod :toggleterm} ;; :akinsho/toggleterm.nvim {:mod :toggleterm}
;; :clojure-vim/vim-jack-in {} ;; :clojure-vim/vim-jack-in {}
;; :christianrondeau/vim-base64 {} ;; :christianrondeau/vim-base64 {}
;; :dhruvasagar/vim-table-mode {} ;; :dhruvasagar/vim-table-mode {}
;; :folke/lsp-colors.nvim {} ;; :folke/lsp-colors.nvim {}
;; :folke/which-key.nvim {:mod :whichkey}
;; :gbprod/yanky.nvim {:mod :yanky} ;; :gbprod/yanky.nvim {:mod :yanky}
;; :hashivim/vim-terraform {} ;; :hashivim/vim-terraform {}
;; :HiPhish/rainbow-delimiters.nvim {}
;; :hrsh7th/nvim-cmp {:requires [:hrsh7th/cmp-buffer
;; :hrsh7th/cmp-emoji
;; :hrsh7th/cmp-nvim-lsp
;; :hrsh7th/cmp-nvim-lua
;; :hrsh7th/cmp-path
;; :hrsh7th/cmp-vsnip
;; :hrsh7th/vim-vsnip-integ
;; :L3MON4D3/LuaSnip
;; :PaterJason/cmp-conjure
;; :saadparwaiz1/cmp_luasnip]
;; :mod :cmp}
;; :hrsh7th/vim-vsnip {} ;; :hrsh7th/vim-vsnip {}
;; :hrsh7th/vim-vsnip-integ {} ;; :hrsh7th/vim-vsnip-integ {}
;; :Iron-E/nvim-soluarized {} ;; :Iron-E/nvim-soluarized {}
@@ -48,30 +31,16 @@
;; :nvimtools/none-ls.nvim {:mod :null-ls ;; :nvimtools/none-ls.nvim {:mod :null-ls
;; :requires [:nvim-lua/plenary.nvim]} ;; :requires [:nvim-lua/plenary.nvim]}
;; :junegunn/vim-easy-align {:mod :easyalign} ;; :junegunn/vim-easy-align {:mod :easyalign}
;; :kovisoft/paredit {:mod :paredit
;; :require [:nvim-treesitter/nvim-treesitter]}
;; :kristijanhusak/vim-dadbod-completion {} ;; :kristijanhusak/vim-dadbod-completion {}
;; :kristijanhusak/vim-dadbod-ui {} ;; :kristijanhusak/vim-dadbod-ui {}
;; :L3MON4D3/LuaSnip {:mod :luasnip} ;; :L3MON4D3/LuaSnip {:mod :luasnip}
;; :lifepillar/vim-solarized8 {} ;; :lifepillar/vim-solarized8 {}
;; :lukas-reineke/headlines.nvim {:mod :headlines} ;; :lukas-reineke/headlines.nvim {:mod :headlines}
;; ; :michaelb/sniprun {:run "bash ./install.sh" :mod :sniprun} ;; ; :michaelb/sniprun {:run "bash ./install.sh" :mod :sniprun}
;; :mrjones2014/smart-splits.nvim {:mod :smartsplits}
;; :mechatroner/rainbow_csv {} ;; :mechatroner/rainbow_csv {}
;; :MunifTanjim/nui.nvim {}
;; :neovim/nvim-lspconfig {:mod :lspconfig} ;; :neovim/nvim-lspconfig {:mod :lspconfig}
;; :norcalli/nvim-colorizer.lua {:mod :colorizer} ;; :norcalli/nvim-colorizer.lua {:mod :colorizer}
;; :nvim-neo-tree/neo-tree.nvim {:branch :v3.x
;; :require [:nvim-lua/plenary.nvim
;; :nvim-tree/nvim-web-devicons
;; ; not strictly required, but recommended
;; :MunifTanjim/nui.nvim
;; ; :3rd/image.nvim, ; Optional image support in preview window: See `# Preview Mode` for more information
;; ]}
;; :nvim-orgmode/orgmode {:mod :orgmode} ;; :nvim-orgmode/orgmode {:mod :orgmode}
;; :nvim-telescope/telescope.nvim {:requires [[:nvim-lua/popup.nvim]
;; [:nvim-lua/plenary.nvim]]
;; :mod :telescope}
;; :nvim-tree/nvim-web-devicons {} ;; :nvim-tree/nvim-web-devicons {}
;; :nvim-treesitter/nvim-treesitter {:run ":TSUpdate" ;; :nvim-treesitter/nvim-treesitter {:run ":TSUpdate"
;; :mod :treesitter} ;; :mod :treesitter}
@@ -83,22 +52,7 @@
;; ;; :tjdevries/sg.nvim {:run "cargo build --workspace" ;; ;; :tjdevries/sg.nvim {:run "cargo build --workspace"
;; ;; :dependencies [:nvim-lua/plenary.nvim]} ;; ;; :dependencies [:nvim-lua/plenary.nvim]}
;; ;; :tpope/vim-classpath {} ;; ;; :tpope/vim-classpath {}
;; :tpope/vim-dadbod {}
;; :tpope/vim-dispatch {}
;; :tpope/vim-fugitive {:mod :fugitive}
;; :tpope/vim-git {}
;; :tpope/vim-pathogen {}
;; :tpope/vim-rails {}
;; :tpope/vim-repeat {}
;; :tpope/vim-rhubarb {}
;; :tpope/vim-surround {}
;; :tpope/vim-unimpaired {}
;; :tpope/vim-vinegar {}
;; :wbthomason/packer.nvim {:mod :packer}
;; ;; :williamboman/nvim-lsp-installbuilder {} ;; ;; :williamboman/nvim-lsp-installbuilder {}
;; :williamboman/mason.nvim {:mod :mason
;; :requires [:williamboman/mason-lspconfig.nvim
;; :neovim/nvim-lspconfig]}
;; ; NeoVim lsp server installs ;; ; NeoVim lsp server installs
;; ; :p00f/nvim-ts-rainbow {} ;; ; :p00f/nvim-ts-rainbow {}
;; ; :luochen1990/rainbow {} ;; ; :luochen1990/rainbow {}
+14 -4
View File
@@ -1,3 +1,5 @@
(import-macros {: tx} :config.macros)
(local u (require :dotfiles.util)) (local u (require :dotfiles.util))
(var unzoom! nil) (var unzoom! nil)
@@ -9,10 +11,18 @@
(set unzoom! nil)) (set unzoom! nil))
(do (do
(set unzoom! (vim.fn.winrestcmd)) (set unzoom! (vim.fn.winrestcmd))
(vim.fn.resize) (vim.cmd.resize)
(vim.fn.vertical :resize)))) (vim.cmd.resize {:mods {:vertical true}}))))
(vim.api.nvim_create_user_command :ZoomToggle zoom-toggle {}) (vim.api.nvim_create_user_command :ZoomToggle zoom-toggle {})
(u.nnoremap :<M-z> ":call ZoomToggle()<CR>") ;; (u.nnoremap :<M-z> ":call ZoomToggle()<CR>")
(u.tnoremap :<M-z> "<c-\\><c-n>:call ZoomToggle()<CR>") ;; (u.tnoremap :<M-z> "<c-\\><c-n>:call ZoomToggle()<CR>")
(let [wk (require :which-key)]
(wk.add [[(tx :<M-z> zoom-toggle
{:desc "Toggle zoom of buffer window"})]
[(tx :<M-z> zoom-toggle
{:desc "Toggle zoom of buffer window"
:mode [:n :t] })]] ))
@@ -0,0 +1,3 @@
(import-macros {: tx} :config.macros)
(tx :skywind3000/asyncrun.vim {})
@@ -0,0 +1,5 @@
(import-macros {: tx} :config.macros)
(tx "windwp/nvim-autopairs"
{:event "InsertEnter"
:config true })
@@ -1,3 +1,3 @@
(import-macros {: tx} :config.macros) (import-macros {: tx} :config.macros)
(tx :lifepillar/vim-solarized8 {}) (tx "https://codeberg.org/lifepillar/vim-solarized8/" {:branch "neovim"})
+23 -3
View File
@@ -5,13 +5,33 @@
; (set nvim.g.conjure#eval#result_register "*") ; (set nvim.g.conjure#eval#result_register "*")
; (set nvim.g.conjure#log#botright true) ; (set nvim.g.conjure#log#botright true)
(set vim.g.conjure#mapping#doc_word :gk) (set vim.g.conjure#mapping#doc_word :gk)
(set vim.g.conjure#log#linked_to_client_state true)
(set vim.g.conjure#client#clojure#nrepl#mapping#session_clone :sC) (set vim.g.conjure#client#clojure#nrepl#mapping#session_clone :sC)
(set vim.g.conjure#extract#tree_sitter#enabled true) (set vim.g.conjure#extract#tree_sitter#enabled true)
(set vim.g.conjure#filetype#fennel "conjure.client.fennel.nfnl") (set vim.g.conjure#filetype#fennel :conjure.client.fennel.nfnl)
(set vim.g.conjure#log#trim#at 1000000)
;; (conjure-config.assoc-in [:filetypes] ;; (conjure-config.assoc-in [:filetypes]
;; (core.concat (conjure-config.filetypes) [:markdown])) ;; (core.concat (conjure-config.filetypes) [:markdown]))
;; (conjure-config.assoc-in [:filetype :markdown] :conjure.client.clojure.nrepl) ;; (conjure-config.assoc-in [:filetype :markdown] :conjure.client.clojure.nrepl)
(tx "Olical/conjure"
{:event "VeryLazy"}) (tx :Olical/conjure
{:event :VeryLazy
:dependencies [:NeogitOrg/neogit]
:config (lambda []
(let [a (require :nfnl.core)
group (vim.api.nvim_create_augroup :ConjureSetClientStateOnGitBranchCheckout
{:clear true})]
(vim.api.nvim_create_autocmd [:User]
{: group
:pattern :NeogitBranchCheckout
:callback (lambda [e]
(let [branch (a.get-in e
[:data
:branch_name])
feature (a.first (icollect [s (string.gmatch branch
"[^/]*")]
s))]
(vim.cmd.ConjureClientState feature)
false))})))})
+45
View File
@@ -0,0 +1,45 @@
(import-macros {: tx} :config.macros)
[(tx "mfussenegger/nvim-dap"
{:config
(fn []
(let [dap (require :dap)]
(set dap.adapters.clojure
{:type "executable"
:command "clojure"
:args ["-Sdeps"
"{:deps {uk.me.oli/clojure-dap {:mvn/version \"RELEASE\"}}}"
"-X" "clojure-dap.main/run"]})
(set dap.configurations.clojure
[{:name "Attach to nREPL"
:type "clojure"
:request "attach"}])))
:keys [(tx "<leader>db" (fn [] ((. (require :dap) :toggle_breakpoint))) {:desc "Toggle breakpoint"})
(tx "<F9>" (fn [] ((. (require :dap) :toggle_breakpoint))) {:desc "Toggle breakpoint"})
(tx "<leader>dc" (fn [] ((. (require :dap) :continue))) {:desc "Continue / Start debug"})
(tx "<F5>dc" (fn [] ((. (require :dap) :continue))) {:desc "Continue / Start debug"})
(tx "<leader>dn" (fn [] ((. (require :dap) :step_over))) {:desc "Step over"})
(tx "<F10>" (fn [] ((. (require :dap) :step_over))) {:desc "Step over"})
(tx "<leader>di" (fn [] ((. (require :dap) :step_into))) {:desc "Step into"})
(tx "<F11>" (fn [] ((. (require :dap) :step_into))) {:desc "Step into"})
(tx "<leader>do" (fn [] ((. (require :dap) :step_out))) {:desc "Step out"})
(tx "<F12>" (fn [] ((. (require :dap) :step_out))) {:desc "Step out"})
(tx "<leader>dr" (fn [] ((. (require :dap) :repl :open))) {:desc "Open REPL"})
(tx "<leader>dl" (fn [] ((. (require :dap) :run_last))) {:desc "Run last"})
(tx "<leader>dx" (fn [] ((. (require :dap) :terminate))) {:desc "Terminate"})
(tx "<leader>du" (fn [] ((. (require :dapui) :toggle))) {:desc "Toggle DAP UI"})]})
(tx "rcarriga/nvim-dap-ui"
{:dependencies ["mfussenegger/nvim-dap" "nvim-neotest/nvim-nio"]
:config (fn []
(let [dapui (require :dapui)
dap (require :dap)]
(dapui.setup)
(tset dap.listeners.after.event_initialized :dapui
(fn [] (dapui.open)))
(tset dap.listeners.before.event_terminated :dapui
(fn [] (dapui.close)))
(tset dap.listeners.before.event_exited :dapui
(fn [] (dapui.close)))))})]
+20
View File
@@ -0,0 +1,20 @@
(import-macros {: tx} :config.macros)
(tx :NeogitOrg/neogit
{:lazy true
:dependencies [;; Only one of these is needed.
:esmuellert/codediff.nvim
; -- optional
;"sindrets/diffview.nvim"; -- optional
;; For a custom log pager
:m00qek/baleia.nvim
; -- optional
;; Only one of these is needed.
:nvim-telescope/telescope.nvim
; -- optional
; "ibhagwan/fzf-lua"; -- optional
; "nvim-mini/mini.pick"; -- optional
; "folke/snacks.nvim"; -- optional
]
:cmd :Neogit
:keys [(tx :<leader>gg :<cmd>Neogit<cr> {:desc "Show Neogit UI"})]})
@@ -0,0 +1,3 @@
(import-macros {: tx} :config.macros)
(tx :airblade/vim-gitgutter {})
+23 -35
View File
@@ -49,9 +49,18 @@
[(lambda [] (vim.fn.input "Binding name: "))]] [(lambda [] (vim.fn.input "Binding name: "))]]
:pf [:promote-fn :pf [:promote-fn
[(lambda [] (vim.fn.input "Function name: "))]] [(lambda [] (vim.fn.input "Function name: "))]]
:sc [:change-collection :sc [:change-coll
[(lambda [] (vim.fn.input "")) [(lambda []
"input('Collection type: ')"]] (let [coll-types [:map :list :set :vector]
a (require :nfnl.core)
choice (vim.fn.inputlist (a.concat ["Collection Type:"]
(a.map-indexed (fn [[k
v]]
(.. (tostring k)
". "
v))
coll-types)))]
(a.get coll-types choice)))]]
:sm [:sort-map []] :sm [:sort-map []]
:tf [:thread-first-all []] :tf [:thread-first-all []]
:tF [:thread-first []] :tF [:thread-first []]
@@ -125,10 +134,11 @@
:trim_newlines true :trim_newlines true
:gleam true}) :gleam true})
(vim.lsp.enable [:clojure :fennel-ls :typedclojure]) (each [_ lsp-lang (pairs [:clojure :fennel-ls :typedclojure])]
(vim.lsp.enable lsp-lang))
[(tx :folke/lsp-colors.nvim {}) [(tx :folke/lsp-colors.nvim {})
(tx :williamboman/mason.nvim {:tag :v1.11.0 :opts {}}) (tx :mason-org/mason.nvim {:opts {:ui {:icons {:package_installed "✓"}}}})
(tx :stevearc/conform.nvim (tx :stevearc/conform.nvim
{:dependencies [:rcarriga/nvim-notify] {:dependencies [:rcarriga/nvim-notify]
:opts {;;:default_format_opts {:lsp_format :fallback} :opts {;;:default_format_opts {:lsp_format :fallback}
@@ -180,13 +190,12 @@
(vim.notify (.. "Set vim.g.dotfiles_format_on_save to " (vim.notify (.. "Set vim.g.dotfiles_format_on_save to "
(tostring vim.g.dotfiles_format_on_save)))) (tostring vim.g.dotfiles_format_on_save))))
{:desc "Toggle global formatting"})]}) {:desc "Toggle global formatting"})]})
(tx :williamboman/mason-lspconfig.nvim (tx :mason-org/mason-lspconfig.nvim
{:tag :v1.32.0 {:dependencies [:mason-org/mason.nvim]
:dependencies [:williamboman/mason.nvim] :opts {:ensure_installed lsps}})
:opts {:ensure_installed lsps :automatic_installation true}})
(tx :neovim/nvim-lspconfig (tx :neovim/nvim-lspconfig
{:lazy false {:lazy false
:dependencies [:williamboman/mason-lspconfig.nvim :dependencies [:mason-org/mason-lspconfig.nvim
:hrsh7th/cmp-nvim-lsp :hrsh7th/cmp-nvim-lsp
:stevearc/conform.nvim :stevearc/conform.nvim
:Olical/nfnl] :Olical/nfnl]
@@ -220,10 +229,7 @@
a (require :nfnl.core) a (require :nfnl.core)
u (require :dotfiles.util) u (require :dotfiles.util)
lsp (require :vim.lsp) lsp (require :vim.lsp)
lspconfig (require :lspconfig)
cmp_nvim_lsp (require :cmp_nvim_lsp)] cmp_nvim_lsp (require :cmp_nvim_lsp)]
(vim.lsp.enable :gleam)
(fn bufmap [mode from to opts] (fn bufmap [mode from to opts]
(u.noremap mode from to (a.merge {:local? true} opts))) (u.noremap mode from to (a.merge {:local? true} opts)))
@@ -315,32 +321,14 @@
:format)))})) :format)))}))
(print "LSP Client Attached.")) (print "LSP Client Attached."))
(mlsp.setup_handlers (tx (fn [server-name] (each [_ config (pairs (vim.lsp.get_configs {:enabled true}))]
(let [server-name (. config :name)]
(vim.lsp.config server-name (vim.lsp.config server-name
{:capabilities caps {:capabilities caps
: on_attach}) : on_attach})
(vim.lsp.enable server-name)) (vim.lsp.enable server-name)))))})
{; :tailwindcss
; (fn []
; ;; https://github.com/tailwindlabs/tailwindcss/discussions/7554#discussioncomment-12991596
; ;; https://github.com/tailwindlabs/tailwindcss-intellisense/issues/401#issuecomment-2336568169
; ;; https://github.com/tailwindlabs/tailwindcss-intellisense/issues/400#issuecomment-2664427180
; (vim.lsp.config "tailwindcss"
; {:settings
; {:tailwindCSS
; {:experimental
; {:classRegex [["\\[:[^.\\s]*((?:\\.[^.\\s\\]]*)+)[\\s\\]]" "\\.([^.]*)"]
; ["\\:(\\.[^\\s#]+(?:\\.[^\\s#]+)*)" "\\.([^\\.\\s#]+)"]
; ["class\\s+(\\:[^\\s\\}]*)[\\s\\}]" "[\\:.]([^.]*)"]
; ["class\\s+(\"[^\\}\"]*)\"" "[\"\\s]([^\\s\"]*)"]
; ["class\\s+\\[([\\s\\S]*)\\]" "[\"\\:]([^\\s\"]*)[\"]?"]
; ["class\\s+'\\[([\\s\\S]*)\\]" "([^\\s]*)?"]]}
; :includeLanguages {:clojure "html"
; :clojurescript "html"}}}})
; (vim.lsp.enable "tailwindcss"))
}))))})
(tx :RubixDev/mason-update-all {:cmd :MasonUpdateAll (tx :RubixDev/mason-update-all {:cmd :MasonUpdateAll
:dependencies [:williamboman/mason.nvim :dependencies [:mason-org/mason.nvim
:Olical/nfnl] :Olical/nfnl]
:main :mason-update-all :main :mason-update-all
:opts {}})] :opts {}})]
+12 -8
View File
@@ -1,7 +1,9 @@
(import-macros {: tx} :config.macros) (import-macros {: tx} :config.macros)
(tx :mrjones2014/smart-splits.nvim
(let [smart-splits (require :smart-splits)] {:lazy false
:config (fn []
(let [smart-splits (require :smart-splits)]
(when smart-splits (when smart-splits
;; recommended mappings ;; recommended mappings
;; resizing splits ;; resizing splits
@@ -15,9 +17,11 @@
(vim.keymap.set :n :<M-j> smart-splits.move_cursor_down) (vim.keymap.set :n :<M-j> smart-splits.move_cursor_down)
(vim.keymap.set :n :<M-k> smart-splits.move_cursor_up) (vim.keymap.set :n :<M-k> smart-splits.move_cursor_up)
(vim.keymap.set :n :<M-l> smart-splits.move_cursor_right) ; ; swapping buffers between windows (vim.keymap.set :n :<M-l> smart-splits.move_cursor_right) ; ; swapping buffers between windows
(vim.keymap.set :n :<leader><leader>h smart-splits.swap_buf_left) (vim.keymap.set :n :<leader><leader>h
(vim.keymap.set :n :<leader><leader>j smart-splits.swap_buf_down) smart-splits.swap_buf_left)
(vim.keymap.set :n :<leader><leader>k smart-splits.swap_buf_up) (vim.keymap.set :n :<leader><leader>j
(vim.keymap.set :n :<leader><leader>l smart-splits.swap_buf_right))) smart-splits.swap_buf_down)
(vim.keymap.set :n :<leader><leader>k
(tx :mrjones2014/smart-splits.nvim {:lazy false}) smart-splits.swap_buf_up)
(vim.keymap.set :n :<leader><leader>l
smart-splits.swap_buf_right))))})
+2 -1
View File
@@ -29,7 +29,8 @@
(util.lnnoremap :fp "Telescope projects") (util.lnnoremap :fp "Telescope projects")
(util.lnnoremap :fm "Telescope keymaps") (util.lnnoremap :fm "Telescope keymaps")
(util.lnnoremap :fM "Telescope marks") (util.lnnoremap :fM "Telescope marks")
(util.lnnoremap :ft "Telescope filetypes") (util.lnnoremap :ft "TodoTelescope")
(util.lnnoremap :fT "Telescope filetypes")
(util.lnnoremap :fq "Telescope quickfix") (util.lnnoremap :fq "Telescope quickfix")
(util.lnnoremap :fl "Telescope loclist") (util.lnnoremap :fl "Telescope loclist")
(util.lnnoremap :fsi "Telescope lsp_implementations") (util.lnnoremap :fsi "Telescope lsp_implementations")
@@ -0,0 +1,4 @@
(import-macros {: tx} :config.macros)
(tx :folke/todo-comments.nvim
{:dependencies [:nvim-lua/plenary.nvim] :opts {:lazy false}})
@@ -0,0 +1,29 @@
(import-macros {: tx} :config.macros)
(fn set-terminal-keymaps []
(vim.keymap.set :t :<esc> "<C-\\><C-n>")
(vim.keymap.set :t :jk "<C-\\><C-n>")
(vim.keymap.set :t :<C-h> "<Cmd>wincmd h<CR>")
(vim.keymap.set :t :<C-j> "<Cmd>wincmd j<CR>")
(vim.keymap.set :t :<C-k> "<Cmd>wincmd k<CR>")
(vim.keymap.set :t :<C-l> "<Cmd>wincmd l<CR>")
(vim.keymap.set :t :<C-w> "<C-\\><C-n><C-w>"))
(vim.api.nvim_create_user_command :SetTerminalKeymaps set-terminal-keymaps {})
(vim.api.nvim_create_autocmd [:TermOpen]
{:pattern "term://*"
:callback set-terminal-keymaps})
(tx :akinsho/toggleterm.nvim {:lazy false
:opts {:open_mapping "<c-\\>"
:start_in_insert true
:insert_mappings true
;; whether or not the open mapping applies in insert mode
:terminal_mappings true
;; whether or not the open mapping applies in the opened terminals
:persist_size true
:persist_mode true
;; if set to true (default) the previous terminal mode will be remembered
:autochdir true}
:keys []})
+7 -7
View File
@@ -6,17 +6,17 @@
(fn bufmap [mode from to] (util.noremap mode from to {:local? true})) (fn bufmap [mode from to] (util.noremap mode from to {:local? true}))
(fn map-fugitive-keys [] ; (fn map-fugitive-keys []
(bufmap :n :<leader>gp ":Git pull<CR>") ; (bufmap :n :<leader>gp ":Git pull<CR>")
(bufmap :n :<leader>gP ":Git push<CR>") ; (bufmap :n :<leader>gP ":Git push<CR>")
(bufmap :n :<leader>gF ":Git push -f<CR>")) ; (bufmap :n :<leader>gF ":Git push -f<CR>"))
(vim.api.nvim_create_autocmd [:FileType] ; (vim.api.nvim_create_autocmd [:FileType]
{:pattern :fugitive :callback map-fugitive-keys}) ; {:pattern :fugitive :callback map-fugitive-keys})
[(tx :tpope/vim-dadbod {}) [(tx :tpope/vim-dadbod {})
(tx :tpope/vim-dispatch {}) (tx :tpope/vim-dispatch {})
(tx :tpope/vim-fugitive {}) ; (tx :tpope/vim-fugitive {})
(tx :tpope/vim-git {:lazy false}) (tx :tpope/vim-git {:lazy false})
(tx :tpope/vim-pathogen {}) (tx :tpope/vim-pathogen {})
(tx :tpope/vim-rails {}) (tx :tpope/vim-rails {})
@@ -6,20 +6,14 @@
(tx :nvim-treesitter/nvim-treesitter (tx :nvim-treesitter/nvim-treesitter
{:branch :main {:branch :main
:build (fn [] :build ":TSUpdate"
(let [TS (require :nvim-treesitter)]
(when (not TS.get_installed)
(LazyVim.error "Please restart Neovim and run `:TSUpdate` to use the `nvim-treesitter` **main** branch."))
; make sure we're using the latest treesitter util
(set package.loaded.lazyvim.util.treesitter nil)
(LazyVim.treesitter.build (fn []
(TS.update nil {:summary true})))))
:opts {:indent {:enable true} :opts {:indent {:enable true}
:highlight {:enable true} :highlight {:enable true}
:folds {:enable true} :folds {:enable true}
:ensure_installed [:bash :ensure_installed [:bash
:clojure :clojure
:diff :diff
:elm
:fennel :fennel
:html :html
:javascript :javascript
@@ -31,6 +25,7 @@
:markdown :markdown
:markdown_inline :markdown_inline
:regex :regex
:ruby
:toml :toml
:vim :vim
:vimdoc :vimdoc
@@ -0,0 +1,3 @@
(import-macros {: tx} :config.macros)
(tx :folke/which-key.nvim {:event "VeryLazy"})
+14 -14
View File
@@ -1,24 +1,24 @@
local execute = vim.api.nvim_command local execute = vim.api.nvim_command
local fn = vim.fn local fn = vim.fn
require 'config.lazy' require("config.lazy")
local pack_path = fn.stdpath("data") .. "/site/pack" -- local pack_path = fn.stdpath("data") .. "/site/pack"
local fmt = string.format -- local fmt = string.format
function ensure(user, repo) -- function ensure(user, repo)
-- Ensures a given github.com/USER/REPO is cloned in the pack/packer/start directory. -- -- Ensures a given github.com/USER/REPO is cloned in the pack/packer/start directory.
local install_path = fmt("%s/packer/start/%s", pack_path, repo, repo) -- local install_path = fmt("%s/packer/start/%s", pack_path, repo, repo)
if fn.empty(fn.glob(install_path)) > 0 then -- if fn.empty(fn.glob(install_path)) > 0 then
execute(fmt("!git clone https://github.com/%s/%s %s", user, repo, install_path)) -- execute(fmt("!git clone https://github.com/%s/%s %s", user, repo, install_path))
execute(fmt("packadd %s", repo)) -- execute(fmt("packadd %s", repo))
end -- end
end -- end
-- Bootstrap essential plugins required for installing and loading the rest. -- Bootstrap essential plugins required for installing and loading the rest.
ensure("wbthomason", "packer.nvim") -- ensure("wbthomason", "packer.nvim")
-- ensure("Olical", "aniseed") -- ensure("Olical", "aniseed")
ensure("lifepillar", "vim-solarized8") -- ensure("lifepillar", "vim-solarized8")
-- Enable Aniseed's automatic compilation and loading of Fennel source code. -- Enable Aniseed's automatic compilation and loading of Fennel source code.
-- vim.g["aniseed#env"] = { -- vim.g["aniseed#env"] = {
@@ -26,4 +26,4 @@ ensure("lifepillar", "vim-solarized8")
-- compile = true -- compile = true
-- } -- }
-- --
require 'dotfiles.init' require("dotfiles.init")
+28 -17
View File
@@ -1,43 +1,54 @@
{ {
"asyncrun.vim": { "branch": "master", "commit": "98d3c0fdeb983f0ef62fe3a49da440f6d2c045ce" },
"baleia.nvim": { "branch": "main", "commit": "710537ff5cd669c5a76c5f5b6a9169fd9b913d18" },
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
"cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" },
"cmp-conjure": { "branch": "master", "commit": "8c9a88efedc0e5bf3165baa6af8a407afe29daf6" }, "cmp-conjure": { "branch": "master", "commit": "8c9a88efedc0e5bf3165baa6af8a407afe29daf6" },
"cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
"cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
"conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" }, "codediff.nvim": { "branch": "main", "commit": "7608f3b436ce1f84a4888f75e53079caa981a2e9" },
"conjure": { "branch": "main", "commit": "42048ce74a7d86dd85091d7d8cebb78d25761da3" }, "conform.nvim": { "branch": "master", "commit": "619363c30309d29ffa631e67c8183f2a72caa373" },
"conjure": { "branch": "main", "commit": "16b436c0124dae26250986fd4e660529d6bb14f0" },
"fennel.vim": { "branch": "main", "commit": "0a5c89e7f31d2721a36f7043ee98e24e22e6325e" }, "fennel.vim": { "branch": "main", "commit": "0a5c89e7f31d2721a36f7043ee98e24e22e6325e" },
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
"lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" }, "lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "21c5b3ebeaa0412e28096bb0701434c51c1fbf76" },
"mason-update-all": { "branch": "main", "commit": "332aa2586295f93a32643eb2b580f899458215a1" }, "mason-update-all": { "branch": "main", "commit": "332aa2586295f93a32643eb2b580f899458215a1" },
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "9d6826582a3e8c84787bd7355df22a2812a1ad59" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "ebd66767191714e008ce73b769518a763ff31bdc" },
"nfnl": { "branch": "main", "commit": "f39a7ec6fe0ace2b2ea108ce04d954549e36c76d" }, "neogit": { "branch": "master", "commit": "43ea1a0854052e583f647e0b35879f0158a70a78" },
"nfnl": { "branch": "main", "commit": "ac0177c5549df7abba7a19554c18a7765386c894" },
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
"nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" }, "nvim-autopairs": { "branch": "master", "commit": "7b9923abad60b903ece7c52940e1321d39eccc79" },
"nvim-lspconfig": { "branch": "master", "commit": "d8bf4c47385340ab2029402201d4d7c9f99f437a" }, "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" },
"nvim-dap": { "branch": "master", "commit": "9e848e09a697ee95302a3ef2dd43fd6eb709e570" },
"nvim-dap-ui": { "branch": "master", "commit": "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49" },
"nvim-lspconfig": { "branch": "master", "commit": "bfcc0171a43f22afa61d927ffe9fcb6cb85dc99e" },
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
"nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
"nvim-treesitter": { "branch": "main", "commit": "5cb05e1b0fa3c469958a2b26f36b3fe930af221c" }, "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
"nvim-web-devicons": { "branch": "master", "commit": "737cf6c657898d0c697311d79d361288a1343d50" }, "nvim-web-devicons": { "branch": "master", "commit": "dfbfaa967a6f7ec50789bead7ef87e336c1fa63c" },
"paredit": { "branch": "master", "commit": "60203e50698ed2211b4434a66ab2258a1a6ac3b5" }, "paredit": { "branch": "master", "commit": "60203e50698ed2211b4434a66ab2258a1a6ac3b5" },
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
"rainbow-delimiters.nvim": { "branch": "master", "commit": "01993eb20c6cdc1d33e7e98252368840309f99b9" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "a798325b7f36acc62741d1029930a7b96d4dd4bf" },
"smart-splits.nvim": { "branch": "master", "commit": "25bf40abf79720ebfa98e09259b7c42942055f4c" }, "smart-splits.nvim": { "branch": "master", "commit": "c02d70257e5d6065d4154acd596ec8054a725724" },
"telescope.nvim": { "branch": "master", "commit": "3333a52ff548ba0a68af6d8da1e54f9cd96e9179" }, "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" },
"todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
"toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" },
"vim-dadbod": { "branch": "master", "commit": "6d1d41da4873a445c5605f2005ad2c68c99d8770" }, "vim-dadbod": { "branch": "master", "commit": "6d1d41da4873a445c5605f2005ad2c68c99d8770" },
"vim-dispatch": { "branch": "master", "commit": "a2ff28abdb2d89725192db5b8562977d392a4d3f" }, "vim-dispatch": { "branch": "master", "commit": "a2ff28abdb2d89725192db5b8562977d392a4d3f" },
"vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" },
"vim-git": { "branch": "master", "commit": "485e38f29494e46a9998100e707c755d114155f1" }, "vim-git": { "branch": "master", "commit": "485e38f29494e46a9998100e707c755d114155f1" },
"vim-gitgutter": { "branch": "main", "commit": "21c977e8597c468c7dc76001389b0b430d46a4b0" },
"vim-pathogen": { "branch": "master", "commit": "ac4dd9494fa9008754e49dff85bff1b5746c89b4" }, "vim-pathogen": { "branch": "master", "commit": "ac4dd9494fa9008754e49dff85bff1b5746c89b4" },
"vim-rails": { "branch": "master", "commit": "b0a5c76f86ea214ade36ab0b811e730c3f0add67" }, "vim-rails": { "branch": "master", "commit": "b0a5c76f86ea214ade36ab0b811e730c3f0add67" },
"vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }, "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
"vim-rhubarb": { "branch": "master", "commit": "5496d7c94581c4c9ad7430357449bb57fc59f501" }, "vim-rhubarb": { "branch": "master", "commit": "5496d7c94581c4c9ad7430357449bb57fc59f501" },
"vim-solarized8": { "branch": "master", "commit": "345e6b423a6df53e41324ff633d62265f465edec" }, "vim-solarized8": { "branch": "neovim", "commit": "4ef98a611553a8093ae9e5af078ef6f94071e886" },
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
"vim-unimpaired": { "branch": "master", "commit": "db65482581a28e4ccf355be297f1864a4e66985c" }, "vim-unimpaired": { "branch": "master", "commit": "db65482581a28e4ccf355be297f1864a4e66985c" },
"vim-vinegar": { "branch": "master", "commit": "bb1bcddf43cfebe05eb565a84ab069b357d0b3d6" }, "vim-vinegar": { "branch": "master", "commit": "bb1bcddf43cfebe05eb565a84ab069b357d0b3d6" },
"vim-vsnip": { "branch": "master", "commit": "9bcfabea653abdcdac584283b5097c3f8760abaa" }, "vim-vsnip": { "branch": "master", "commit": "9bcfabea653abdcdac584283b5097c3f8760abaa" },
"vim-vsnip-integ": { "branch": "master", "commit": "c7c93934dece8315db3649bdc6898b76358a8b8d" } "vim-vsnip-integ": { "branch": "master", "commit": "c7c93934dece8315db3649bdc6898b76358a8b8d" },
"which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
} }
@@ -1,14 +1,2 @@
-- [nfnl] fnl/dotfiles/plugin/mason.fnl -- [nfnl] fnl/dotfiles/plugin/mason.fnl
local mason = require("mason")
local mason_lspconf = require("mason-lspconfig")
local lspconfig = require("dotfiles.plugin.lspconfig")
local function setup()
mason.setup({ui = {icons = {package_installed = "\226\156\147"}}})
if mason_lspconf then
mason_lspconf.setup({ensure_installed = {"lua_ls"}, automatic_enable = true})
return lspconfig["setup-handlers"](mason_lspconf.get_installed_servers())
else
return nil
end
end
return setup()
@@ -8,10 +8,10 @@ local function zoom_toggle()
return nil return nil
else else
unzoom_21 = vim.fn.winrestcmd() unzoom_21 = vim.fn.winrestcmd()
vim.fn.resize() vim.cmd.resize()
return vim.fn.vertical("resize") return vim.cmd.resize({mods = {vertical = true}})
end end
end end
vim.api.nvim_create_user_command("ZoomToggle", zoom_toggle, {}) vim.api.nvim_create_user_command("ZoomToggle", zoom_toggle, {})
u.nnoremap("<M-z>", ":call ZoomToggle()<CR>") local wk = require("which-key")
return u.tnoremap("<M-z>", "<c-\\><c-n>:call ZoomToggle()<CR>") return wk.add({{{"<M-z>", zoom_toggle, desc = "Toggle zoom of buffer window"}}, {{"<M-z>", zoom_toggle, desc = "Toggle zoom of buffer window", mode = {"n", "t"}}}})
@@ -0,0 +1,2 @@
-- [nfnl] fnl/plugins/asyncrun.fnl
return {"skywind3000/asyncrun.vim"}
@@ -0,0 +1,2 @@
-- [nfnl] fnl/plugins/autopairs.fnl
return {"windwp/nvim-autopairs", config = true, event = "InsertEnter"}
@@ -1,2 +1,2 @@
-- [nfnl] fnl/plugins/colorscheme.fnl -- [nfnl] fnl/plugins/colorscheme.fnl
return {"lifepillar/vim-solarized8"} return {"https://codeberg.org/lifepillar/vim-solarized8/", branch = "neovim"}
+32 -1
View File
@@ -1,6 +1,37 @@
-- [nfnl] fnl/plugins/conjure.fnl -- [nfnl] fnl/plugins/conjure.fnl
vim.g["conjure#mapping#doc_word"] = "gk" vim.g["conjure#mapping#doc_word"] = "gk"
vim.g["conjure#log#linked_to_client_state"] = true
vim.g["conjure#client#clojure#nrepl#mapping#session_clone"] = "sC" vim.g["conjure#client#clojure#nrepl#mapping#session_clone"] = "sC"
vim.g["conjure#extract#tree_sitter#enabled"] = true vim.g["conjure#extract#tree_sitter#enabled"] = true
vim.g["conjure#filetype#fennel"] = "conjure.client.fennel.nfnl" vim.g["conjure#filetype#fennel"] = "conjure.client.fennel.nfnl"
return {"Olical/conjure", event = "VeryLazy"} vim.g["conjure#log#trim#at"] = 1000000
local function _1_()
local a = require("nfnl.core")
local group = vim.api.nvim_create_augroup("ConjureSetClientStateOnGitBranchCheckout", {clear = true})
local function _2_(e)
if (nil == e) then
_G.error("Missing argument e on fnl/plugins/conjure.fnl:29", 2)
else
end
local branch = a["get-in"](e, {"data", "branch_name"})
local feature
local function _4_()
local tbl_26_ = {}
local i_27_ = 0
for s in string.gmatch(branch, "[^/]*") do
local val_28_ = s
if (nil ~= val_28_) then
i_27_ = (i_27_ + 1)
tbl_26_[i_27_] = val_28_
else
end
end
return tbl_26_
end
feature = a.first(_4_())
vim.cmd.ConjureClientState(feature)
return false
end
return vim.api.nvim_create_autocmd({"User"}, {group = group, pattern = "NeogitBranchCheckout", callback = _2_})
end
return {"Olical/conjure", config = _1_, dependencies = {"NeogitOrg/neogit"}, event = "VeryLazy"}
+68
View File
@@ -0,0 +1,68 @@
-- [nfnl] fnl/plugins/dap.fnl
local function _1_()
local dap = require("dap")
dap.adapters.clojure = {type = "executable", command = "clojure", args = {"-Sdeps", "{:deps {uk.me.oli/clojure-dap {:mvn/version \"RELEASE\"}}}", "-X", "clojure-dap.main/run"}}
dap.configurations.clojure = {{name = "Attach to nREPL", type = "clojure", request = "attach"}}
return nil
end
local function _2_()
return require("dap").toggle_breakpoint()
end
local function _3_()
return require("dap").toggle_breakpoint()
end
local function _4_()
return require("dap").continue()
end
local function _5_()
return require("dap").continue()
end
local function _6_()
return require("dap").step_over()
end
local function _7_()
return require("dap").step_over()
end
local function _8_()
return require("dap").step_into()
end
local function _9_()
return require("dap").step_into()
end
local function _10_()
return require("dap").step_out()
end
local function _11_()
return require("dap").step_out()
end
local function _12_()
return require("dap").repl.open()
end
local function _13_()
return require("dap").run_last()
end
local function _14_()
return require("dap").terminate()
end
local function _15_()
return require("dapui").toggle()
end
local function _16_()
local dapui = require("dapui")
local dap = require("dap")
dapui.setup()
local function _17_()
return dapui.open()
end
dap.listeners.after.event_initialized["dapui"] = _17_
local function _18_()
return dapui.close()
end
dap.listeners.before.event_terminated["dapui"] = _18_
local function _19_()
return dapui.close()
end
dap.listeners.before.event_exited["dapui"] = _19_
return nil
end
return {{"mfussenegger/nvim-dap", config = _1_, keys = {{"<leader>db", _2_, desc = "Toggle breakpoint"}, {"<F9>", _3_, desc = "Toggle breakpoint"}, {"<leader>dc", _4_, desc = "Continue / Start debug"}, {"<F5>dc", _5_, desc = "Continue / Start debug"}, {"<leader>dn", _6_, desc = "Step over"}, {"<F10>", _7_, desc = "Step over"}, {"<leader>di", _8_, desc = "Step into"}, {"<F11>", _9_, desc = "Step into"}, {"<leader>do", _10_, desc = "Step out"}, {"<F12>", _11_, desc = "Step out"}, {"<leader>dr", _12_, desc = "Open REPL"}, {"<leader>dl", _13_, desc = "Run last"}, {"<leader>dx", _14_, desc = "Terminate"}, {"<leader>du", _15_, desc = "Toggle DAP UI"}}}, {"rcarriga/nvim-dap-ui", config = _16_, dependencies = {"mfussenegger/nvim-dap", "nvim-neotest/nvim-nio"}}}
+2
View File
@@ -0,0 +1,2 @@
-- [nfnl] fnl/plugins/git.fnl
return {"NeogitOrg/neogit", cmd = "Neogit", dependencies = {"esmuellert/codediff.nvim", "m00qek/baleia.nvim", "nvim-telescope/telescope.nvim"}, keys = {{"<leader>gg", "<cmd>Neogit<cr>", desc = "Show Neogit UI"}}, lazy = true}
@@ -0,0 +1,2 @@
-- [nfnl] fnl/plugins/gitgutter.fnl
return {"airblade/vim-gitgutter"}
+41 -31
View File
@@ -33,22 +33,33 @@ local function _10_()
return vim.fn.input("Function name: ") return vim.fn.input("Function name: ")
end end
local function _11_() local function _11_()
return vim.fn.input("") local coll_types = {"map", "list", "set", "vector"}
local a = require("nfnl.core")
local choice
local function _13_(_12_)
local k = _12_[1]
local v = _12_[2]
return (tostring(k) .. ". " .. v)
end
choice = vim.fn.inputlist(a.concat({"Collection Type:"}, a["map-indexed"](_13_, coll_types)))
return a.get(coll_types, choice)
end end
client_command_lnmappings = {clojure_lsp = {ai = {"add-import-to-namespace", {_1_}}, am = {"add-missing-libspec", {}}, as = {"add-require-suggestion", {_2_, _3_, _4_}}, cc = {"cycle-coll", {}}, cn = {"clean-ns", {}}, cp = {"cycle-privacy", {}}, ct = {"create-test", {}}, df = {"drag-forward", {}}, db = {"drag-backward", {}}, dk = {"destructure-keys", {}}, ed = {"extract-to-def", {_5_}}, ref = {"extract-function", {_6_}}, el = {"expand-let", {}}, fe = {"create-function", {}}, il = {"introduce-let", {_7_}}, is = {"inline-symbol", {}}, ma = {"resolve-macro-as", {}}, mf = {"move-form", {_8_}}, ml = {"move-to-let", {_9_}}, pf = {"promote-fn", {_10_}}, sc = {"change-collection", {_11_, "input('Collection type: ')"}}, sm = {"sort-map", {}}, tf = {"thread-first-all", {}}, tF = {"thread-first", {}}, tl = {"thread-last-all", {}}, tL = {"thread-last", {}}, ua = {"unwind-all", {}}, uw = {"unwind-thread", {}}}} client_command_lnmappings = {clojure_lsp = {ai = {"add-import-to-namespace", {_1_}}, am = {"add-missing-libspec", {}}, as = {"add-require-suggestion", {_2_, _3_, _4_}}, cc = {"cycle-coll", {}}, cn = {"clean-ns", {}}, cp = {"cycle-privacy", {}}, ct = {"create-test", {}}, df = {"drag-forward", {}}, db = {"drag-backward", {}}, dk = {"destructure-keys", {}}, ed = {"extract-to-def", {_5_}}, ref = {"extract-function", {_6_}}, el = {"expand-let", {}}, fe = {"create-function", {}}, il = {"introduce-let", {_7_}}, is = {"inline-symbol", {}}, ma = {"resolve-macro-as", {}}, mf = {"move-form", {_8_}}, ml = {"move-to-let", {_9_}}, pf = {"promote-fn", {_10_}}, sc = {"change-coll", {_11_}}, sm = {"sort-map", {}}, tf = {"thread-first-all", {}}, tF = {"thread-first", {}}, tl = {"thread-last-all", {}}, tL = {"thread-last", {}}, ua = {"unwind-all", {}}, uw = {"unwind-thread", {}}}}
local vim = _G.vim local vim = _G.vim
local lsps = {"clojure_lsp", "lua_ls", "jsonls", "yamlls", "marksman", "html", "terraformls", "dockerls", "docker_compose_language_service", "bashls", "sqlls"} local lsps = {"clojure_lsp", "lua_ls", "jsonls", "yamlls", "marksman", "html", "terraformls", "dockerls", "docker_compose_language_service", "bashls", "sqlls"}
local filetype__3eformatters = {lua = {"stylua"}, sh = {"shfmt"}, python = {"ruff_organize_imports", "ruff_format"}, rust = {"rustfmt"}, toml = {"taplo"}, json = {"prettierd"}, javascript = {"prettierd"}, typescript = {"prettierd"}, jsx = {"prettierd"}, html = {"prettierd"}, css = {"prettierd"}, yaml = {"prettierd"}, markdown = {"prettierd"}, fennel = {"fnlfmt"}, sql = {"sqlfmt"}, gleam = {"gleam"}, _ = {lsp_format = "prefer"}, ["*"] = {"trim_whitespace", "trim_newlines"}} local filetype__3eformatters = {lua = {"stylua"}, sh = {"shfmt"}, python = {"ruff_organize_imports", "ruff_format"}, rust = {"rustfmt"}, toml = {"taplo"}, json = {"prettierd"}, javascript = {"prettierd"}, typescript = {"prettierd"}, jsx = {"prettierd"}, html = {"prettierd"}, css = {"prettierd"}, yaml = {"prettierd"}, markdown = {"prettierd"}, fennel = {"fnlfmt"}, sql = {"sqlfmt"}, gleam = {"gleam"}, _ = {lsp_format = "prefer"}, ["*"] = {"trim_whitespace", "trim_newlines"}}
local formatter__3epackage = {ruff_organize_imports = "ruff", ruff_format = "ruff"} local formatter__3epackage = {ruff_organize_imports = "ruff", ruff_format = "ruff"}
local disable_formatter_on_save = {fennel = true, sql = true} local disable_formatter_on_save = {fennel = true, sql = true}
local disable_formatter_auto_install = {cljfmt = true, fnlfmt = true, rustfmt = true, trim_whitespace = true, trim_newlines = true, gleam = true} local disable_formatter_auto_install = {cljfmt = true, fnlfmt = true, rustfmt = true, trim_whitespace = true, trim_newlines = true, gleam = true}
vim.lsp.enable({"clojure", "fennel-ls", "typedclojure"}) for _, lsp_lang in pairs({"clojure", "fennel-ls", "typedclojure"}) do
local function _12_(_, opts) vim.lsp.enable(lsp_lang)
end
local function _14_(_, opts)
local conform = require("conform") local conform = require("conform")
local registry = require("mason-registry") local registry = require("mason-registry")
local formatters_for_mason = {} local formatters_for_mason = {}
conform.formatters.shfmt = {prepend_args = {"-i", "2", "-ci"}} conform.formatters.shfmt = {prepend_args = {"-i", "2", "-ci"}}
local function _13_() local function _15_()
for _ft, formatters in pairs(filetype__3eformatters) do for _ft, formatters in pairs(filetype__3eformatters) do
for _idx, formatter in ipairs(formatters) do for _idx, formatter in ipairs(formatters) do
if not disable_formatter_auto_install[formatter] then if not disable_formatter_auto_install[formatter] then
@@ -67,13 +78,13 @@ local function _12_(_, opts)
end end
return nil return nil
end end
vim.schedule(_13_) vim.schedule(_15_)
vim.g.dotfiles_format_on_save = true vim.g.dotfiles_format_on_save = true
conform.setup(opts) conform.setup(opts)
vim.o.formatexpr = "v:lua.require'conform'.formatexpr()" vim.o.formatexpr = "v:lua.require'conform'.formatexpr()"
return nil return nil
end end
local function _16_() local function _18_()
if (nil == vim.b.dotfiles_format_on_save) then if (nil == vim.b.dotfiles_format_on_save) then
vim.b.dotfiles_format_on_save = false vim.b.dotfiles_format_on_save = false
else else
@@ -81,26 +92,24 @@ local function _16_()
end end
return vim.notify(("Set vim.b.dotfiles_format_on_save to " .. tostring(vim.b.dotfiles_format_on_save))) return vim.notify(("Set vim.b.dotfiles_format_on_save to " .. tostring(vim.b.dotfiles_format_on_save)))
end end
local function _18_() local function _20_()
vim.g.dotfiles_format_on_save = not vim.g.dotfiles_format_on_save vim.g.dotfiles_format_on_save = not vim.g.dotfiles_format_on_save
return vim.notify(("Set vim.g.dotfiles_format_on_save to " .. tostring(vim.g.dotfiles_format_on_save))) return vim.notify(("Set vim.g.dotfiles_format_on_save to " .. tostring(vim.g.dotfiles_format_on_save)))
end end
local function _19_(_buf) local function _21_(_buf)
if (vim.g.dotfiles_format_on_save and ((nil == vim.b.dotfiles_format_on_save) or vim.b.dotfiles_format_on_save) and not disable_formatter_on_save[vim.bo.filetype]) then if (vim.g.dotfiles_format_on_save and ((nil == vim.b.dotfiles_format_on_save) or vim.b.dotfiles_format_on_save) and not disable_formatter_on_save[vim.bo.filetype]) then
return {timeout_ms = 500, lsp_format = "fallback"} return {timeout_ms = 500, lsp_format = "fallback"}
else else
return nil return nil
end end
end end
local function _21_() local function _23_()
local caps = require("cmp_nvim_lsp").default_capabilities() local caps = require("cmp_nvim_lsp").default_capabilities()
local mlsp = require("mason-lspconfig") local mlsp = require("mason-lspconfig")
local a = require("nfnl.core") local a = require("nfnl.core")
local u = require("dotfiles.util") local u = require("dotfiles.util")
local lsp = require("vim.lsp") local lsp = require("vim.lsp")
local lspconfig = require("lspconfig")
local cmp_nvim_lsp = require("cmp_nvim_lsp") local cmp_nvim_lsp = require("cmp_nvim_lsp")
vim.lsp.enable("gleam")
local function bufmap(mode, from, to, opts) local function bufmap(mode, from, to, opts)
return u.noremap(mode, from, to, a.merge({["local?"] = true}, opts)) return u.noremap(mode, from, to, a.merge({["local?"] = true}, opts))
end end
@@ -135,24 +144,24 @@ local function _21_()
local lsp_cmd = a.first(command_mapping) local lsp_cmd = a.first(command_mapping)
local mapping = ("<leader>" .. lnmapping) local mapping = ("<leader>" .. lnmapping)
local cmd local cmd
local function _23_() local function _25_()
local opts local opts
do do
local s = "" local s = ""
for _i, opt in ipairs(a.second(command_mapping)) do for _i, opt in ipairs(a.second(command_mapping)) do
local _24_ local _26_
if ("function" == type(opt)) then if ("function" == type(opt)) then
_24_ = opt() _26_ = opt()
else else
_24_ = opt _26_ = opt
end end
s = (s .. _24_) s = (s .. _26_)
end end
opts = s opts = s
end end
return lsp_execute_command(client, lsp_cmd, opts) return lsp_execute_command(client, lsp_cmd, opts)
end end
cmd = _23_ cmd = _25_
nbufmap(mapping, cmd, {desc = ("LSP command `" .. lsp_cmd .. "`")}) nbufmap(mapping, cmd, {desc = ("LSP command `" .. lsp_cmd .. "`")})
end end
return nil return nil
@@ -168,35 +177,36 @@ local function _21_()
vim.api.nvim_set_hl(0, hlgroup, a.merge(vim.api.nvim_get_hl_by_name(base_group, true), {italic = true, foreground = "#6c71c4", background = "NONE"})) vim.api.nvim_set_hl(0, hlgroup, a.merge(vim.api.nvim_get_hl_by_name(base_group, true), {italic = true, foreground = "#6c71c4", background = "NONE"}))
end end
local group = vim.api.nvim_create_augroup("LspDocumentHighlight", {clear = true}) local group = vim.api.nvim_create_augroup("LspDocumentHighlight", {clear = true})
local function _27_() local function _29_()
return vim.lsp.buf.document_highlight() return vim.lsp.buf.document_highlight()
end end
vim.api.nvim_create_autocmd({"CursorHold", "CursorHoldI"}, {group = group, pattern = "<buffer>", callback = _27_}) vim.api.nvim_create_autocmd({"CursorHold", "CursorHoldI"}, {group = group, pattern = "<buffer>", callback = _29_})
local function _28_() local function _30_()
return vim.lsp.buf.clear_references() return vim.lsp.buf.clear_references()
end end
vim.api.nvim_create_autocmd({"CursorMoved"}, {group = group, pattern = "<buffer>", callback = _28_}) vim.api.nvim_create_autocmd({"CursorMoved"}, {group = group, pattern = "<buffer>", callback = _30_})
else else
end end
if client.server_capabilities.documentFormattingProvider then if client.server_capabilities.documentFormattingProvider then
local function _30_() local function _32_()
return require("conform").format() return require("conform").format()
end end
vim.api.nvim_create_autocmd({"BufWritePre"}, {pattern = "<buffer>", callback = _30_}) vim.api.nvim_create_autocmd({"BufWritePre"}, {pattern = "<buffer>", callback = _32_})
else else
end end
return print("LSP Client Attached.") return print("LSP Client Attached.")
end end
local function _32_(server_name) for _, config in pairs(vim.lsp.get_configs({enabled = true})) do
local server_name = config.name
vim.lsp.config(server_name, {capabilities = caps, on_attach = on_attach}) vim.lsp.config(server_name, {capabilities = caps, on_attach = on_attach})
return vim.lsp.enable(server_name) vim.lsp.enable(server_name)
end end
return mlsp.setup_handlers({_32_}) return nil
end
local function _33_()
return vim.lsp.buf.code_action()
end end
local function _34_() local function _34_()
return vim.lsp.buf.code_action()
end
local function _35_()
return require("conform").format() return require("conform").format()
end end
return {{"folke/lsp-colors.nvim"}, {"williamboman/mason.nvim", opts = {}, tag = "v1.11.0"}, {"stevearc/conform.nvim", config = _12_, dependencies = {"rcarriga/nvim-notify"}, keys = {{"<leader>tbf", _16_, desc = "Toggle buffer formatting"}, {"<leader>tgf", _18_, desc = "Toggle global formatting"}}, opts = {formatters_by_ft = filetype__3eformatters, format_on_save = _19_}}, {"williamboman/mason-lspconfig.nvim", dependencies = {"williamboman/mason.nvim"}, opts = {ensure_installed = lsps, automatic_installation = true}, tag = "v1.32.0"}, {"neovim/nvim-lspconfig", config = _21_, dependencies = {"williamboman/mason-lspconfig.nvim", "hrsh7th/cmp-nvim-lsp", "stevearc/conform.nvim", "Olical/nfnl"}, keys = {{"<leader>ca", _33_, desc = "Invoke code_action, prompting for an action to take at the cursor"}, {"<leader>fa", _34_, desc = "LSP format"}, {"<leader>rn", vim.lsp.buf.rename, desc = "LSP rename"}, {"gd", vim.lsp.buf.definition, desc = "Go to Definition"}, {"gD", vim.lsp.buf.declaration, desc = "Go to Declaration"}, {"gi", vim.lsp.buf.implementation, desc = "Go to Implementation"}, {"gr", vim.lsp.buf.references, desc = "Show References"}, {"K", vim.lsp.buf.hover, desc = "LSP Hover"}, {"[g", vim.lsp.diagnostic.goto_prev, desc = "Previous Diagnostic"}, {"]g", vim.lsp.diagnostic.goto_next, desc = "Next Diagnostic"}, {"<c-k>", vim.lsp.buf.signature_help, desc = "Signature Help"}}, lazy = false}, {"RubixDev/mason-update-all", cmd = "MasonUpdateAll", dependencies = {"williamboman/mason.nvim", "Olical/nfnl"}, main = "mason-update-all", opts = {}}} return {{"folke/lsp-colors.nvim"}, {"mason-org/mason.nvim", opts = {ui = {icons = {package_installed = "\226\156\147"}}}}, {"stevearc/conform.nvim", config = _14_, dependencies = {"rcarriga/nvim-notify"}, keys = {{"<leader>tbf", _18_, desc = "Toggle buffer formatting"}, {"<leader>tgf", _20_, desc = "Toggle global formatting"}}, opts = {formatters_by_ft = filetype__3eformatters, format_on_save = _21_}}, {"mason-org/mason-lspconfig.nvim", dependencies = {"mason-org/mason.nvim"}, opts = {ensure_installed = lsps}}, {"neovim/nvim-lspconfig", config = _23_, dependencies = {"mason-org/mason-lspconfig.nvim", "hrsh7th/cmp-nvim-lsp", "stevearc/conform.nvim", "Olical/nfnl"}, keys = {{"<leader>ca", _34_, desc = "Invoke code_action, prompting for an action to take at the cursor"}, {"<leader>fa", _35_, desc = "LSP format"}, {"<leader>rn", vim.lsp.buf.rename, desc = "LSP rename"}, {"gd", vim.lsp.buf.definition, desc = "Go to Definition"}, {"gD", vim.lsp.buf.declaration, desc = "Go to Declaration"}, {"gi", vim.lsp.buf.implementation, desc = "Go to Implementation"}, {"gr", vim.lsp.buf.references, desc = "Show References"}, {"K", vim.lsp.buf.hover, desc = "LSP Hover"}, {"[g", vim.lsp.diagnostic.goto_prev, desc = "Previous Diagnostic"}, {"]g", vim.lsp.diagnostic.goto_next, desc = "Next Diagnostic"}, {"<c-k>", vim.lsp.buf.signature_help, desc = "Signature Help"}}, lazy = false}, {"RubixDev/mason-update-all", cmd = "MasonUpdateAll", dependencies = {"mason-org/mason.nvim", "Olical/nfnl"}, main = "mason-update-all", opts = {}}}
+2
View File
@@ -0,0 +1,2 @@
-- [nfnl] fnl/plugins/mason.fnl
return {"mason-org/mason.nvim", opts = {ui = {icons = {package_installed = "\226\156\147"}}}}
@@ -1,5 +1,5 @@
-- [nfnl] fnl/plugins/smartsplits.fnl -- [nfnl] fnl/plugins/smartsplits.fnl
do local function _1_()
local smart_splits = require("smart-splits") local smart_splits = require("smart-splits")
if smart_splits then if smart_splits then
vim.keymap.set("n", "<M-S-h>", smart_splits.resize_left) vim.keymap.set("n", "<M-S-h>", smart_splits.resize_left)
@@ -13,8 +13,9 @@ do
vim.keymap.set("n", "<leader><leader>h", smart_splits.swap_buf_left) vim.keymap.set("n", "<leader><leader>h", smart_splits.swap_buf_left)
vim.keymap.set("n", "<leader><leader>j", smart_splits.swap_buf_down) vim.keymap.set("n", "<leader><leader>j", smart_splits.swap_buf_down)
vim.keymap.set("n", "<leader><leader>k", smart_splits.swap_buf_up) vim.keymap.set("n", "<leader><leader>k", smart_splits.swap_buf_up)
vim.keymap.set("n", "<leader><leader>l", smart_splits.swap_buf_right) return vim.keymap.set("n", "<leader><leader>l", smart_splits.swap_buf_right)
else else
return nil
end end
end end
return {"mrjones2014/smart-splits.nvim", lazy = false} return {"mrjones2014/smart-splits.nvim", config = _1_, lazy = false}
+2 -1
View File
@@ -14,7 +14,8 @@ util.lnnoremap("fh", "Telescope oldfiles")
util.lnnoremap("fp", "Telescope projects") util.lnnoremap("fp", "Telescope projects")
util.lnnoremap("fm", "Telescope keymaps") util.lnnoremap("fm", "Telescope keymaps")
util.lnnoremap("fM", "Telescope marks") util.lnnoremap("fM", "Telescope marks")
util.lnnoremap("ft", "Telescope filetypes") util.lnnoremap("ft", "TodoTelescope")
util.lnnoremap("fT", "Telescope filetypes")
util.lnnoremap("fq", "Telescope quickfix") util.lnnoremap("fq", "Telescope quickfix")
util.lnnoremap("fl", "Telescope loclist") util.lnnoremap("fl", "Telescope loclist")
util.lnnoremap("fsi", "Telescope lsp_implementations") util.lnnoremap("fsi", "Telescope lsp_implementations")
@@ -0,0 +1,2 @@
-- [nfnl] fnl/plugins/todo-comments.fnl
return {"folke/todo-comments.nvim", dependencies = {"nvim-lua/plenary.nvim"}, opts = {lazy = false}}
@@ -0,0 +1,13 @@
-- [nfnl] fnl/plugins/toggle-term.fnl
local function set_terminal_keymaps()
vim.keymap.set("t", "<esc>", "<C-\\><C-n>")
vim.keymap.set("t", "jk", "<C-\\><C-n>")
vim.keymap.set("t", "<C-h>", "<Cmd>wincmd h<CR>")
vim.keymap.set("t", "<C-j>", "<Cmd>wincmd j<CR>")
vim.keymap.set("t", "<C-k>", "<Cmd>wincmd k<CR>")
vim.keymap.set("t", "<C-l>", "<Cmd>wincmd l<CR>")
return vim.keymap.set("t", "<C-w>", "<C-\\><C-n><C-w>")
end
vim.api.nvim_create_user_command("SetTerminalKeymaps", set_terminal_keymaps, {})
vim.api.nvim_create_autocmd({"TermOpen"}, {pattern = "term://*", callback = set_terminal_keymaps})
return {"akinsho/toggleterm.nvim", keys = {}, lazy = false, opts = {open_mapping = "<c-\\>", start_in_insert = true, insert_mappings = true, terminal_mappings = true, persist_size = true, persist_mode = true, autochdir = true}}
+1 -7
View File
@@ -3,10 +3,4 @@ local util = require("dotfiles.util")
local function bufmap(mode, from, to) local function bufmap(mode, from, to)
return util.noremap(mode, from, to, {["local?"] = true}) return util.noremap(mode, from, to, {["local?"] = true})
end end
local function map_fugitive_keys() return {{"tpope/vim-dadbod"}, {"tpope/vim-dispatch"}, {"tpope/vim-git", lazy = false}, {"tpope/vim-pathogen"}, {"tpope/vim-rails"}, {"tpope/vim-repeat"}, {"tpope/vim-rhubarb"}, {"tpope/vim-surround"}, {"tpope/vim-unimpaired"}, {"tpope/vim-vinegar", lazy = false}}
bufmap("n", "<leader>gp", ":Git pull<CR>")
bufmap("n", "<leader>gP", ":Git push<CR>")
return bufmap("n", "<leader>gF", ":Git push -f<CR>")
end
vim.api.nvim_create_autocmd({"FileType"}, {pattern = "fugitive", callback = map_fugitive_keys})
return {{"tpope/vim-dadbod"}, {"tpope/vim-dispatch"}, {"tpope/vim-fugitive"}, {"tpope/vim-git", lazy = false}, {"tpope/vim-pathogen"}, {"tpope/vim-rails"}, {"tpope/vim-repeat"}, {"tpope/vim-rhubarb"}, {"tpope/vim-surround"}, {"tpope/vim-unimpaired"}, {"tpope/vim-vinegar", lazy = false}}
+1 -13
View File
@@ -9,16 +9,4 @@ local function _1_()
return vim.schedule(_2_) return vim.schedule(_2_)
end end
vim.api.nvim_create_autocmd("FileType", {pattern = {"*"}, callback = _1_}) vim.api.nvim_create_autocmd("FileType", {pattern = {"*"}, callback = _1_})
local function _4_() return {"nvim-treesitter/nvim-treesitter", branch = "main", build = ":TSUpdate", opts = {indent = {enable = true}, highlight = {enable = true}, folds = {enable = true}, ensure_installed = {"bash", "clojure", "diff", "elm", "fennel", "html", "javascript", "jsdoc", "json", "lua", "luadoc", "luap", "markdown", "markdown_inline", "regex", "ruby", "toml", "vim", "vimdoc", "xml", "yaml"}}}
local TS = require("nvim-treesitter")
if not TS.get_installed then
LazyVim.error("Please restart Neovim and run `:TSUpdate` to use the `nvim-treesitter` **main** branch.")
else
end
package.loaded.lazyvim.util.treesitter = nil
local function _6_()
return TS.update(nil, {summary = true})
end
return LazyVim.treesitter.build(_6_)
end
return {"nvim-treesitter/nvim-treesitter", branch = "main", build = _4_, opts = {indent = {enable = true}, highlight = {enable = true}, folds = {enable = true}, ensure_installed = {"bash", "clojure", "diff", "fennel", "html", "javascript", "jsdoc", "json", "lua", "luadoc", "luap", "markdown", "markdown_inline", "regex", "toml", "vim", "vimdoc", "xml", "yaml"}}}
@@ -0,0 +1,2 @@
-- [nfnl] fnl/plugins/whichkey.fnl
return {"folke/which-key.nvim", event = "VeryLazy"}
+9 -5
View File
@@ -3,6 +3,7 @@ unbind C-b
set -g xterm-keys on set -g xterm-keys on
set -s extended-keys on set -s extended-keys on
setw -q -g utf8 on
set -g history-file ~/.tmux_history set -g history-file ~/.tmux_history
@@ -36,9 +37,10 @@ bind L resize-pane -R 5
setw -g mouse off setw -g mouse off
# set -g default-terminal "xterm-256:color" set -g default-terminal "xterm-256:color"
# set -g default-terminal "${TERM}" # set -g default-terminal "${TERM}"
set -g default-terminal "tmux-256color" # set -g default-terminal "tmux-256color"
# set -g default-terminal "xterm-256color"
set -g history-limit 55000 set -g history-limit 55000
set -g window-status-style dim set -g window-status-style dim
@@ -52,8 +54,11 @@ set -g update-environment "DISPLAY SSH_ASKPASS SSH_AGENT_PID SSH_CONNECTION WIND
set-environment -g 'SSH_AUTH_SOCK' ~/.ssh/ssh_auth_sock set-environment -g 'SSH_AUTH_SOCK' ~/.ssh/ssh_auth_sock
# set -as terminal-overrides ',xterm-256color:RGB' # set -as terminal-overrides ',xterm-256color:RGB'
set -as terminal-features ',tmux-256color:RGB' set -as terminal-features ',xterm-256color:RGB'
set-option -sa terminal-overrides ',tmux-256color:RGB' # set -as terminal-features ',tmux-256color:RGB'
# set-option -sa terminal-overrides ',tmux-256color:RGB'
# set-option -sa terminal-overrides ',xterm-256color:RGB'
set -as terminal-overrides ",*:U8=0"
# Undercurl # Undercurl
set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm' # undercurl support set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm' # undercurl support
@@ -88,4 +93,3 @@ bind-key -T copy-mode-vi 'M-S-j' select-pane -D
bind-key -T copy-mode-vi 'M-S-k' select-pane -U bind-key -T copy-mode-vi 'M-S-k' select-pane -U
bind-key -T copy-mode-vi 'M-S-l' select-pane -R bind-key -T copy-mode-vi 'M-S-l' select-pane -R
bind-key -T copy-mode-vi 'M-S-\' select-pane -l bind-key -T copy-mode-vi 'M-S-\' select-pane -l