Compare commits

...
15 Commits
26 changed files with 359 additions and 151 deletions

No files matched your search

+5 -4
View File
@@ -1,9 +1,8 @@
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=$PATH:$HOME
export PATH=$PATH:$HOME
MANPATH=$MANPATH:/usr/local/opt/erlang/lib/erlang/man
export XDG_CONFIG_HOME=$HOME/.config
@@ -54,7 +53,7 @@ safesource ~/.bash/aliases
safesource ~/.bash_local
### Added by the Heroku Toolbelt
export PATH="/usr/local/heroku/bin:$PATH"
#export PATH="/usr/local/heroku/bin:$PATH"
function repeat() {
local count=$1
@@ -113,3 +112,5 @@ export LESS_TERMCAP_us=$'\e'"[1;32m"
[ -s "$HOME/.config/broot/launcher/bash/br" ] && source "$HOME/.config/broot/launcher/bash/br"
# source /Users/proctor/.config/broot/launcher/bash/br
#
[[ -f ~/.bashrc ]] && . ~/.bashrc
+8 -6
View File
@@ -6,16 +6,14 @@ if [[ $- != *i* ]] ; then
return
fi
# came from Aaron Lasseigne (AaronLasseigne on GitHub)
battery_status()
{
battery_status() {
HEART='♥ '
NON='\[\e[0m\]'
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)
total_charge=$(echo $battery_info | grep -o '"MaxCapacity" = [0-9]\+' | cut -d ' ' -f 3)
@@ -25,11 +23,11 @@ battery_status()
fi
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}"
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
}
@@ -41,3 +39,7 @@ export XML_CATALOG_FILES=/usr/local/etc/xml/catalog
export PATH="$PATH:$HOME/.rvm/bin"
# 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]
email = steven.proctor@gmail.com
name = Proctor
email = steven.proctor@gmail.com
[core]
editor = nvim
excludesFile = ~/.gitignore.global
[color]
ui = true
[pull]
ff = only
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f
[init]
defaultBranch = main
[alias] ; Command aliases for the git[1] command wrapper
last = cat-file commit HEAD
[diff]
algorithm = histogram
colorMoved = zebra # plain
mnemonicPrefix = true
renames = true
[branch]
autoSetupRebase = always
[checkout]
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]
conflitstyle = zdiff3
ff = only
[push]
default = current
autoSetupRemote = true
default = upstream
followTags = true
[rerere]
enabled = true
autoupdate = true
[remote]
pushDefault = origin
;; This is last, take in any other local file overrides
[include]
path = ~/.gitconfig.local ; find ".gitconfig.local" in your `$HOME` directory
[pull]
ff = only
+11 -11
View File
@@ -1,14 +1,14 @@
(local mason (require :mason))
(local mason-lspconf (require :mason-lspconfig))
(local lspconfig (require :dotfiles.plugin.lspconfig))
(fn setup []
(mason.setup {:ui {:icons {:package_installed "✓"}}})
(when mason-lspconf
(mason-lspconf.setup {:ensure_installed [:lua_ls] :automatic_enable true})
(lspconfig.setup-handlers (mason-lspconf.get_installed_servers))))
(setup)
; (local mason (require :mason))
; (local mason-lspconf (require :mason-lspconfig))
; (local lspconfig (require :dotfiles.plugin.lspconfig))
;
; (fn setup []
; (mason.setup {:ui {:icons {:package_installed "✓"}}})
; (when mason-lspconf
; (mason-lspconf.setup {:ensure_installed [:lua_ls] :automatic_enable true})
; (lspconfig.setup-handlers (mason-lspconf.get_installed_servers))))
;
; (setup)
;; (mason.setup)
;;
;; (when-let [mason-lspconfig (require :mason-lspconfig)]
+14 -4
View File
@@ -1,3 +1,5 @@
(import-macros {: tx} :config.macros)
(local u (require :dotfiles.util))
(var unzoom! nil)
@@ -9,10 +11,18 @@
(set unzoom! nil))
(do
(set unzoom! (vim.fn.winrestcmd))
(vim.fn.resize)
(vim.fn.vertical :resize))))
(vim.cmd.resize)
(vim.cmd.resize {:mods {:vertical true}}))))
(vim.api.nvim_create_user_command :ZoomToggle zoom-toggle {})
(u.nnoremap :<M-z> ":call ZoomToggle()<CR>")
(u.tnoremap :<M-z> "<c-\\><c-n>:call ZoomToggle()<CR>")
;; (u.nnoremap :<M-z> ":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] })]] ))
+23 -3
View File
@@ -5,13 +5,33 @@
; (set nvim.g.conjure#eval#result_register "*")
; (set nvim.g.conjure#log#botright true)
(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#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]
;; (core.concat (conjure-config.filetypes) [:markdown]))
;; (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"})]})
+12 -33
View File
@@ -5,8 +5,7 @@
(vim.diagnostic.config {:signs {:text {vim.diagnostic.severity.ERROR "☢️"
vim.diagnostic.severity.WARN "⚠️"
vim.diagnostic.severity.INFO "ℹ️"
vim.diagnostic.severity.HINT "🔎"
}
vim.diagnostic.severity.HINT "🔎"}
;; :linehl {vim.diagnostic.severity.ERROR :ErrorMsg}
;; :numhl {vim.diagnostic.severity.WARN :WarningMsg}
}})
@@ -135,10 +134,11 @@
:trim_newlines 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 :williamboman/mason.nvim {:tag :v1.11.0 :opts {}})
(tx :mason-org/mason.nvim {:opts {:ui {:icons {:package_installed "✓"}}}})
(tx :stevearc/conform.nvim
{:dependencies [:rcarriga/nvim-notify]
:opts {;;:default_format_opts {:lsp_format :fallback}
@@ -190,13 +190,12 @@
(vim.notify (.. "Set vim.g.dotfiles_format_on_save to "
(tostring vim.g.dotfiles_format_on_save))))
{:desc "Toggle global formatting"})]})
(tx :williamboman/mason-lspconfig.nvim
{:tag :v1.32.0
:dependencies [:williamboman/mason.nvim]
:opts {:ensure_installed lsps :automatic_installation true}})
(tx :mason-org/mason-lspconfig.nvim
{:dependencies [:mason-org/mason.nvim]
:opts {:ensure_installed lsps}})
(tx :neovim/nvim-lspconfig
{:lazy false
:dependencies [:williamboman/mason-lspconfig.nvim
:dependencies [:mason-org/mason-lspconfig.nvim
:hrsh7th/cmp-nvim-lsp
:stevearc/conform.nvim
:Olical/nfnl]
@@ -231,8 +230,6 @@
u (require :dotfiles.util)
lsp (require :vim.lsp)
cmp_nvim_lsp (require :cmp_nvim_lsp)]
(vim.lsp.enable :gleam)
(fn bufmap [mode from to opts]
(u.noremap mode from to (a.merge {:local? true} opts)))
@@ -324,32 +321,14 @@
:format)))}))
(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
{:capabilities caps
: on_attach})
(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"))
}))))})
(vim.lsp.enable server-name)))))})
(tx :RubixDev/mason-update-all {:cmd :MasonUpdateAll
:dependencies [:williamboman/mason.nvim
:dependencies [:mason-org/mason.nvim
:Olical/nfnl]
:main :mason-update-all
:opts {}})]
+11 -7
View File
@@ -1,6 +1,8 @@
(import-macros {: tx} :config.macros)
(tx :mrjones2014/smart-splits.nvim
{:lazy false
:config (fn []
(let [smart-splits (require :smart-splits)]
(when smart-splits
;; recommended mappings
@@ -15,9 +17,11 @@
(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-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>j smart-splits.swap_buf_down)
(vim.keymap.set :n :<leader><leader>k smart-splits.swap_buf_up)
(vim.keymap.set :n :<leader><leader>l smart-splits.swap_buf_right)))
(tx :mrjones2014/smart-splits.nvim {:lazy false})
(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>k
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 :fm "Telescope keymaps")
(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 :fl "Telescope loclist")
(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}})
+7 -7
View File
@@ -6,17 +6,17 @@
(fn bufmap [mode from to] (util.noremap mode from to {:local? true}))
(fn map-fugitive-keys []
(bufmap :n :<leader>gp ":Git pull<CR>")
(bufmap :n :<leader>gP ":Git push<CR>")
(bufmap :n :<leader>gF ":Git push -f<CR>"))
; (fn map-fugitive-keys []
; (bufmap :n :<leader>gp ":Git pull<CR>")
; (bufmap :n :<leader>gP ":Git push<CR>")
; (bufmap :n :<leader>gF ":Git push -f<CR>"))
(vim.api.nvim_create_autocmd [:FileType]
{:pattern :fugitive :callback map-fugitive-keys})
; (vim.api.nvim_create_autocmd [:FileType]
; {:pattern :fugitive :callback map-fugitive-keys})
[(tx :tpope/vim-dadbod {})
(tx :tpope/vim-dispatch {})
(tx :tpope/vim-fugitive {})
; (tx :tpope/vim-fugitive {})
(tx :tpope/vim-git {:lazy false})
(tx :tpope/vim-pathogen {})
(tx :tpope/vim-rails {})
+14 -14
View File
@@ -1,24 +1,24 @@
local execute = vim.api.nvim_command
local fn = vim.fn
require 'config.lazy'
require("config.lazy")
local pack_path = fn.stdpath("data") .. "/site/pack"
local fmt = string.format
-- local pack_path = fn.stdpath("data") .. "/site/pack"
-- local fmt = string.format
function ensure(user, repo)
-- 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)
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("packadd %s", repo))
end
end
-- function ensure(user, repo)
-- -- 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)
-- 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("packadd %s", repo))
-- end
-- end
-- Bootstrap essential plugins required for installing and loading the rest.
ensure("wbthomason", "packer.nvim")
-- ensure("wbthomason", "packer.nvim")
-- ensure("Olical", "aniseed")
ensure("lifepillar", "vim-solarized8")
-- ensure("lifepillar", "vim-solarized8")
-- Enable Aniseed's automatic compilation and loading of Fennel source code.
-- vim.g["aniseed#env"] = {
@@ -26,4 +26,4 @@ ensure("lifepillar", "vim-solarized8")
-- compile = true
-- }
--
require 'dotfiles.init'
require("dotfiles.init")
+23 -17
View File
@@ -1,44 +1,50 @@
{
"asyncrun.vim": { "branch": "master", "commit": "98d3c0fdeb983f0ef62fe3a49da440f6d2c045ce" },
"baleia.nvim": { "branch": "main", "commit": "710537ff5cd669c5a76c5f5b6a9169fd9b913d18" },
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
"cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" },
"cmp-conjure": { "branch": "master", "commit": "8c9a88efedc0e5bf3165baa6af8a407afe29daf6" },
"cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
"cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
"conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" },
"conjure": { "branch": "main", "commit": "5dddccee789f65606387c991f5efadea7af52cb7" },
"codediff.nvim": { "branch": "main", "commit": "7608f3b436ce1f84a4888f75e53079caa981a2e9" },
"conform.nvim": { "branch": "master", "commit": "619363c30309d29ffa631e67c8183f2a72caa373" },
"conjure": { "branch": "main", "commit": "16b436c0124dae26250986fd4e660529d6bb14f0" },
"fennel.vim": { "branch": "main", "commit": "0a5c89e7f31d2721a36f7043ee98e24e22e6325e" },
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
"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.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "9d6826582a3e8c84787bd7355df22a2812a1ad59" },
"nfnl": { "branch": "main", "commit": "f39a7ec6fe0ace2b2ea108ce04d954549e36c76d" },
"mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "ebd66767191714e008ce73b769518a763ff31bdc" },
"neogit": { "branch": "master", "commit": "43ea1a0854052e583f647e0b35879f0158a70a78" },
"nfnl": { "branch": "main", "commit": "ac0177c5549df7abba7a19554c18a7765386c894" },
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
"nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
"nvim-autopairs": { "branch": "master", "commit": "7b9923abad60b903ece7c52940e1321d39eccc79" },
"nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" },
"nvim-lspconfig": { "branch": "master", "commit": "46204c8fdaa36a9aa3768780450e4bc7a210025f" },
"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-treesitter": { "branch": "main", "commit": "6620ae1c44dfa8623b22d0cbf873a9e8d073b849" },
"nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" },
"nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
"nvim-web-devicons": { "branch": "master", "commit": "dfbfaa967a6f7ec50789bead7ef87e336c1fa63c" },
"paredit": { "branch": "master", "commit": "60203e50698ed2211b4434a66ab2258a1a6ac3b5" },
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
"plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
"rainbow-delimiters.nvim": { "branch": "master", "commit": "607a438d8c647a355749973fd295e33505afafde" },
"smart-splits.nvim": { "branch": "master", "commit": "96afd5d3b029ac354aaa369fb33b4613a0bbf2f0" },
"telescope.nvim": { "branch": "master", "commit": "3333a52ff548ba0a68af6d8da1e54f9cd96e9179" },
"rainbow-delimiters.nvim": { "branch": "master", "commit": "a798325b7f36acc62741d1029930a7b96d4dd4bf" },
"smart-splits.nvim": { "branch": "master", "commit": "c02d70257e5d6065d4154acd596ec8054a725724" },
"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-dispatch": { "branch": "master", "commit": "a2ff28abdb2d89725192db5b8562977d392a4d3f" },
"vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" },
"vim-git": { "branch": "master", "commit": "485e38f29494e46a9998100e707c755d114155f1" },
"vim-gitgutter": { "branch": "main", "commit": "55b368d4c68541775b4b253d3c98d3145b695c24" },
"vim-gitgutter": { "branch": "main", "commit": "21c977e8597c468c7dc76001389b0b430d46a4b0" },
"vim-pathogen": { "branch": "master", "commit": "ac4dd9494fa9008754e49dff85bff1b5746c89b4" },
"vim-rails": { "branch": "master", "commit": "b0a5c76f86ea214ade36ab0b811e730c3f0add67" },
"vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
"vim-rhubarb": { "branch": "master", "commit": "5496d7c94581c4c9ad7430357449bb57fc59f501" },
"vim-solarized8": { "branch": "neovim", "commit": "1d05915cc9050ce1a8a6b94d8c2e48ead197c756" },
"vim-solarized8": { "branch": "neovim", "commit": "4ef98a611553a8093ae9e5af078ef6f94071e886" },
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
"vim-unimpaired": { "branch": "master", "commit": "db65482581a28e4ccf355be297f1864a4e66985c" },
"vim-vinegar": { "branch": "master", "commit": "bb1bcddf43cfebe05eb565a84ab069b357d0b3d6" },
@@ -1,14 +1,2 @@
-- [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
else
unzoom_21 = vim.fn.winrestcmd()
vim.fn.resize()
return vim.fn.vertical("resize")
vim.cmd.resize()
return vim.cmd.resize({mods = {vertical = true}})
end
end
vim.api.nvim_create_user_command("ZoomToggle", zoom_toggle, {})
u.nnoremap("<M-z>", ":call ZoomToggle()<CR>")
return u.tnoremap("<M-z>", "<c-\\><c-n>:call ZoomToggle()<CR>")
local wk = require("which-key")
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"}}}})
+32 -1
View File
@@ -1,6 +1,37 @@
-- [nfnl] fnl/plugins/conjure.fnl
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#extract#tree_sitter#enabled"] = true
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}
+10 -8
View File
@@ -51,7 +51,9 @@ local filetype__3eformatters = {lua = {"stylua"}, sh = {"shfmt"}, python = {"ruf
local formatter__3epackage = {ruff_organize_imports = "ruff", ruff_format = "ruff"}
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}
vim.lsp.enable({"clojure", "fennel-ls", "typedclojure"})
for _, lsp_lang in pairs({"clojure", "fennel-ls", "typedclojure"}) do
vim.lsp.enable(lsp_lang)
end
local function _14_(_, opts)
local conform = require("conform")
local registry = require("mason-registry")
@@ -108,7 +110,6 @@ local function _23_()
local u = require("dotfiles.util")
local lsp = require("vim.lsp")
local cmp_nvim_lsp = require("cmp_nvim_lsp")
vim.lsp.enable("gleam")
local function bufmap(mode, from, to, opts)
return u.noremap(mode, from, to, a.merge({["local?"] = true}, opts))
end
@@ -195,16 +196,17 @@ local function _23_()
end
return print("LSP Client Attached.")
end
local function _34_(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})
return vim.lsp.enable(server_name)
vim.lsp.enable(server_name)
end
return mlsp.setup_handlers({_34_})
return nil
end
local function _35_()
local function _34_()
return vim.lsp.buf.code_action()
end
local function _36_()
local function _35_()
return require("conform").format()
end
return {{"folke/lsp-colors.nvim"}, {"williamboman/mason.nvim", opts = {}, tag = "v1.11.0"}, {"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_}}, {"williamboman/mason-lspconfig.nvim", dependencies = {"williamboman/mason.nvim"}, opts = {ensure_installed = lsps, automatic_installation = true}, tag = "v1.32.0"}, {"neovim/nvim-lspconfig", config = _23_, dependencies = {"williamboman/mason-lspconfig.nvim", "hrsh7th/cmp-nvim-lsp", "stevearc/conform.nvim", "Olical/nfnl"}, keys = {{"<leader>ca", _35_, desc = "Invoke code_action, prompting for an action to take at the cursor"}, {"<leader>fa", _36_, 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
do
local function _1_()
local smart_splits = require("smart-splits")
if smart_splits then
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>j", smart_splits.swap_buf_down)
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
return nil
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("fm", "Telescope keymaps")
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("fl", "Telescope loclist")
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}}
+1 -7
View File
@@ -3,10 +3,4 @@ local util = require("dotfiles.util")
local function bufmap(mode, from, to)
return util.noremap(mode, from, to, {["local?"] = true})
end
local function map_fugitive_keys()
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}}
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}}