From 625fbe7597f5a6d41d5fae7da6a2d9595897fa8a Mon Sep 17 00:00:00 2001 From: c Date: Mon, 19 Jun 2023 01:13:35 -0500 Subject: [PATCH] reorganizing --- nvim/.config/nvim/Session.vim | 57 ++++++++ nvim/.config/nvim/after/plugin/alpha.lua | 116 ---------------- .../nvim/after/plugin/indent-blankline.lua | 9 -- nvim/.config/nvim/after/plugin/possession.lua | 9 -- nvim/.config/nvim/after/plugin/telescope.lua | 28 ++-- nvim/.config/nvim/after/plugin/treesitter.lua | 52 +++---- nvim/.config/nvim/init.lua | 9 +- nvim/.config/nvim/lua/clint/colorscheme.lua | 9 -- nvim/.config/nvim/lua/clint/init.lua | 1 - nvim/.config/nvim/lua/clint/keybindings.lua | 2 +- nvim/.config/nvim/lua/clint/plugins.lua | 1 - nvim/.config/nvim/lua/plugins/colorscheme.lua | 10 ++ nvim/.config/nvim/lua/plugins/debug.lua | 6 + nvim/.config/nvim/lua/plugins/git.lua | 24 ++++ nvim/.config/nvim/lua/plugins/greeter.lua | 86 ++++++++++++ nvim/.config/nvim/lua/plugins/lsp.lua | 12 ++ nvim/.config/nvim/lua/plugins/search.lua | 14 ++ nvim/.config/nvim/lua/plugins/ui.lua | 40 ++++++ nvim/.config/nvim/lua/plugins/util.lua | 128 ++++++++++++++++++ 19 files changed, 419 insertions(+), 194 deletions(-) create mode 100644 nvim/.config/nvim/Session.vim delete mode 100644 nvim/.config/nvim/after/plugin/alpha.lua delete mode 100644 nvim/.config/nvim/after/plugin/indent-blankline.lua delete mode 100644 nvim/.config/nvim/after/plugin/possession.lua delete mode 100644 nvim/.config/nvim/lua/clint/colorscheme.lua delete mode 100644 nvim/.config/nvim/lua/clint/plugins.lua create mode 100644 nvim/.config/nvim/lua/plugins/colorscheme.lua create mode 100644 nvim/.config/nvim/lua/plugins/debug.lua create mode 100644 nvim/.config/nvim/lua/plugins/git.lua create mode 100644 nvim/.config/nvim/lua/plugins/greeter.lua create mode 100644 nvim/.config/nvim/lua/plugins/lsp.lua create mode 100644 nvim/.config/nvim/lua/plugins/search.lua create mode 100644 nvim/.config/nvim/lua/plugins/ui.lua create mode 100644 nvim/.config/nvim/lua/plugins/util.lua diff --git a/nvim/.config/nvim/Session.vim b/nvim/.config/nvim/Session.vim new file mode 100644 index 0000000..7016988 --- /dev/null +++ b/nvim/.config/nvim/Session.vim @@ -0,0 +1,57 @@ +let SessionLoad = 1 +let s:so_save = &g:so | let s:siso_save = &g:siso | setg so=0 siso=0 | setl so=-1 siso=-1 +let v:this_session=expand(":p") +silent only +silent tabonly +cd ~/dotfiles/nvim/.config/nvim +if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == '' + let s:wipebuf = bufnr('%') +endif +let s:shortmess_save = &shortmess +if &shortmess =~ 'A' + set shortmess=aoOA +else + set shortmess=aoO +endif +badd +1 ~/dotfiles/nvim/.config/nvim/after/plugin/alpha.lua +badd +25 lua/plugins/greeter.lua +badd +38 lua/plugins/ui.lua +argglobal +%argdel +edit lua/plugins/ui.lua +argglobal +balt lua/plugins/greeter.lua +setlocal fdm=indent +setlocal fde=0 +setlocal fmr={{{,}}} +setlocal fdi=# +setlocal fdl=99 +setlocal fml=1 +setlocal fdn=99 +setlocal fen +3 +normal! zo +let s:l = 37 - ((31 * winheight(0) + 17) / 35) +if s:l < 1 | let s:l = 1 | endif +keepjumps exe s:l +normal! zt +keepjumps 37 +normal! 014| +tabnext 1 +if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0 && getbufvar(s:wipebuf, '&buftype') isnot# 'terminal' + silent exe 'bwipe ' . s:wipebuf +endif +unlet! s:wipebuf +set winheight=1 winwidth=20 +let &shortmess = s:shortmess_save +let s:sx = expand(":p:r")."x.vim" +if filereadable(s:sx) + exe "source " . fnameescape(s:sx) +endif +let &g:so = s:so_save | let &g:siso = s:siso_save +nohlsearch +let g:this_session = v:this_session +let g:this_obsession = v:this_session +doautoall SessionLoadPost +unlet SessionLoad +" vim: set ft=vim : diff --git a/nvim/.config/nvim/after/plugin/alpha.lua b/nvim/.config/nvim/after/plugin/alpha.lua deleted file mode 100644 index 0159f14..0000000 --- a/nvim/.config/nvim/after/plugin/alpha.lua +++ /dev/null @@ -1,116 +0,0 @@ -local status_ok, alpha = pcall(require, "alpha") -if not status_ok then - return -end - -local dashboard = require("alpha.themes.dashboard") - -PANDA = { -"⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣴⣶⣶⣦⣄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀", -"⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⣿⣿⣿⣿⣿⣆⣀⣀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀", -"⠀⠀⠀⠀⠀⠀⠀⠀⢈⣿⡿⠿⠛⠛⠉⠉⠉⠉⠉⠛⠛⠶⣦⣄⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀", -"⠀⠀⠀⠀⠀⠀⣠⡶⠛⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠻⢶⣄⡀⠀⢀⣀⡀⠀⠀⠀⠀", -"⠀⠀⠀⠀⣠⠞⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠙⢿⣾⣿⣿⣿⣦⠀⠀⠀", -"⠀⠀⢀⡾⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⣤⣤⣤⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠙⢿⣿⣿⣿⠆⠀⠀", -"⠀⢀⣾⠀⠀⠀⠀⠀⠀⠀⠀⢠⣴⣿⣿⣿⣿⣿⣿⣷⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⢿⡿⠟⠀⠀⠀", -"⠀⣾⣿⠀⠀⠀⠀⠀⠀⠀⠀⠻⣿⣿⣿⡿⠟⠛⠛⠛⠀⠀⠀⠀⢀⣤⣤⣄⠀⠀⠈⣷⠀⠀⠀⠀", -"⢸⣿⣿⣇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠁⢠⠄⠂⢄⠀⠀⣤⣄⠀⠘⣿⣿⣿⡆⠀⠀⢸⡇⠀⠀⠀", -"⢸⣿⣿⣿⣦⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢧⣀⣀⠜⠀⠀⢹⠟⠃⠀⢹⣿⡿⠃⠀⠀⢸⣇⠀⠀⠀", -"⢸⣿⣿⣿⣿⣿⣷⣦⣤⣤⣤⣀⣀⣀⣀⣀⣈⣁⣀⣀⣰⡋⠀⠀⠀⢀⡄⠀⠀⠀⠀⢸⡇⠀⠀⠀", -"⠸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣶⣤⡀⠀⠀⠀⢀⣴⣾⣧⣴⡟⠀", -"⠀⢻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣦⡀⠀⣾⣿⣿⣿⡟⠀⠀", -"⠀⠈⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣧⣤⣿⣿⣿⣿⣇⠀⠀", -"⠀⠀⠈⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⢿⣟⠳⢤⡳⠽⣷⣄", -"⠀⠀⠀⠀⠙⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠋⠈⠙⠚⠿⠆⠀⠀", -"⠀⠀⠀⠀⠀⠀⠙⠿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠟⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀", -"⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠛⠻⠿⣿⣿⣿⣿⣿⣿⡿⠿⠟⠋⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀" -} - -BONFIRE = { -" ⠀⠀⠀⠀⠀⠀ ⣰⢤⢤⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀", -"⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⡿⡟⠛⢿⡆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀", -"⠀⠀⠀⠀⠀⠀⠀⠀⠀⠸⣧⣀⣠⠞⢹⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀", -"⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢙⣶⣆⣐⢿⣿⠃⣈⣰⣄⠀⠀⠀⠀⠀⠀", -"⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡾⡌⣿⠟⡱⣾⣞⡙⣼⣿⣆⠀⠀⠀⠀⠀", -"⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣬⡿⠿⢾⢿⣿⣿⢻⢻⡯⣿⣂⠀⠀⠀⠀", -"⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⢻⣧⡧⡡⢺⠸⣿⣷⡦⠽⢻⡄⠀⠀⠀⠀", -"⠀⠀⠀⠀⠀⠀⠀⠀⠀⣸⣾⣿⣎⠇⡄⣄⣼⣿⣦⣔⠈⢻⡴⣶⡀⠀", -"⠀⠀⠀⠀⠀⠀⠀⠀⣴⡿⣾⣿⣿⡓⠴⠿⠿⠿⣿⣿⡿⢋⠈⢸⣧⠀", -"⠀⠀⠀⠀⠀⠀⠀⠀⣏⠧⣿⣿⣿⣟⠻⡛⠛⢋⣿⠟⠔⠁⠀⢨⣿⡀", -"⠀⠀⠀⠀⠀⠀⠀⠰⢦⣽⣿⢧⢩⡟⠶⣟⣋⡽⢣⠊⠀⠀⠀⢸⡿⡇", -"⠀⠀⠀⠀⠀⠀⠀⣲⣷⣿⣿⣿⣿⣾⡇⣲⡿⢡⠃⠀⠀⠀⠀⢸⢻⡇", -"⠀⠀⠀⢠⣀⡠⡺⠋⢹⣧⣝⣿⢇⣿⣷⡿⠁⠆⠀⠀⠀⠀⠀⢺⣿⡇", -"⠀⠀⠄⣁⠟⢏⠀⠀⣼⡿⠻⢾⣼⣿⢿⠇⣸⠀⠀⠀⠀⠀⢐⣿⣿⠇", -"⡍⣠⠞⠁⠄⠁⠰⣶⢿⣯⣀⣾⡿⠁⠚⠀⢥⣭⣁⠂⢀⠀⣎⡽⡻⠀", -"⠚⣁⠤⠴⠀⠀⣼⠹⢹⡾⠛⡏⠀⠀⠀⠀⠀⠹⣿⣿⣦⢳⠕⣀⣀⣀", -"⠉⠀⠀⠀⠀⠐⡙⠶⠾⢷⣽⠀⠀⠀⠀⠀⠀⠀⣣⣭⣿⠟⡄⠉⠉⠉" -} - -HYDRA = { - " ", - " ", - " ", - " ⣴⣶⣤⡤⠦⣤⣀⣤⠆ ⣈⣭⣿⣶⣿⣦⣼⣆ ", - " ⠉⠻⢿⣿⠿⣿⣿⣶⣦⠤⠄⡠⢾⣿⣿⡿⠋⠉⠉⠻⣿⣿⡛⣦ ", - " ⠈⢿⣿⣟⠦ ⣾⣿⣿⣷ ⠻⠿⢿⣿⣧⣄ ", - " ⣸⣿⣿⢧ ⢻⠻⣿⣿⣷⣄⣀⠄⠢⣀⡀⠈⠙⠿⠄ ", - " ⢠⣿⣿⣿⠈ ⣻⣿⣿⣿⣿⣿⣿⣿⣛⣳⣤⣀⣀ ", - " ⢠⣧⣶⣥⡤⢄ ⣸⣿⣿⠘ ⢀⣴⣿⣿⡿⠛⣿⣿⣧⠈⢿⠿⠟⠛⠻⠿⠄ ", - " ⣰⣿⣿⠛⠻⣿⣿⡦⢹⣿⣷ ⢊⣿⣿⡏ ⢸⣿⣿⡇ ⢀⣠⣄⣾⠄ ", - " ⣠⣿⠿⠛ ⢀⣿⣿⣷⠘⢿⣿⣦⡀ ⢸⢿⣿⣿⣄ ⣸⣿⣿⡇⣪⣿⡿⠿⣿⣷⡄ ", - " ⠙⠃ ⣼⣿⡟ ⠈⠻⣿⣿⣦⣌⡇⠻⣿⣿⣷⣿⣿⣿ ⣿⣿⡇ ⠛⠻⢷⣄ ", - " ⢻⣿⣿⣄ ⠈⠻⣿⣿⣿⣷⣿⣿⣿⣿⣿⡟ ⠫⢿⣿⡆ ", - " ⠻⣿⣿⣿⣿⣶⣶⣾⣿⣿⣿⣿⣿⣿⣿⣿⡟⢀⣀⣤⣾⡿⠃ ", - " ", - } - - -ANIME = { - '', - '⡆⣐⢕⢕⢕⢕⢕⢕⢕⢕⠅⢗⢕⢕⢕⢕⢕⢕⢕⠕⠕⢕⢕⢕⢕⢕⢕⢕⢕⢕', - '⢐⢕⢕⢕⢕⢕⣕⢕⢕⠕⠁⢕⢕⢕⢕⢕⢕⢕⢕⠅⡄⢕⢕⢕⢕⢕⢕⢕⢕⢕', - '⢕⢕⢕⢕⢕⠅⢗⢕⠕⣠⠄⣗⢕⢕⠕⢕⢕⢕⠕⢠⣿⠐⢕⢕⢕⠑⢕⢕⠵⢕', - '⢕⢕⢕⢕⠁⢜⠕⢁⣴⣿⡇⢓⢕⢵⢐⢕⢕⠕⢁⣾⢿⣧⠑⢕⢕⠄⢑⢕⠅⢕', - '⢕⢕⠵⢁⠔⢁⣤⣤⣶⣶⣶⡐⣕⢽⠐⢕⠕⣡⣾⣶⣶⣶⣤⡁⢓⢕⠄⢑⢅⢑', - '⠍⣧⠄⣶⣾⣿⣿⣿⣿⣿⣿⣷⣔⢕⢄⢡⣾⣿⣿⣿⣿⣿⣿⣿⣦⡑⢕⢤⠱⢐', - '⢠⢕⠅⣾⣿⠋⢿⣿⣿⣿⠉⣿⣿⣷⣦⣶⣽⣿⣿⠈⣿⣿⣿⣿⠏⢹⣷⣷⡅⢐', - '⣔⢕⢥⢻⣿⡀⠈⠛⠛⠁⢠⣿⣿⣿⣿⣿⣿⣿⣿⡀⠈⠛⠛⠁⠄⣼⣿⣿⡇⢔', - '⢕⢕⢽⢸⢟⢟⢖⢖⢤⣶⡟⢻⣿⡿⠻⣿⣿⡟⢀⣿⣦⢤⢤⢔⢞⢿⢿⣿⠁⢕', - '⢕⢕⠅⣐⢕⢕⢕⢕⢕⣿⣿⡄⠛⢀⣦⠈⠛⢁⣼⣿⢗⢕⢕⢕⢕⢕⢕⡏⣘⢕', - '⢕⢕⠅⢓⣕⣕⣕⣕⣵⣿⣿⣿⣾⣿⣿⣿⣿⣿⣿⣿⣷⣕⢕⢕⢕⢕⡵⢀⢕⢕', - '⢑⢕⠃⡈⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⢃⢕⢕⢕', - '⣆⢕⠄⢱⣄⠛⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠿⢁⢕⢕⠕⢁', - '⣿⣦⡀⣿⣿⣷⣶⣬⣍⣛⣛⣛⡛⠿⠿⠿⠛⠛⢛⣛⣉⣭⣤⣂⢜⠕⢑⣡⣴⣿', - '', -} - -dashboard.section.header.val = PANDA - -dashboard.section.buttons.val = { - dashboard.button("f", " Find file", ":Telescope find_files "), - dashboard.button("e", " New file", ":ene startinsert "), - dashboard.button("p", " Find project", ":Telescope projects "), - dashboard.button("r", " Recently used files", ":Telescope oldfiles "), - dashboard.button("t", " Find text", ":Telescope live_grep "), - dashboard.button("c", " Configuration", ":e ~/.config/nvim/init.lua "), - dashboard.button("q", " Quit Neovim", ":qa"), -} - -local function footer() - -- NOTE: requires the fortune-mod package to work - -- local handle = io.popen("fortune") - -- local fortune = handle:read("*a") - -- handle:close() - -- return fortune - return "" -end - -dashboard.section.footer.val = footer() - -dashboard.section.footer.opts.hl = "Type" -dashboard.section.header.opts.hl = "Include" -dashboard.section.buttons.opts.hl = "Keyword" - -dashboard.opts.opts.noautocmd = true --- vim.cmd([[autocmd User AlphaReady echo 'ready']]) -alpha.setup(dashboard.opts) diff --git a/nvim/.config/nvim/after/plugin/indent-blankline.lua b/nvim/.config/nvim/after/plugin/indent-blankline.lua deleted file mode 100644 index 8086ee6..0000000 --- a/nvim/.config/nvim/after/plugin/indent-blankline.lua +++ /dev/null @@ -1,9 +0,0 @@ -vim.opt.list = true -vim.opt.listchars:append "space:⋅" -vim.opt.listchars:append "eol:↴" - -require("indent_blankline").setup { - space_char_blankline = " ", - show_current_context = true, - show_current_context_start = true, -} diff --git a/nvim/.config/nvim/after/plugin/possession.lua b/nvim/.config/nvim/after/plugin/possession.lua deleted file mode 100644 index 14262ea..0000000 --- a/nvim/.config/nvim/after/plugin/possession.lua +++ /dev/null @@ -1,9 +0,0 @@ --- require('possession').setup{ --- autosave = { --- current = false, -- or fun(name): boolean --- tmp = true, -- or fun(): boolean --- tmp_name = 'tmp', --- on_load = true, --- on_quit = true, --- } --- } diff --git a/nvim/.config/nvim/after/plugin/telescope.lua b/nvim/.config/nvim/after/plugin/telescope.lua index 417fb91..28ec2c7 100644 --- a/nvim/.config/nvim/after/plugin/telescope.lua +++ b/nvim/.config/nvim/after/plugin/telescope.lua @@ -1,16 +1,16 @@ -require("telescope").setup{ - defaults = { - prompt_prefix = "$ ", - mappings = { - i = { - ["C-a"] = function() print("asdf") end - } - } - } -} - -require("telescope").load_extension("fzf") -require("telescope").load_extension("file_browser") -require("telescope").load_extension("neoclip") +-- require("telescope").setup{ +-- defaults = { +-- prompt_prefix = "$ ", +-- mappings = { +-- i = { +-- ["C-a"] = function() print("asdf") end +-- } +-- } +-- } +-- } +-- +-- require("telescope").load_extension("fzf") +-- require("telescope").load_extension("file_browser") +-- require("telescope").load_extension("neoclip") -- require("telescope").load_extension("possession") -- require("telescope").load_extension("repo") diff --git a/nvim/.config/nvim/after/plugin/treesitter.lua b/nvim/.config/nvim/after/plugin/treesitter.lua index 893cbaf..dac140e 100644 --- a/nvim/.config/nvim/after/plugin/treesitter.lua +++ b/nvim/.config/nvim/after/plugin/treesitter.lua @@ -1,26 +1,26 @@ -require('nvim-treesitter').setup({ - -- enable syntax highlighting - highlight = { - enable = true, - }, - -- enable indentation - indent = { enable = true }, - -- enable autotagging (w/ nvim-ts-autotag plugin) - autotag = { enable = true }, - -- ensure these language parsers are installed - ensure_installed = { - "json", - "yaml", - "html", - "css", - "markdown", - "bash", - "lua", - "vim", - "dockerfile", - "gitignore", - "python", - }, - -- auto install above language parsers - auto_install = true, -}) +-- require('nvim-treesitter').setup({ +-- -- enable syntax highlighting +-- highlight = { +-- enable = true, +-- }, +-- -- enable indentation +-- indent = { enable = true }, +-- -- enable autotagging (w/ nvim-ts-autotag plugin) +-- autotag = { enable = true }, +-- -- ensure these language parsers are installed +-- ensure_installed = { +-- "json", +-- "yaml", +-- "html", +-- "css", +-- "markdown", +-- "bash", +-- "lua", +-- "vim", +-- "dockerfile", +-- "gitignore", +-- "python", +-- }, +-- -- auto install above language parsers +-- auto_install = true, +-- }) diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index abaca85..24af215 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -10,16 +10,9 @@ require("clint/lazy_bootstrap") -- bootstraps folke/lazy require("lazy").setup( { spec = "plugins", - install = { colorscheme = { "gruvbox", "ayu", "melange", } } + -- install = { colorscheme = { "gruvbox", "ayu", "melange", } } } ) -- loads each lua/plugin/* require("clint") -- loads lua/clint/init.lua require('dap-python').setup('~/.virtualenvs/debugpy/bin/python') - -vim.opt.termguicolors = true -vim.cmd.colorscheme 'ayu' -vim.cmd("highlight Normal guibg=none") -vim.cmd("highlight NonText guibg=none") -vim.cmd("highlight Normal ctermbg=none") -vim.cmd("highlight NonText ctermbg=none") diff --git a/nvim/.config/nvim/lua/clint/colorscheme.lua b/nvim/.config/nvim/lua/clint/colorscheme.lua deleted file mode 100644 index cb5e131..0000000 --- a/nvim/.config/nvim/lua/clint/colorscheme.lua +++ /dev/null @@ -1,9 +0,0 @@ --- general theme --- vim.opt.termguicolors = true --- vim.cmd.colorscheme 'ayu' - --- ignore background color for transparency --- vim.cmd("highlight Normal guibg=none") --- vim.cmd("highlight NonText guibg=none") --- vim.cmd("highlight Normal ctermbg=none") --- vim.cmd("highlight NonText ctermbg=none") diff --git a/nvim/.config/nvim/lua/clint/init.lua b/nvim/.config/nvim/lua/clint/init.lua index 7b88048..0c1d190 100644 --- a/nvim/.config/nvim/lua/clint/init.lua +++ b/nvim/.config/nvim/lua/clint/init.lua @@ -1,6 +1,5 @@ require("clint.autocmds") require("clint.keybindings") require("clint.settings") -require("clint.colorscheme") require("clint.lsp") require("clint.statusline") diff --git a/nvim/.config/nvim/lua/clint/keybindings.lua b/nvim/.config/nvim/lua/clint/keybindings.lua index c2b73a3..8e9a4a4 100644 --- a/nvim/.config/nvim/lua/clint/keybindings.lua +++ b/nvim/.config/nvim/lua/clint/keybindings.lua @@ -109,7 +109,7 @@ vim.cmd('autocmd! TermOpen term://* lua set_terminal_keymaps()') -- Toggle a custom Terminal with ipython local Terminal = require('toggleterm.terminal').Terminal local ipython = Terminal:new({ cmd="ipython", direction="horizontal", count="100"}) -local function _ipython_toggle() +function _ipython_toggle() ipython:toggle() end keymap('n', '', ":lua _ipython_toggle()wincmd k", default_ops) diff --git a/nvim/.config/nvim/lua/clint/plugins.lua b/nvim/.config/nvim/lua/clint/plugins.lua deleted file mode 100644 index 99ea2a3..0000000 --- a/nvim/.config/nvim/lua/clint/plugins.lua +++ /dev/null @@ -1 +0,0 @@ --- can delete this i think diff --git a/nvim/.config/nvim/lua/plugins/colorscheme.lua b/nvim/.config/nvim/lua/plugins/colorscheme.lua new file mode 100644 index 0000000..627f790 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/colorscheme.lua @@ -0,0 +1,10 @@ +local M = { + 'rebelot/kanagawa.nvim', + config = function(_, opts) + local kanagawa = require("kanagawa") + kanagawa.setup(opts) + kanagawa.load() + end, +} + +return M diff --git a/nvim/.config/nvim/lua/plugins/debug.lua b/nvim/.config/nvim/lua/plugins/debug.lua new file mode 100644 index 0000000..3f9a1db --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/debug.lua @@ -0,0 +1,6 @@ +return { + { 'mfussenegger/nvim-dap' }, + { 'rcarriga/nvim-dap-ui', config = true }, + { "mfussenegger/nvim-dap-python" }, + { "theHamsta/nvim-dap-virtual-text", config = true }, +} diff --git a/nvim/.config/nvim/lua/plugins/git.lua b/nvim/.config/nvim/lua/plugins/git.lua new file mode 100644 index 0000000..4842764 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/git.lua @@ -0,0 +1,24 @@ +return { + + { 'kdheepak/lazygit.nvim' }, + { + 'lewis6991/gitsigns.nvim', + config = { + signs = { + add = { hl = 'GitSignsAdd', text = '+', numhl = 'GitSignsAddNr', linehl = 'GitSignsAddLn' }, + change = { hl = 'GitSignsChange', text = '│', numhl = 'GitSignsChangeNr', + linehl = 'GitSignsChangeLn' }, + delete = { hl = 'GitSignsDelete', text = '-', numhl = 'GitSignsDeleteNr', + linehl = 'GitSignsDeleteLn' }, + topdelete = { hl = 'GitSignsDelete', text = '‾', numhl = 'GitSignsDeleteNr', + linehl = 'GitSignsDeleteLn' }, + changedelete = { hl = 'GitSignsChange', text = '~', numhl = 'GitSignsChangeNr', + linehl = 'GitSignsChangeLn' }, + untracked = { hl = 'GitSignsAdd', text = '┆', numhl = 'GitSignsAddNr', linehl = 'GitSignsAddLn' }, + }, + current_line_blame = true, + show_deleted = true, + } + }, + +} diff --git a/nvim/.config/nvim/lua/plugins/greeter.lua b/nvim/.config/nvim/lua/plugins/greeter.lua new file mode 100644 index 0000000..e683229 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/greeter.lua @@ -0,0 +1,86 @@ +return +{ + 'goolord/alpha-nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + config = function() + -- require('alpha').setup() + + -- local status_ok, alpha = pcall(require, "alpha") + -- if not status_ok then + -- return + -- end + + local dashboard = require("alpha.themes.dashboard") + + PANDA = { + "⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣴⣶⣶⣦⣄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀", + "⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⣿⣿⣿⣿⣿⣆⣀⣀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀", + "⠀⠀⠀⠀⠀⠀⠀⠀⢈⣿⡿⠿⠛⠛⠉⠉⠉⠉⠉⠛⠛⠶⣦⣄⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀", + "⠀⠀⠀⠀⠀⠀⣠⡶⠛⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠻⢶⣄⡀⠀⢀⣀⡀⠀⠀⠀⠀", + "⠀⠀⠀⠀⣠⠞⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠙⢿⣾⣿⣿⣿⣦⠀⠀⠀", + "⠀⠀⢀⡾⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⣤⣤⣤⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠙⢿⣿⣿⣿⠆⠀⠀", + "⠀⢀⣾⠀⠀⠀⠀⠀⠀⠀⠀⢠⣴⣿⣿⣿⣿⣿⣿⣷⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⢿⡿⠟⠀⠀⠀", + "⠀⣾⣿⠀⠀⠀⠀⠀⠀⠀⠀⠻⣿⣿⣿⡿⠟⠛⠛⠛⠀⠀⠀⠀⢀⣤⣤⣄⠀⠀⠈⣷⠀⠀⠀⠀", + "⢸⣿⣿⣇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠁⢠⠄⠂⢄⠀⠀⣤⣄⠀⠘⣿⣿⣿⡆⠀⠀⢸⡇⠀⠀⠀", + "⢸⣿⣿⣿⣦⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢧⣀⣀⠜⠀⠀⢹⠟⠃⠀⢹⣿⡿⠃⠀⠀⢸⣇⠀⠀⠀", + "⢸⣿⣿⣿⣿⣿⣷⣦⣤⣤⣤⣀⣀⣀⣀⣀⣈⣁⣀⣀⣰⡋⠀⠀⠀⢀⡄⠀⠀⠀⠀⢸⡇⠀⠀⠀", + "⠸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣶⣤⡀⠀⠀⠀⢀⣴⣾⣧⣴⡟⠀", + "⠀⢻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣦⡀⠀⣾⣿⣿⣿⡟⠀⠀", + "⠀⠈⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣧⣤⣿⣿⣿⣿⣇⠀⠀", + "⠀⠀⠈⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⢿⣟⠳⢤⡳⠽⣷⣄", + "⠀⠀⠀⠀⠙⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠋⠈⠙⠚⠿⠆⠀⠀", + "⠀⠀⠀⠀⠀⠀⠙⠿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠟⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀", + "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠛⠻⠿⣿⣿⣿⣿⣿⣿⡿⠿⠟⠋⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀" + } + + ANIME = { + '', + '⡆⣐⢕⢕⢕⢕⢕⢕⢕⢕⠅⢗⢕⢕⢕⢕⢕⢕⢕⠕⠕⢕⢕⢕⢕⢕⢕⢕⢕⢕', + '⢐⢕⢕⢕⢕⢕⣕⢕⢕⠕⠁⢕⢕⢕⢕⢕⢕⢕⢕⠅⡄⢕⢕⢕⢕⢕⢕⢕⢕⢕', + '⢕⢕⢕⢕⢕⠅⢗⢕⠕⣠⠄⣗⢕⢕⠕⢕⢕⢕⠕⢠⣿⠐⢕⢕⢕⠑⢕⢕⠵⢕', + '⢕⢕⢕⢕⠁⢜⠕⢁⣴⣿⡇⢓⢕⢵⢐⢕⢕⠕⢁⣾⢿⣧⠑⢕⢕⠄⢑⢕⠅⢕', + '⢕⢕⠵⢁⠔⢁⣤⣤⣶⣶⣶⡐⣕⢽⠐⢕⠕⣡⣾⣶⣶⣶⣤⡁⢓⢕⠄⢑⢅⢑', + '⠍⣧⠄⣶⣾⣿⣿⣿⣿⣿⣿⣷⣔⢕⢄⢡⣾⣿⣿⣿⣿⣿⣿⣿⣦⡑⢕⢤⠱⢐', + '⢠⢕⠅⣾⣿⠋⢿⣿⣿⣿⠉⣿⣿⣷⣦⣶⣽⣿⣿⠈⣿⣿⣿⣿⠏⢹⣷⣷⡅⢐', + '⣔⢕⢥⢻⣿⡀⠈⠛⠛⠁⢠⣿⣿⣿⣿⣿⣿⣿⣿⡀⠈⠛⠛⠁⠄⣼⣿⣿⡇⢔', + '⢕⢕⢽⢸⢟⢟⢖⢖⢤⣶⡟⢻⣿⡿⠻⣿⣿⡟⢀⣿⣦⢤⢤⢔⢞⢿⢿⣿⠁⢕', + '⢕⢕⠅⣐⢕⢕⢕⢕⢕⣿⣿⡄⠛⢀⣦⠈⠛⢁⣼⣿⢗⢕⢕⢕⢕⢕⢕⡏⣘⢕', + '⢕⢕⠅⢓⣕⣕⣕⣕⣵⣿⣿⣿⣾⣿⣿⣿⣿⣿⣿⣿⣷⣕⢕⢕⢕⢕⡵⢀⢕⢕', + '⢑⢕⠃⡈⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⢃⢕⢕⢕', + '⣆⢕⠄⢱⣄⠛⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠿⢁⢕⢕⠕⢁', + '⣿⣦⡀⣿⣿⣷⣶⣬⣍⣛⣛⣛⡛⠿⠿⠿⠛⠛⢛⣛⣉⣭⣤⣂⢜⠕⢑⣡⣴⣿', + '', + } + + dashboard.section.header.val = ANIME + + dashboard.section.buttons.val = { + dashboard.button("f", " Find file", ":Telescope find_files "), + dashboard.button("e", " New file", ":ene startinsert "), + dashboard.button("p", " Find project", ":Telescope projects "), + dashboard.button("r", " Recently used files", ":Telescope oldfiles "), + dashboard.button("t", " Find text", ":Telescope live_grep "), + dashboard.button("c", " Configuration", ":e ~/.config/nvim/init.lua "), + dashboard.button("q", " Quit Neovim", ":qa"), + } + + local function footer() + -- NOTE: requires the fortune-mod package to work + -- local handle = io.popen("fortune") + -- local fortune = handle:read("*a") + -- handle:close() + -- return fortune + return "" + end + + dashboard.section.footer.val = footer() + dashboard.section.footer.opts.hl = "Type" + dashboard.section.header.opts.hl = "Include" + dashboard.section.buttons.opts.hl = "Keyword" + + dashboard.opts.opts.noautocmd = true + -- vim.cmd([[autocmd User AlphaReady echo 'ready']]) + -- alpha.setup(dashboard.opts) + require("alpha").setup(dashboard.opts) + end +} diff --git a/nvim/.config/nvim/lua/plugins/lsp.lua b/nvim/.config/nvim/lua/plugins/lsp.lua new file mode 100644 index 0000000..ddc6cee --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/lsp.lua @@ -0,0 +1,12 @@ +return +{ + { "williamboman/mason.nvim" }, + { "williamboman/mason-lspconfig.nvim" }, + { 'neovim/nvim-lspconfig' }, + { 'hrsh7th/cmp-nvim-lsp' }, + { 'hrsh7th/cmp-nvim-lua' }, + { 'hrsh7th/cmp-buffer' }, + { 'hrsh7th/cmp-path' }, + { 'hrsh7th/nvim-cmp' }, + { 'saadparwaiz1/cmp_luasnip' }, +} diff --git a/nvim/.config/nvim/lua/plugins/search.lua b/nvim/.config/nvim/lua/plugins/search.lua new file mode 100644 index 0000000..35fc459 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/search.lua @@ -0,0 +1,14 @@ +return { + { 'nvim-lua/plenary.nvim' }, + { + 'nvim-telescope/telescope.nvim', + config = function() + require("telescope").load_extension("fzf") + require("telescope").load_extension("file_browser") + require("telescope").load_extension("neoclip") + end + }, + + { 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' }, + { "nvim-telescope/telescope-file-browser.nvim" }, +} diff --git a/nvim/.config/nvim/lua/plugins/ui.lua b/nvim/.config/nvim/lua/plugins/ui.lua new file mode 100644 index 0000000..cdccaa0 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/ui.lua @@ -0,0 +1,40 @@ +return { + + -- status line + { 'nvim-lualine/lualine.nvim' }, + + -- Devicons + { 'nvim-tree/nvim-web-devicons' }, + + -- Indent lines + { + "lukas-reineke/indent-blankline.nvim", + config = + { + show_end_of_line = true, + space_char_blankline = " ", + show_current_context = true, + show_current_context_start = true, + } + }, + + -- Cursor line + { + 'yamatsum/nvim-cursorline', + config = + { + cursorline = { + enable = true, + timeout = 0, + number = true, + }, + cursorword = { + enable = false, + } + } + }, + + -- Greeter + -- Scroll bar + -- { 'petertriho/nvim-scrollbar', config = true }, +} diff --git a/nvim/.config/nvim/lua/plugins/util.lua b/nvim/.config/nvim/lua/plugins/util.lua new file mode 100644 index 0000000..c20aa69 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/util.lua @@ -0,0 +1,128 @@ +return { + + -- Linter + { + 'jose-elias-alvarez/null-ls.nvim', + config = function() + local nls = require("null-ls") + nls.setup({ + sources = { + nls.builtins.formatting.black, + }, + }) + end, + }, + + -- Sessions + { "tpope/vim-obsession" }, + + -- SuperTab + { 'ervandew/supertab' }, + + -- Surround + -- { 'tpope/vim-surround' }, + { 'echasnovski/mini.surround', version = '*', config = true }, + + -- Slime, for tmux repl-ing + { 'jpalardy/vim-slime' }, + + -- -- Telescope, fuzzy finding + -- { 'nvim-lua/plenary.nvim' }, + -- { 'nvim-telescope/telescope.nvim' }, + -- { 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' }, + -- { "nvim-telescope/telescope-file-browser.nvim" }, + -- + -- Treesitter + { + 'nvim-treesitter/nvim-treesitter', + build = ':TSUpdate', + highlight = { + enable = true, + }, + -- enable indentation + indent = { enable = true }, + -- enable autotagging (w/ nvim-ts-autotag plugin) + autotag = { enable = true }, + -- ensure these language parsers are installed + ensure_installed = { + "json", + "yaml", + "html", + "css", + "markdown", + "bash", + "lua", + "vim", + "dockerfile", + "gitignore", + "python", + }, + -- auto install above language parsers + auto_install = true, + }, + + -- Registry history + { + "AckslD/nvim-neoclip.lua", + dependencies = { + { 'kkharji/sqlite.lua', module = 'sqlite' }, + { 'nvim-telescope/telescope.nvim' }, + }, + config = { + enable_persistent_history = true, + continuous_sync = true + }, + }, + + -- Auto pairs + { "windwp/nvim-autopairs", config = true }, -- See `config` under https://github.com/folke/lazy.nvim#-plugin-spec + + -- Comment / uncomment + { "numToStr/Comment.nvim", config = true }, + + -- Git Repo Telescope + { 'cljoly/telescope-repo.nvim' }, + + -- Which-Key + { + "folke/which-key.nvim", + config = true, + }, + + -- File Explorer + { + "nvim-neo-tree/neo-tree.nvim", + branch = "v2.x", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended + "MunifTanjim/nui.nvim", + }, + }, + + -- Object Explorer + { + 'simrat39/symbols-outline.nvim', + config = { + auto_preview = true, + } + }, + + -- Terminal + { + 'akinsho/toggleterm.nvim', + version = "*", + config = { + open_mapping = [[]], + direction = 'horizontal' + } + }, + + { + "iamcco/markdown-preview.nvim", + build = "cd app && npm install", + enabled = true, + -- ft = "markdown", + }, + +}