diff --git a/home/private_dot_config/astronvim/install.sh b/home/private_dot_config/astronvim/executable_install.sh similarity index 64% rename from home/private_dot_config/astronvim/install.sh rename to home/private_dot_config/astronvim/executable_install.sh index 0b3af9b..807a3cc 100644 --- a/home/private_dot_config/astronvim/install.sh +++ b/home/private_dot_config/astronvim/executable_install.sh @@ -30,14 +30,18 @@ install-astronvim(){ mv ~/.config/nvim ~/.config/nvim.bak-$(date +'%s') fi - if [[ -d ~/.local/share/nvim/site ]]; then - echo "backing up old nvim site directory" - mv ~/.local/share/nvim/site ~/.local/share/nvim/site.bak-$(date +'%s') + if [[ -d ~/.local/share/nvim ]]; then + echo "backing up old nvim directory" + mv ~/.local/share/nvim ~/.local/share/nvim-$(date +'%s') + mkdir ~/.local/share/nvim fi 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" @@ -52,6 +56,9 @@ check-dep(){ install-astronvim +echo +echo "checking for dependencies" + for dep in "${deps[@]}"; do check-dep "$dep" done diff --git a/home/private_dot_config/astronvim/lua/user/colorscheme.lua b/home/private_dot_config/astronvim/lua/user/colorscheme.lua new file mode 100644 index 0000000..b26b301 --- /dev/null +++ b/home/private_dot_config/astronvim/lua/user/colorscheme.lua @@ -0,0 +1 @@ +return "catppuccin" diff --git a/home/private_dot_config/astronvim/lua/user/header.lua b/home/private_dot_config/astronvim/lua/user/header.lua index 498c5ae..bbc2e7d 100644 --- a/home/private_dot_config/astronvim/lua/user/header.lua +++ b/home/private_dot_config/astronvim/lua/user/header.lua @@ -1,15 +1,22 @@ return { - --Big-money - [[ /$$ ]], - [[ |__/ ]], - [[ /$$$$$$$ /$$$$$$ /$$$$$$ /$$ /$$ /$$ /$$$$$$/$$$$ ]], - [[| $$__ $$ /$$__ $$ /$$__ $$| $$ /$$/| $$| $$_ $$_ $$]], - [[| $$ \ $$| $$$$$$$$| $$ \ $$ \ $$/$$/ | $$| $$ \ $$ \ $$]], - [[| $$ | $$| $$_____/| $$ | $$ \ $$$/ | $$| $$ | $$ | $$]], - [[| $$ | $$| $$$$$$$| $$$$$$/ \ $/ | $$| $$ | $$ | $$]], - [[|__/ |__/ \_______/ \______/ \_/ |__/|__/ |__/ |__/]], + -- Ansi-shadow +[[ ███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗]], +[[ ████╗ ██║██╔════╝██╔═══██╗██║ ██║██║████╗ ████║]], +[[ ██╔██╗ ██║█████╗ ██║ ██║██║ ██║██║██╔████╔██║]], +[[ ██║╚██╗██║██╔══╝ ██║ ██║╚██╗ ██╔╝██║██║╚██╔╝██║]], +[[ ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║]], +[[ ╚═╝ ╚═══╝╚══════╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝]], } - + --Big-money + -- [[ /$$ ]], + -- [[ |__/ ]], + -- [[ /$$$$$$$ /$$$$$$ /$$$$$$ /$$ /$$ /$$ /$$$$$$/$$$$ ]], + -- [[| $$__ $$ /$$__ $$ /$$__ $$| $$ /$$/| $$| $$_ $$_ $$]], + -- [[| $$ \ $$| $$$$$$$$| $$ \ $$ \ $$/$$/ | $$| $$ \ $$ \ $$]], + -- [[| $$ | $$| $$_____/| $$ | $$ \ $$$/ | $$| $$ | $$ | $$]], + -- [[| $$ | $$| $$$$$$$| $$$$$$/ \ $/ | $$| $$ | $$ | $$]], + -- [[|__/ |__/ \_______/ \______/ \_/ |__/|__/ |__/ |__/]], + -- -- [[ _______________________________________ ]], -- [[ |,---"-----------------------------"---,| ]], -- [[ ||___ 16 bit.................... || ]], diff --git a/home/private_dot_config/astronvim/lua/user/init.lua b/home/private_dot_config/astronvim/lua/user/init.lua deleted file mode 100644 index de8541c..0000000 --- a/home/private_dot_config/astronvim/lua/user/init.lua +++ /dev/null @@ -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 diff --git a/home/private_dot_config/astronvim/lua/user/options.lua b/home/private_dot_config/astronvim/lua/user/options.lua new file mode 100644 index 0000000..2467d9f --- /dev/null +++ b/home/private_dot_config/astronvim/lua/user/options.lua @@ -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, + }, +} diff --git a/home/private_dot_config/astronvim/lua/user/plugins/init.lua b/home/private_dot_config/astronvim/lua/user/plugins/init.lua index fcdc942..3fd4ebc 100644 --- a/home/private_dot_config/astronvim/lua/user/plugins/init.lua +++ b/home/private_dot_config/astronvim/lua/user/plugins/init.lua @@ -6,29 +6,11 @@ return { }, 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", config = function() require("catppuccin").setup {} end, }, { 'LnL7/vim-nix' }, + { 'lambdalisue/suda.vim' }, -- for sudo reading and writing } diff --git a/home/private_dot_config/astronvim/lua/user/plugins/notify.lua b/home/private_dot_config/astronvim/lua/user/plugins/notify.lua deleted file mode 100644 index 9c546ba..0000000 --- a/home/private_dot_config/astronvim/lua/user/plugins/notify.lua +++ /dev/null @@ -1,5 +0,0 @@ -return function(config) - -- for compatability with nvim-transparent - config.background_color = "#000000" - return config -end diff --git a/home/private_dot_config/astronvim/lua/user/polish.lua b/home/private_dot_config/astronvim/lua/user/polish.lua new file mode 100644 index 0000000..6ac1380 --- /dev/null +++ b/home/private_dot_config/astronvim/lua/user/polish.lua @@ -0,0 +1,5 @@ +return function() + vim.cmd [[ + autocmd BufNewFile,BufRead Knitfile set syntax=lua + ]] +end diff --git a/home/private_dot_config/astronvim/patches/0001-remove-version-check.patch b/home/private_dot_config/astronvim/patches/0001-remove-version-check.patch new file mode 100644 index 0000000..3d0a162 --- /dev/null +++ b/home/private_dot_config/astronvim/patches/0001-remove-version-check.patch @@ -0,0 +1,26 @@ +From ddbb42f330a8d09980c812f5c05b6d8123a767ea Mon Sep 17 00:00:00 2001 +From: Daylin Morgan +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 +