Compare commits
3 commits
8f3f0b5f64
...
be68302a3b
Author | SHA1 | Date | |
---|---|---|---|
be68302a3b | |||
14686dbe2f | |||
86fbd8909d |
11 changed files with 84 additions and 56 deletions
|
@ -30,14 +30,18 @@ install-astronvim(){
|
||||||
mv ~/.config/nvim ~/.config/nvim.bak-$(date +'%s')
|
mv ~/.config/nvim ~/.config/nvim.bak-$(date +'%s')
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -d ~/.local/share/nvim/site ]]; then
|
if [[ -d ~/.local/share/nvim ]]; then
|
||||||
echo "backing up old nvim site directory"
|
echo "backing up old nvim directory"
|
||||||
mv ~/.local/share/nvim/site ~/.local/share/nvim/site.bak-$(date +'%s')
|
mv ~/.local/share/nvim ~/.local/share/nvim-$(date +'%s')
|
||||||
|
mkdir ~/.local/share/nvim
|
||||||
fi
|
fi
|
||||||
|
|
||||||
git clone https://github.com/AstroNvim/AstroNvim ~/.config/nvim
|
git clone https://github.com/AstroNvim/AstroNvim ~/.config/nvim
|
||||||
nvim +PackerSync
|
|
||||||
|
|
||||||
|
echo "add brute force method of ignoring version complaints"
|
||||||
|
git -C "$HOME/.config/nvim" am "$HOME/.config/astronvim/patches/0001-remove-version-check.patch"
|
||||||
|
|
||||||
|
nvim --headless -c 'autocmd User PackerComplete quitall'
|
||||||
}
|
}
|
||||||
|
|
||||||
echo "Checking for optional dependencies"
|
echo "Checking for optional dependencies"
|
||||||
|
@ -52,6 +56,9 @@ check-dep(){
|
||||||
|
|
||||||
install-astronvim
|
install-astronvim
|
||||||
|
|
||||||
|
echo
|
||||||
|
echo "checking for dependencies"
|
||||||
|
|
||||||
for dep in "${deps[@]}"; do
|
for dep in "${deps[@]}"; do
|
||||||
check-dep "$dep"
|
check-dep "$dep"
|
||||||
done
|
done
|
|
@ -0,0 +1 @@
|
||||||
|
return "catppuccin"
|
|
@ -1,15 +1,22 @@
|
||||||
return {
|
return {
|
||||||
--Big-money
|
-- Ansi-shadow
|
||||||
[[ /$$ ]],
|
[[ ███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗]],
|
||||||
[[ |__/ ]],
|
[[ ████╗ ██║██╔════╝██╔═══██╗██║ ██║██║████╗ ████║]],
|
||||||
[[ /$$$$$$$ /$$$$$$ /$$$$$$ /$$ /$$ /$$ /$$$$$$/$$$$ ]],
|
[[ ██╔██╗ ██║█████╗ ██║ ██║██║ ██║██║██╔████╔██║]],
|
||||||
[[| $$__ $$ /$$__ $$ /$$__ $$| $$ /$$/| $$| $$_ $$_ $$]],
|
[[ ██║╚██╗██║██╔══╝ ██║ ██║╚██╗ ██╔╝██║██║╚██╔╝██║]],
|
||||||
[[| $$ \ $$| $$$$$$$$| $$ \ $$ \ $$/$$/ | $$| $$ \ $$ \ $$]],
|
[[ ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║]],
|
||||||
[[| $$ | $$| $$_____/| $$ | $$ \ $$$/ | $$| $$ | $$ | $$]],
|
[[ ╚═╝ ╚═══╝╚══════╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝]],
|
||||||
[[| $$ | $$| $$$$$$$| $$$$$$/ \ $/ | $$| $$ | $$ | $$]],
|
|
||||||
[[|__/ |__/ \_______/ \______/ \_/ |__/|__/ |__/ |__/]],
|
|
||||||
}
|
}
|
||||||
|
--Big-money
|
||||||
|
-- [[ /$$ ]],
|
||||||
|
-- [[ |__/ ]],
|
||||||
|
-- [[ /$$$$$$$ /$$$$$$ /$$$$$$ /$$ /$$ /$$ /$$$$$$/$$$$ ]],
|
||||||
|
-- [[| $$__ $$ /$$__ $$ /$$__ $$| $$ /$$/| $$| $$_ $$_ $$]],
|
||||||
|
-- [[| $$ \ $$| $$$$$$$$| $$ \ $$ \ $$/$$/ | $$| $$ \ $$ \ $$]],
|
||||||
|
-- [[| $$ | $$| $$_____/| $$ | $$ \ $$$/ | $$| $$ | $$ | $$]],
|
||||||
|
-- [[| $$ | $$| $$$$$$$| $$$$$$/ \ $/ | $$| $$ | $$ | $$]],
|
||||||
|
-- [[|__/ |__/ \_______/ \______/ \_/ |__/|__/ |__/ |__/]],
|
||||||
|
--
|
||||||
-- [[ _______________________________________ ]],
|
-- [[ _______________________________________ ]],
|
||||||
-- [[ |,---"-----------------------------"---,| ]],
|
-- [[ |,---"-----------------------------"---,| ]],
|
||||||
-- [[ ||___ 16 bit.................... || ]],
|
-- [[ ||___ 16 bit.................... || ]],
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
local config = {
|
|
||||||
colorscheme = "catppuccin",
|
|
||||||
|
|
||||||
-- This function is run last and is a good place to configuring
|
|
||||||
-- augroups/autocommands and custom filetypes also this just pure lua so
|
|
||||||
-- anything that doesn't fit in the normal config locations above can go here
|
|
||||||
polish = function()
|
|
||||||
-- todo: convert to lua
|
|
||||||
vim.cmd('cnoremap sudow w !sudo tee % >/dev/null')
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
|
|
||||||
return config
|
|
19
home/private_dot_config/astronvim/lua/user/options.lua
Normal file
19
home/private_dot_config/astronvim/lua/user/options.lua
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
-- from https://code.mehalter.com/projects/68/files-- from https://code.mehalter.com/projects/68/files
|
||||||
|
return {
|
||||||
|
opt = {
|
||||||
|
conceallevel = 2, -- enable conceal
|
||||||
|
foldenable = false,
|
||||||
|
foldexpr = "nvim_treesitter#foldexpr()", -- set Treesitter based folding
|
||||||
|
foldmethod = "expr",
|
||||||
|
linebreak = true, -- linebreak soft wrap at words
|
||||||
|
list = true, -- show whitespace characters
|
||||||
|
listchars = { tab = "│→", extends = "⟩", precedes = "⟨", trail = "·", nbsp = "␣" },
|
||||||
|
showbreak = "↪ ",
|
||||||
|
spellfile = vim.fn.expand "~/.config/astronvim/lua/user/spell/en.utf-8.add",
|
||||||
|
thesaurus = vim.fn.expand "~/.config/astronvim/lua/user/spell/mthesaur.txt",
|
||||||
|
wrap = true, -- soft wrap lines
|
||||||
|
},
|
||||||
|
g = {
|
||||||
|
matchup_matchparen_deferred = 1,
|
||||||
|
},
|
||||||
|
}
|
|
@ -6,29 +6,11 @@ return {
|
||||||
},
|
},
|
||||||
ft = { "quarto" },
|
ft = { "quarto" },
|
||||||
},
|
},
|
||||||
{ 'xiyaowong/nvim-transparent',
|
|
||||||
config = function()
|
|
||||||
-- todo: move to separate file
|
|
||||||
require("transparent").setup({
|
|
||||||
enable = true, -- boolean: enable transparent
|
|
||||||
extra_groups = { -- table/string: additional groups that should be cleared
|
|
||||||
-- In particular, when you set it to 'all', that means all available groups
|
|
||||||
-- example of akinsho/nvim-bufferline.lua
|
|
||||||
"BufferLineTabClose",
|
|
||||||
"BufferlineBufferSelected",
|
|
||||||
"BufferLineFill",
|
|
||||||
"BufferLineBackground",
|
|
||||||
"BufferLineSeparator",
|
|
||||||
"BufferLineIndicatorSelected",
|
|
||||||
},
|
|
||||||
exclude = {}, -- table: groups you don't want to clear
|
|
||||||
})
|
|
||||||
end
|
|
||||||
},
|
|
||||||
{ "catppuccin/nvim", as = "catppuccin",
|
{ "catppuccin/nvim", as = "catppuccin",
|
||||||
config = function()
|
config = function()
|
||||||
require("catppuccin").setup {}
|
require("catppuccin").setup {}
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
{ 'LnL7/vim-nix' },
|
{ 'LnL7/vim-nix' },
|
||||||
|
{ 'lambdalisue/suda.vim' }, -- for sudo reading and writing
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
return function(config)
|
|
||||||
-- for compatability with nvim-transparent
|
|
||||||
config.background_color = "#000000"
|
|
||||||
return config
|
|
||||||
end
|
|
5
home/private_dot_config/astronvim/lua/user/polish.lua
Normal file
5
home/private_dot_config/astronvim/lua/user/polish.lua
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
return function()
|
||||||
|
vim.cmd [[
|
||||||
|
autocmd BufNewFile,BufRead Knitfile set syntax=lua
|
||||||
|
]]
|
||||||
|
end
|
|
@ -0,0 +1,26 @@
|
||||||
|
From ddbb42f330a8d09980c812f5c05b6d8123a767ea Mon Sep 17 00:00:00 2001
|
||||||
|
From: Daylin Morgan <daylinmorgan@gmail.com>
|
||||||
|
Date: Mon, 28 Nov 2022 18:47:52 -0600
|
||||||
|
Subject: [PATCH] remove version check
|
||||||
|
|
||||||
|
---
|
||||||
|
init.lua | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/init.lua b/init.lua
|
||||||
|
index 2bf8f14..649f5f5 100644
|
||||||
|
--- a/init.lua
|
||||||
|
+++ b/init.lua
|
||||||
|
@@ -16,6 +16,6 @@ end
|
||||||
|
|
||||||
|
astronvim.conditional_func(astronvim.user_plugin_opts("polish", nil, false))
|
||||||
|
|
||||||
|
-if vim.fn.has "nvim-0.8" ~= 1 or vim.version().prerelease then
|
||||||
|
- vim.schedule(function() astronvim.notify("Unsupported Neovim Version! Please check the requirements", "error") end)
|
||||||
|
-end
|
||||||
|
+-- if vim.fn.has "nvim-0.8" ~= 1 or vim.version().prerelease then
|
||||||
|
+ -- vim.schedule(function() astronvim.notify("Unsupported Neovim Version! Please check the requirements", "error") end)
|
||||||
|
+-- end
|
||||||
|
--
|
||||||
|
2.38.1
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
package.path = os.getenv("HOME") .. '/.config/xplr/lua/?.lua'
|
package.path = os.getenv("HOME") .. '/.config/xplr/lua/?.lua'
|
||||||
require("plugins")
|
require("plugins")
|
||||||
|
|
||||||
version = "0.19.4"
|
version = "0.20.0"
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
#!/usr/bin/env zsh
|
#!/usr/bin/env zsh
|
||||||
|
|
||||||
|
# TODO: Refactor this entire mess
|
||||||
|
|
||||||
# Start with system path
|
# Start with system path
|
||||||
# Retrieve it from getconf, otherwise it's just current $PATH
|
# Retrieve it from getconf, otherwise it's just current $PATH
|
||||||
prepend-path() {
|
prepend-path() {
|
||||||
|
@ -20,9 +22,7 @@ PATH="$HOME/.cargo/bin:$PATH"
|
||||||
PATH="$PATH:/usr/local/go/bin"
|
PATH="$PATH:/usr/local/go/bin"
|
||||||
PATH="/usr/local/texlive/2021/bin/x86_64-linux:$PATH"
|
PATH="/usr/local/texlive/2021/bin/x86_64-linux:$PATH"
|
||||||
PATH="$HOME/go/bin:$PATH"
|
PATH="$HOME/go/bin:$PATH"
|
||||||
# prepend-path "/sbin"
|
PATH="$HOME/.extra/bin:$PATH"
|
||||||
# prepend-path "/usr/sbin"
|
|
||||||
# prepend-path "/usr/local/sbin"
|
|
||||||
|
|
||||||
# Remove duplicates (preserving prepended items)
|
# Remove duplicates (preserving prepended items)
|
||||||
# Source: http://unix.stackexchange.com/a/40755
|
# Source: http://unix.stackexchange.com/a/40755
|
||||||
|
|
Loading…
Reference in a new issue