Compare commits

...
4 Commits
Author SHA1 Message Date
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
5 changed files with 56 additions and 51 deletions

No files matched your search

+3 -2
View File
@@ -2,8 +2,9 @@ shopt -s globstar
[[ -f ~/.bashrc ]] && . ~/.bashrc [[ -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
@@ -54,7 +55,7 @@ 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
+25 -21
View File
@@ -1,23 +1,27 @@
(import-macros {: tx} :config.macros) (import-macros {: tx} :config.macros)
(tx :mrjones2014/smart-splits.nvim
(let [smart-splits (require :smart-splits)] {:lazy false
(when smart-splits :config (fn []
;; recommended mappings (let [smart-splits (require :smart-splits)]
;; resizing splits (when smart-splits
;; these keymaps will also accept a range, ;; recommended mappings
;; for example `10<A-h>` will `resize_left` by `(10 * config.default_amount)` ;; resizing splits
(vim.keymap.set :n :<M-S-h> smart-splits.resize_left) ;; these keymaps will also accept a range,
(vim.keymap.set :n :<M-S-j> smart-splits.resize_down) ;; for example `10<A-h>` will `resize_left` by `(10 * config.default_amount)`
(vim.keymap.set :n :<M-S-k> smart-splits.resize_up) (vim.keymap.set :n :<M-S-h> smart-splits.resize_left)
(vim.keymap.set :n :<M-S-l> smart-splits.resize_right) ; ; moving between splits (vim.keymap.set :n :<M-S-j> smart-splits.resize_down)
(vim.keymap.set :n :<M-h> smart-splits.move_cursor_left) (vim.keymap.set :n :<M-S-k> smart-splits.resize_up)
(vim.keymap.set :n :<M-j> smart-splits.move_cursor_down) (vim.keymap.set :n :<M-S-l> smart-splits.resize_right) ; ; moving between splits
(vim.keymap.set :n :<M-k> smart-splits.move_cursor_up) (vim.keymap.set :n :<M-h> smart-splits.move_cursor_left)
(vim.keymap.set :n :<M-l> smart-splits.move_cursor_right) ; ; swapping buffers between windows (vim.keymap.set :n :<M-j> smart-splits.move_cursor_down)
(vim.keymap.set :n :<leader><leader>h smart-splits.swap_buf_left) (vim.keymap.set :n :<M-k> smart-splits.move_cursor_up)
(vim.keymap.set :n :<leader><leader>j smart-splits.swap_buf_down) (vim.keymap.set :n :<M-l> smart-splits.move_cursor_right) ; ; swapping buffers between windows
(vim.keymap.set :n :<leader><leader>k smart-splits.swap_buf_up) (vim.keymap.set :n :<leader><leader>h
(vim.keymap.set :n :<leader><leader>l smart-splits.swap_buf_right))) smart-splits.swap_buf_left)
(vim.keymap.set :n :<leader><leader>j
(tx :mrjones2014/smart-splits.nvim {:lazy false}) 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))))})
+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")
+10 -11
View File
@@ -6,34 +6,33 @@
"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" }, "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" },
"conjure": { "branch": "main", "commit": "5dddccee789f65606387c991f5efadea7af52cb7" }, "conjure": { "branch": "main", "commit": "f66b3e7f45d325bd556cd785502761e583971920" },
"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": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
"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": "fc98833b6da5de5a9c5b1446ac541577059555be" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "9d6826582a3e8c84787bd7355df22a2812a1ad59" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "84c75e7a7e443586f60508d12fc50f90d9aee14e" },
"nfnl": { "branch": "main", "commit": "f39a7ec6fe0ace2b2ea108ce04d954549e36c76d" }, "nfnl": { "branch": "main", "commit": "ac0177c5549df7abba7a19554c18a7765386c894" },
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
"nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
"nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" }, "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" },
"nvim-lspconfig": { "branch": "master", "commit": "46204c8fdaa36a9aa3768780450e4bc7a210025f" }, "nvim-lspconfig": { "branch": "master", "commit": "8a9378a822719346a0288fa004dab302ca3c0a8f" },
"nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
"nvim-treesitter": { "branch": "main", "commit": "6620ae1c44dfa8623b22d0cbf873a9e8d073b849" }, "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
"nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" }, "nvim-web-devicons": { "branch": "master", "commit": "c72328a5494b4502947a022fe69c0c47e53b6aa6" },
"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": "607a438d8c647a355749973fd295e33505afafde" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "aab6caaffd79b8def22ec4320a5344f7c42f58d2" },
"smart-splits.nvim": { "branch": "master", "commit": "96afd5d3b029ac354aaa369fb33b4613a0bbf2f0" }, "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" },
"telescope.nvim": { "branch": "master", "commit": "3333a52ff548ba0a68af6d8da1e54f9cd96e9179" },
"toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" }, "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-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" },
"vim-git": { "branch": "master", "commit": "485e38f29494e46a9998100e707c755d114155f1" }, "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-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" },
@@ -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}