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
14 changes: 12 additions & 2 deletions bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,15 @@ install_dependencies() {
fi

apt_get update
apt_get install -y fzf fd-find ripgrep lua5.1 bat
apt_get install -y neovim fzf fd-find ripgrep lua5.1 bat
;;
"macos")
if ! command -v brew >/dev/null 2>&1; then
echo "error: Homebrew is required on macOS. Install it from https://brew.sh/"
exit 1
fi

brew install fzf fd ripgrep lua bat
brew install neovim fzf fd ripgrep lua bat
;;
*)
echo "error: dependency installation is only supported on Ubuntu and macOS"
Expand All @@ -106,6 +106,15 @@ install_dependencies() {
esac
}

bootstrap_neovim() {
if ! command -v nvim >/dev/null 2>&1; then
echo "warning: nvim not found, skipping Neovim bootstrap"
return
fi

nvim --headless "+qa"
}

bootstrap_dotfiles() {
ensure_dir "$CONF"

Expand Down Expand Up @@ -154,6 +163,7 @@ case "$COMMAND" in
"bootstrap")
install_dependencies
bootstrap_dotfiles
bootstrap_neovim
echo "bootstrap completed"
;;
"deps"|"install-deps")
Expand Down
1 change: 0 additions & 1 deletion vim/my.nvim/lazy-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
"mynvim": { "branch": "master", "commit": "a2539d211f0f41a4301220d2b95de9360ba5ab47" },
"nerdcommenter": { "branch": "master", "commit": "02a3b6455fa07b61b9440a78732f1e9b7876c991" },
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
"nvim-coverage": { "branch": "main", "commit": "a939e425e363319d952a6c35fb3f38b34041ded2" },
Expand Down
1 change: 0 additions & 1 deletion vim/my.nvim/lua/setup.lua
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ local function ensure_plugins(dir)
"patstockwell/vim-monokai-tasty",
"unblevable/quick-scope",
{[1] = "beardnick/vim-bookmarks", branch = "feature-relative-path"},
{[1] = "beardnick/mynvim", build = "make"},
"tpope/vim-fugitive",
"ilyachur/cmake4vim",
"ojroques/nvim-osc52",
Expand Down
7 changes: 5 additions & 2 deletions vim/my.nvim/ui/banner.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
vim.g.startify_padding_left = 10

if vim.fn.exists("*startify#pad") == 1 then
vim.g.startify_custom_header = vim.fn["startify#pad"](vim.g.mynvim_banner)
if type(vim.g.mynvim_banner) == "table" then
local padding = string.rep(" ", vim.g.startify_padding_left or 0)
vim.g.startify_custom_header = vim.tbl_map(function(line)
return padding .. line
end, vim.g.mynvim_banner)
end
Loading