actually commiting for once

This commit is contained in:
2025-09-07 14:42:33 +01:00
parent a9f69a3f15
commit 66b3347647
9 changed files with 36 additions and 216 deletions

1
nvim/config/melange.lua Normal file
View File

@@ -0,0 +1 @@
vim.cmd.colorscheme 'melange'

View File

@@ -1,4 +1,5 @@
require("persisted").setup({ require("persisted").setup({
save_dir = vim.fn.expand(vim.fn.stdpath("data") .. "/sessions/"),
telescope = { telescope = {
mappings = { -- Mappings for managing sessions in Telescope mappings = { -- Mappings for managing sessions in Telescope
copy_session = "<C-c>", copy_session = "<C-c>",

View File

@@ -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", "<leader>fv", ":Telescope file_browser<CR>")

View File

@@ -1,8 +1,10 @@
local telescope = require('telescope') local telescope = require('telescope')
local actions = require('telescope.actions')
telescope.setup({ telescope.setup({
defaults = { defaults = {
...
}, },
extensions = { extensions = {
persisted = { persisted = {
layout_config = { width = 0.55, height = 0.55 } layout_config = { width = 0.55, height = 0.55 }
@@ -11,6 +13,9 @@ telescope.setup({
}) })
telescope.load_extension("persisted") telescope.load_extension("persisted")
local builtin = require('telescope.builtin') local builtin = require('telescope.builtin')
local action_state = require('telescope.actions.state')
local actions = require('telescope.actions')
vim.keymap.set('n', '<leader>ff', builtin.find_files, { desc = 'Telescope find files' }) vim.keymap.set('n', '<leader>ff', builtin.find_files, { desc = 'Telescope find files' })
vim.keymap.set('n', '<leader>fg', builtin.live_grep, { desc = 'Telescope live grep' }) vim.keymap.set('n', '<leader>fg', builtin.live_grep, { desc = 'Telescope live grep' })
vim.keymap.set('n', '<leader>fb', builtin.buffers, { desc = 'Telescope buffers' }) vim.keymap.set('n', '<leader>fb', builtin.buffers, { desc = 'Telescope buffers' })

1
nvim/config/wakatime.lua Normal file
View File

@@ -0,0 +1 @@
-- require('vim.wakatime')

View File

@@ -1,7 +1,7 @@
return { return {
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
"nvim-lua/plenary.nvim", "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 -- mini stuff
"nvim-mini/mini.notify", "nvim-mini/mini.notify",
"nvim-mini/mini.cursorword", "nvim-mini/mini.cursorword",
@@ -15,5 +15,8 @@ return {
-- "nvim-mini/mini.sessions", -- "nvim-mini/mini.sessions",
-- "natecraddock/sessions.nvim" -- "natecraddock/sessions.nvim"
{ "olimorris/persisted.nvim", event = "BufReadPre", name="persisted" }, { "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"}, -- { "rmagatti/auto-session", name="autosession"},
} }

View File

@@ -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("<sfile>: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("<sfile>: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 :

View File

@@ -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("<sfile>: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("<sfile>: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 :

View File

@@ -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("<sfile>: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("<sfile>: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 :