Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ nvim: | directories
touch $(HOME)/.localnvim.lua; \
ln -sfv $(DOTFILES)/nvim $(HOME)/.config; \
$(call print_step,Syncing Neovim plugins); \
nvim --headless "+Lazy! sync" +qa; \
nvim --headless "+lua vim.pack.update()" "+qa" \

.PHONY: _git
_git: ## Configure Git with completion and dotfiles
Expand Down
4 changes: 2 additions & 2 deletions autoloaded/update
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ neovim_plug_update() {
if [[ -d "$HOME/.fzf/" ]]; then
(cd $HOME/.fzf && git pull && ./install --bin)
fi
nvim --headless "+Lazy! sync" +TSUpdateSync +qa;
nvim --headless foo "+MasonUpdate" +qa;
nvim --headless "+lua vim.pack.update()" "+qa"
nvim --headless foo "+MasonUpdate" "+qa";
}

mas_update() {
Expand Down
5 changes: 3 additions & 2 deletions nvim/init.lua
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
pcall(vim.loader.enable)

require "options"
require "keymaps"
require "plugin_manager"
require "autocommands"
require "lsp"
vim.cmd.packadd "nvim.undotree"

local localnvim = os.getenv "HOME" .. "/.localnvim.lua"
if vim.fn.filereadable(localnvim) then
Expand Down
25 changes: 0 additions & 25 deletions nvim/lazy-lock.json

This file was deleted.

5 changes: 5 additions & 0 deletions nvim/lua/keymaps.lua
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ vim.keymap.set(

-- replace word with text in register "0
vim.keymap.set("n", "<Leader>pr", [[viw"0p]], { noremap = true })
vim.keymap.set("n", "<Leader>Pu", ":PackUpdate<CR>", { silent = true, desc = "pack update" })
vim.keymap.set("n", "<Leader>PU", ":PackUpdate!<CR>", { silent = true, desc = "pack update now" })
vim.keymap.set("n", "<Leader>Ps", ":PackStatus<CR>", { silent = true, desc = "pack status" })
vim.keymap.set("n", "<Leader>PS", ":PackSync<CR>", { silent = true, desc = "pack sync lockfile" })
vim.keymap.set("n", "<Leader>Pc", ":PackClean<CR>", { silent = true, desc = "pack clean" })
-- Switch CWD to the directory of the open buffer
vim.keymap.set("", "<Leader>cd", ":cd %:p:h<CR>:pwd<CR>", {})
-- Close quickfix window (,qq)
Expand Down
24 changes: 24 additions & 0 deletions nvim/lua/pack_helpers.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
local M = {}

function M.gh(repo)
return "https://github.com/" .. repo
end

function M.notify(msg, level)
vim.notify(msg, level or vim.log.levels.ERROR, { title = "vim.pack" })
end

function M.add_runtime(path)
local normalized = vim.fs.normalize(vim.fn.expand(path))
if not vim.uv.fs_stat(normalized) then
return nil
end

if not vim.tbl_contains(vim.opt.runtimepath:get(), normalized) then
vim.opt.runtimepath:append(normalized)
end

return normalized
end

return M
38 changes: 0 additions & 38 deletions nvim/lua/plugin_manager.lua

This file was deleted.

179 changes: 0 additions & 179 deletions nvim/lua/plugins/blink.lua

This file was deleted.

32 changes: 0 additions & 32 deletions nvim/lua/plugins/conform.lua

This file was deleted.

Loading