From 66b3347647cbe80dc91eee5956e000cd52c852dd Mon Sep 17 00:00:00 2001 From: doloro Date: Sun, 7 Sep 2025 14:42:33 +0100 Subject: [PATCH] actually commiting for once --- nvim/config/melange.lua | 1 + nvim/config/presisted.lua | 1 + nvim/config/telescope-filebrowser.lua | 21 ++++ nvim/config/telescope.lua | 11 +- nvim/config/wakatime.lua | 1 + nvim/lua/doloro/plugins.lua | 5 +- .../home.doloro.dotfiles.nvim.session | 47 ------- nvim/sessions/meowmeow.vim | 116 ------------------ nvim/sessions/test | 49 -------- 9 files changed, 36 insertions(+), 216 deletions(-) create mode 100644 nvim/config/melange.lua create mode 100644 nvim/config/telescope-filebrowser.lua create mode 100644 nvim/config/wakatime.lua delete mode 100644 nvim/sessions/home.doloro.dotfiles.nvim.session delete mode 100644 nvim/sessions/meowmeow.vim delete mode 100644 nvim/sessions/test diff --git a/nvim/config/melange.lua b/nvim/config/melange.lua new file mode 100644 index 0000000..c1ad5c7 --- /dev/null +++ b/nvim/config/melange.lua @@ -0,0 +1 @@ +vim.cmd.colorscheme 'melange' diff --git a/nvim/config/presisted.lua b/nvim/config/presisted.lua index 590b82c..f1bc3fa 100644 --- a/nvim/config/presisted.lua +++ b/nvim/config/presisted.lua @@ -1,4 +1,5 @@ require("persisted").setup({ + save_dir = vim.fn.expand(vim.fn.stdpath("data") .. "/sessions/"), telescope = { mappings = { -- Mappings for managing sessions in Telescope copy_session = "", diff --git a/nvim/config/telescope-filebrowser.lua b/nvim/config/telescope-filebrowser.lua new file mode 100644 index 0000000..79502c0 --- /dev/null +++ b/nvim/config/telescope-filebrowser.lua @@ -0,0 +1,21 @@ +require("telescope").setup { + extensions = { + file_browser = { + theme = "ivy", + -- disables netrw and use telescope-file-browser in its place + hijack_netrw = true, + mappings = { + ["i"] = { + -- your custom insert mode mappings + }, + ["n"] = { + -- your custom normal mode mappings + }, + }, + }, + }, +} +-- To get telescope-file-browser loaded and working with telescope, +-- you need to call load_extension, somewhere after setup function: +require("telescope").load_extension "file_browser" +vim.keymap.set("n", "fv", ":Telescope file_browser") diff --git a/nvim/config/telescope.lua b/nvim/config/telescope.lua index 86ab3a2..002551b 100644 --- a/nvim/config/telescope.lua +++ b/nvim/config/telescope.lua @@ -1,8 +1,10 @@ local telescope = require('telescope') +local actions = require('telescope.actions') + telescope.setup({ - defaults = { - … - }, + defaults = { + ... + }, extensions = { persisted = { layout_config = { width = 0.55, height = 0.55 } @@ -11,6 +13,9 @@ telescope.setup({ }) telescope.load_extension("persisted") local builtin = require('telescope.builtin') +local action_state = require('telescope.actions.state') +local actions = require('telescope.actions') + vim.keymap.set('n', 'ff', builtin.find_files, { desc = 'Telescope find files' }) vim.keymap.set('n', 'fg', builtin.live_grep, { desc = 'Telescope live grep' }) vim.keymap.set('n', 'fb', builtin.buffers, { desc = 'Telescope buffers' }) diff --git a/nvim/config/wakatime.lua b/nvim/config/wakatime.lua new file mode 100644 index 0000000..37b8d8c --- /dev/null +++ b/nvim/config/wakatime.lua @@ -0,0 +1 @@ +-- require('vim.wakatime') diff --git a/nvim/lua/doloro/plugins.lua b/nvim/lua/doloro/plugins.lua index b47538a..62c068d 100644 --- a/nvim/lua/doloro/plugins.lua +++ b/nvim/lua/doloro/plugins.lua @@ -1,7 +1,7 @@ return { "neovim/nvim-lspconfig", "nvim-lua/plenary.nvim", - { "nvim-tree/nvim-tree.lua", event = "UIEnter", name="nvim-tree" }, + -- { "nvim-tree/nvim-tree.lua", event = "UIEnter", name="nvim-tree" }, -- mini stuff "nvim-mini/mini.notify", "nvim-mini/mini.cursorword", @@ -15,5 +15,8 @@ return { -- "nvim-mini/mini.sessions", -- "natecraddock/sessions.nvim" { "olimorris/persisted.nvim", event = "BufReadPre", name="persisted" }, + { "wakatime/vim-wakatime", name="wakatime" }, + { "nvim-telescope/telescope-file-browser.nvim", name="telescope-filebrowser" }, + { "savq/melange-nvim", name="melange" } -- { "rmagatti/auto-session", name="autosession"}, } diff --git a/nvim/sessions/home.doloro.dotfiles.nvim.session b/nvim/sessions/home.doloro.dotfiles.nvim.session deleted file mode 100644 index 5e7522c..0000000 --- a/nvim/sessions/home.doloro.dotfiles.nvim.session +++ /dev/null @@ -1,47 +0,0 @@ -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 -if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == '' - let s:wipebuf = bufnr('%') -endif -let s:shortmess_save = &shortmess -set shortmess+=aoO -badd +5 config/sessions.lua -badd +1 sessions/home.doloro.dotfiles.nvim.session -badd +11 lua/doloro/plugins.lua -argglobal -%argdel -$argadd NvimTree_1 -argglobal -enew -file NvimTree_1 -balt config/sessions.lua -setlocal foldmethod=manual -setlocal foldexpr=0 -setlocal foldmarker={{{,}}} -setlocal foldignore=# -setlocal foldlevel=0 -setlocal foldminlines=1 -setlocal foldnestmax=20 -setlocal nofoldenable -lcd ~/dotfiles/nvim -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 -set hlsearch -nohlsearch -doautoall SessionLoadPost -unlet SessionLoad -" vim: set ft=vim : diff --git a/nvim/sessions/meowmeow.vim b/nvim/sessions/meowmeow.vim deleted file mode 100644 index ec4ac76..0000000 --- a/nvim/sessions/meowmeow.vim +++ /dev/null @@ -1,116 +0,0 @@ -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 ~ -if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == '' - let s:wipebuf = bufnr('%') -endif -let s:shortmess_save = &shortmess -set shortmess+=aoO -badd +13 dotfiles/nvim/lua/doloro/plugins.lua -badd +21 dotfiles/nvim/config/mini.sessions.lua -badd +1 dotfiles/nvim/config/sessions.lua -argglobal -%argdel -edit dotfiles/nvim/config/sessions.lua -let s:save_splitbelow = &splitbelow -let s:save_splitright = &splitright -set splitbelow splitright -wincmd _ | wincmd | -vsplit -wincmd _ | wincmd | -vsplit -2wincmd h -wincmd w -wincmd w -let &splitbelow = s:save_splitbelow -let &splitright = s:save_splitright -wincmd t -let s:save_winminheight = &winminheight -let s:save_winminwidth = &winminwidth -set winminheight=0 -set winheight=1 -set winminwidth=0 -set winwidth=1 -exe 'vert 1resize ' . ((&columns * 30 + 106) / 212) -exe 'vert 2resize ' . ((&columns * 90 + 106) / 212) -exe 'vert 3resize ' . ((&columns * 90 + 106) / 212) -argglobal -enew -file NvimTree_1 -balt dotfiles/nvim/lua/doloro/plugins.lua -setlocal foldmethod=manual -setlocal foldexpr=0 -setlocal foldmarker={{{,}}} -setlocal foldignore=# -setlocal foldlevel=0 -setlocal foldminlines=1 -setlocal foldnestmax=20 -setlocal nofoldenable -lcd ~/dotfiles -wincmd w -argglobal -balt ~/dotfiles/nvim/lua/doloro/plugins.lua -setlocal foldmethod=manual -setlocal foldexpr=v:lua.vim.treesitter.foldexpr() -setlocal foldmarker={{{,}}} -setlocal foldignore=# -setlocal foldlevel=0 -setlocal foldminlines=1 -setlocal foldnestmax=20 -setlocal foldenable -silent! normal! zE -let &fdl = &fdl -let s:l = 1 - ((0 * winheight(0) + 25) / 51) -if s:l < 1 | let s:l = 1 | endif -keepjumps exe s:l -normal! zt -keepjumps 1 -normal! 027| -wincmd w -argglobal -enew | setl bt=help -help MiniSessions.config@en -balt ~/dotfiles/nvim/config/mini.sessions.lua -setlocal foldmethod=manual -setlocal foldexpr=0 -setlocal foldmarker={{{,}}} -setlocal foldignore=# -setlocal foldlevel=0 -setlocal foldminlines=1 -setlocal foldnestmax=20 -setlocal nofoldenable -silent! normal! zE -let &fdl = &fdl -let s:l = 29 - ((28 * winheight(0) + 25) / 51) -if s:l < 1 | let s:l = 1 | endif -keepjumps exe s:l -normal! zt -keepjumps 29 -normal! 060| -wincmd w -2wincmd w -exe 'vert 1resize ' . ((&columns * 30 + 106) / 212) -exe 'vert 2resize ' . ((&columns * 90 + 106) / 212) -exe 'vert 3resize ' . ((&columns * 90 + 106) / 212) -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 &winminheight = s:save_winminheight -let &winminwidth = s:save_winminwidth -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 -set hlsearch -nohlsearch -doautoall SessionLoadPost -unlet SessionLoad -" vim: set ft=vim : diff --git a/nvim/sessions/test b/nvim/sessions/test deleted file mode 100644 index 595aa03..0000000 --- a/nvim/sessions/test +++ /dev/null @@ -1,49 +0,0 @@ -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 -if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == '' - let s:wipebuf = bufnr('%') -endif -let s:shortmess_save = &shortmess -set shortmess+=aoO -badd +1 ministarter://1/welcome -argglobal -%argdel -edit ministarter://1/welcome -argglobal -setlocal foldmethod=manual -setlocal foldexpr=0 -setlocal foldmarker={{{,}}} -setlocal foldignore=# -setlocal foldlevel=999 -setlocal foldminlines=1 -setlocal foldnestmax=20 -setlocal foldenable -silent! normal! zE -let &fdl = &fdl -let s:l = 1 - ((0 * winheight(0) + 25) / 51) -if s:l < 1 | let s:l = 1 | endif -keepjumps exe s:l -normal! zt -keepjumps 1 -normal! 022| -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 -set hlsearch -nohlsearch -doautoall SessionLoadPost -unlet SessionLoad -" vim: set ft=vim :