luca/dotfiles
1
0
Fork 0
Code Activity

cleanup

Browse source
This commit is contained in:
Luca Bilke 2024-03-06 17:50:10 +01:00
parent 10474be914
commit fc404dcf07
10 changed files with 146 additions and 161 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.config/lf/lfrc
View file

@ -13,10 +13,9 @@ set promptfmt # this is set in a function later
# HACK: This is needed to trigger the opening function of the taolf nvim plugin
cmd open ${{
set +u
files=${@:-$fx}
[ "$lf_user_multiedit" = "true" ] && {
if [ -n "$TAOLF" ]; then
lf -remote "send $id open"
else
if [ -z "$TAOLF" ]; then
$EDITOR $fx
return
fi
@ -28,15 +27,16 @@ cmd pushedit %{{
set +u
files=$1
[ -z $files ] && {
echo "Open: " && read files
echo "Open: " && read -r files
echo
}
echo $files | xargs -r touch
if [ -n "$TAOLF" ]; then
set -- $files
lf -remote "send $id unselect
send $id toggle $files
send $id open
send $id unselect"
send $id select $1
send $id open"
else
lf -remote "send $id \$$OPENER $files"
fi

6
.config/lf/todo
View file

@ -1,6 +0,0 @@
gpg asks for unlock when viewing gpg keys
rework rifle.conf
look into perl-File-MimeInfo
look into mimeo
Get the swallow patch up and running asap!
inode/directory handler for forking/terminal

1
.config/nvim/lua/config/filetypes.lua
View file

@ -1,5 +1,4 @@
local ansible_test = function(path, bufnr)
if string.find(path, "templates") or string.find(path, "files") then
return "yaml"
end

92
.config/nvim/lua/config/keymaps.lua
View file

@ -5,17 +5,17 @@ local icons = require("config.icons")
local maps = f.empty_map_table()
M.sections = {
p = { desc = icons.Package .. " Packages" },
b = { desc = icons.Buffer .. " Buffers" },
bs = { desc = "Sort Buffers" },
d = { desc = icons.Bug .. " Debugger" },
g = { desc = icons.Git .. " Git" },
f = { desc = icons.Search .. " Find" },
l = { desc = icons.Code .. " LSP" },
t = { desc = icons.Console .. " Terminal" },
u = { desc = icons.Gear .. " Utility" },
n = { desc = icons.Note .. " Notes" },
e = { desc = icons.FileTree .. " File Manager" },
p = { desc = icons.Package .. " Packages" },
b = { desc = icons.Buffer .. " Buffers" },
bs = { desc = "Sort Buffers" },
d = { desc = icons.Bug .. " Debugger" },
g = { desc = icons.Git .. " Git" },
f = { desc = icons.Search .. " Find" },
l = { desc = icons.Code .. " LSP" },
t = { desc = icons.Console .. " Terminal" },
u = { desc = icons.Gear .. " Utility" },
n = { desc = icons.Note .. " Notes" },
e = { desc = icons.FileTree .. " File Manager" },
}
M.maps = function()
@ -323,24 +323,24 @@ M.maps = function()
end,
desc = "File manager",
}
maps.n["gE"] = { "" }
maps.n["<Leader>ee"] = {
-- maps.n["gE"] = { "" }
maps.n["<Leader>ec"] = {
function()
require("taolf").start()
end,
desc = "File manager",
desc = "File manager in vim's working directory",
}
maps.n["<Leader>eg"] = {
function()
require("taolf").start({ dir = "gwd" })
end,
desc = "File manager in git working directory",
desc = "File manager in git root",
}
maps.n["<Leader>ef"] = {
function()
require("taolf").start({ dir = "fd" })
end,
desc = "File manager in open file's working directory",
desc = "File manager in open file's directory",
}
end
@ -417,15 +417,15 @@ M.maps = function()
}
maps.n["<Leader>ff"] = {
function()
require("telescope.builtin").find_files()
require("telescope.builtin").find_files({ hidden = true, no_ignore = true })
end,
desc = "Find files",
}
maps.n["<Leader>fF"] = {
maps.n["<Leader>fg"] = {
function()
require("telescope.builtin").find_files({ hidden = true, no_ignore = true })
require("telescope.builtin").git_files({ hidden = true, no_ignore = true })
end,
desc = "Find all files",
desc = "Find git files",
}
maps.n["<Leader>fh"] = {
function()
@ -458,19 +458,6 @@ M.maps = function()
desc = "Find registers",
}
maps.n["<Leader>fw"] = {
function()
require("telescope.builtin").live_grep()
end,
desc = "Find words",
}
-- maps.n["<Leader>fb"] = { function() require("telescope.builtin").buffers() end, desc = "Find buffers" }
maps.n["<Leader>ft"] = {
function()
require("telescope").extensions["todo-comments"].todo()
end,
desc = "Find buffers",
}
maps.n["<Leader>fW"] = {
function()
require("telescope.builtin").live_grep({
additional_args = function(args)
@ -478,7 +465,19 @@ M.maps = function()
end,
})
end,
desc = "Find words in all files",
desc = "Find words",
}
maps.n["<Leader>fb"] = {
function()
require("telescope.builtin").buffers()
end,
desc = "Find buffers",
}
maps.n["<Leader>ft"] = {
function()
require("telescope").extensions["todo-comments"].todo()
end,
desc = "Find buffers",
}
maps.n["<Leader>l"] = M.sections.l
maps.n["<Leader>ls"] = {
@ -501,7 +500,8 @@ M.maps = function()
maps.n["<leader>gg"] = {
function()
local worktree = f.file_worktree()
local flags = worktree and (" --work-tree=%s --git-dir=%s"):format(worktree.toplevel, worktree.gitdir)
local flags = worktree
and (" --work-tree=%s --git-dir=%s"):format(worktree.toplevel, worktree.gitdir)
or ""
f.toggle_term_cmd("lazygit " .. flags)
end,
@ -749,17 +749,17 @@ M.maps = function()
end
M.surround = {
insert = false,
insert_line = false,
normal = "ys",
normal_cur = "yss",
normal_line = "yS",
normal_cur_line = "ySS",
visual = "S",
visual_line = "gS",
delete = "ds",
change = "cs",
change_line = "cS",
insert = false,
insert_line = false,
normal = "ys",
normal_cur = "yss",
normal_line = "yS",
normal_cur_line = "ySS",
visual = "S",
visual_line = "gS",
delete = "ds",
change = "cs",
change_line = "cS",
}
M.aerial = {

4
.config/nvim/lua/config/options.lua
View file

@ -12,7 +12,7 @@ g.git_worktrees = {
g.max_lines = 1000
g.max_size = 1024 * 100
o.undodir = vim.fn.stdpath("cache") .. "/undo"
o.undodir = { vim.fn.stdpath("cache") .. "/undo" }
o.clipboard = "unnamedplus"
o.conceallevel = 0
o.numberwidth = 3
@ -48,6 +48,6 @@ o.relativenumber = true
o.laststatus = 3
o.modeline = true
o.modelines = 3
o.listchars = "eol:$,tab:>-,trail:~,extends:>,precedes:<"
o.listchars = { eol = "¬", tab = "→ ", extends = "❯", precedes = "❮", trail = "·", nbsp = "␣" }
d({ virtual_text = false })

2
.config/nvim/lua/plugins/misc/alpha.lua
View file

@ -1,6 +1,6 @@
local M = { "goolord/alpha-nvim" }
M.depends = { "telescope.nvim", "todo-comments.nvim" }
M.dependencies = { "telescope.nvim", "todo-comments.nvim" }
M.opts = function()
local icons = require("config.icons")

4
.config/nvim/lua/plugins/misc/taolf.lua
View file

@ -1,10 +1,12 @@
local M = { "ssnailed/taolf" }
M.dev = true
M.event = "VeryLazy"
M.cmd = { "Lf" }
M.depends = { "toggleterm.nvim" }
M.dependencies = { "toggleterm.nvim" }
M.config = true

2
.config/nvim/lua/plugins/misc/todo-comments.lua
View file

@ -3,7 +3,7 @@ local icons = require("config.icons")
M.event = { "BufReadPost", "BufNewFile", "BufNew" }
M.config = {
M.opts = {
signs = false,
keywords = {
BUG = { icon = icons.Bug, color = "error", alt = { "FIXME", "FIX", "FIXIT", "ISSUE" } },

183
.config/nvim/lua/plugins/misc/treesitter.lua
View file

@ -1,121 +1,110 @@
local M = { "nvim-treesitter/nvim-treesitter" }
M.dependencies = {
"nvim-treesitter/nvim-treesitter-textobjects",
"windwp/nvim-ts-autotag",
"nvim-treesitter/nvim-treesitter-textobjects",
"windwp/nvim-ts-autotag",
}
M.event = { "BufReadPost", "BufNewFile", "BufNew" }
M.build = ":TSUpdate"
M.cmd = {
"TSBufDisable",
"TSBufEnable",
"TSBufToggle",
"TSDisable",
"TSEnable",
"TSToggle",
"TSInstall",
"TSInstallInfo",
"TSInstallSync",
"TSModuleInfo",
"TSUninstall",
"TSUpdate",
"TSUpdateSync",
}
-- M.cmd = {
-- "TSBufDisable",
-- "TSBufEnable",
-- "TSBufToggle",
-- "TSDisable",
-- "TSEnable",
-- "TSToggle",
-- "TSInstall",
-- "TSInstallInfo",
-- "TSInstallSync",
-- "TSModuleInfo",
-- "TSUninstall",
-- "TSUpdate",
-- "TSUpdateSync",
-- }
M.init = function(plugin)
require("lazy.core.loader").add_to_rtp(plugin)
require("nvim-treesitter.query_predicates")
require("lazy.core.loader").add_to_rtp(plugin)
require("nvim-treesitter.query_predicates")
end
M.opts = {
ensure_installed = {
"bash",
"c",
"lua",
"markdown",
"markdown_inline",
"python",
"query",
"vim",
"vimdoc",
},
autotag = { enable = true },
highlight = {
enable = true,
},
auto_install = true,
autopairs = {
enable = false,
},
incremental_selection = { enable = true },
indent = { enable = true },
textobjects = {
select = {
enable = true,
lookahead = true,
autotag = { enable = true },
highlight = {
enable = true,
},
auto_install = true,
autopairs = {
enable = false,
},
incremental_selection = { enable = true },
indent = { enable = true },
textobjects = {
select = {
enable = true,
lookahead = true,
-- TODO: Move to config.keymaps
keymaps = {
["ak"] = { query = "@block.outer", desc = "around block" },
["ik"] = { query = "@block.inner", desc = "inside block" },
["ac"] = { query = "@class.outer", desc = "around class" },
["ic"] = { query = "@class.inner", desc = "inside class" },
["a?"] = { query = "@conditional.outer", desc = "around conditional" },
["i?"] = { query = "@conditional.inner", desc = "inside conditional" },
["af"] = { query = "@function.outer", desc = "around function " },
["if"] = { query = "@function.inner", desc = "inside function " },
["al"] = { query = "@loop.outer", desc = "around loop" },
["il"] = { query = "@loop.inner", desc = "inside loop" },
["aa"] = { query = "@parameter.outer", desc = "around argument" },
["ia"] = { query = "@parameter.inner", desc = "inside argument" },
},
},
move = {
enable = true,
set_jumps = true,
keymaps = {
["ak"] = { query = "@block.outer", desc = "around block" },
["ik"] = { query = "@block.inner", desc = "inside block" },
["ac"] = { query = "@class.outer", desc = "around class" },
["ic"] = { query = "@class.inner", desc = "inside class" },
["a?"] = { query = "@conditional.outer", desc = "around conditional" },
["i?"] = { query = "@conditional.inner", desc = "inside conditional" },
["af"] = { query = "@function.outer", desc = "around function " },
["if"] = { query = "@function.inner", desc = "inside function " },
["al"] = { query = "@loop.outer", desc = "around loop" },
["il"] = { query = "@loop.inner", desc = "inside loop" },
["aa"] = { query = "@parameter.outer", desc = "around argument" },
["ia"] = { query = "@parameter.inner", desc = "inside argument" },
},
},
move = {
enable = true,
set_jumps = true,
-- TODO: Move to config.keymaps
goto_next_start = {
["]k"] = { query = "@block.outer", desc = "Next block start" },
["]f"] = { query = "@function.outer", desc = "Next function start" },
["]a"] = { query = "@parameter.inner", desc = "Next argument start" },
},
goto_next_start = {
["]k"] = { query = "@block.outer", desc = "Next block start" },
["]f"] = { query = "@function.outer", desc = "Next function start" },
["]a"] = { query = "@parameter.inner", desc = "Next argument start" },
},
-- TODO: Move to config.keymaps
goto_next_end = {
["]K"] = { query = "@block.outer", desc = "Next block end" },
["]F"] = { query = "@function.outer", desc = "Next function end" },
["]A"] = { query = "@parameter.inner", desc = "Next argument end" },
},
goto_next_end = {
["]K"] = { query = "@block.outer", desc = "Next block end" },
["]F"] = { query = "@function.outer", desc = "Next function end" },
["]A"] = { query = "@parameter.inner", desc = "Next argument end" },
},
-- TODO: Move to config.keymaps
goto_previous_start = {
["[k"] = { query = "@block.outer", desc = "Previous block start" },
["[f"] = { query = "@function.outer", desc = "Previous function start" },
["[a"] = { query = "@parameter.inner", desc = "Previous argument start" },
},
goto_previous_start = {
["[k"] = { query = "@block.outer", desc = "Previous block start" },
["[f"] = { query = "@function.outer", desc = "Previous function start" },
["[a"] = { query = "@parameter.inner", desc = "Previous argument start" },
},
-- TODO: Move to config.keymaps
goto_previous_end = {
["[K"] = { query = "@block.outer", desc = "Previous block end" },
["[F"] = { query = "@function.outer", desc = "Previous function end" },
["[A"] = { query = "@parameter.inner", desc = "Previous argument end" },
},
},
swap = {
enable = true,
goto_previous_end = {
["[K"] = { query = "@block.outer", desc = "Previous block end" },
["[F"] = { query = "@function.outer", desc = "Previous function end" },
["[A"] = { query = "@parameter.inner", desc = "Previous argument end" },
},
},
swap = {
enable = true,
-- TODO: Move to config.keymaps
swap_next = {
[">K"] = { query = "@block.outer", desc = "Swap next block" },
[">F"] = { query = "@function.outer", desc = "Swap next function" },
[">A"] = { query = "@parameter.inner", desc = "Swap next argument" },
},
swap_next = {
[">K"] = { query = "@block.outer", desc = "Swap next block" },
[">F"] = { query = "@function.outer", desc = "Swap next function" },
[">A"] = { query = "@parameter.inner", desc = "Swap next argument" },
},
-- TODO: Move to config.keymaps
swap_previous = {
["<K"] = { query = "@block.outer", desc = "Swap previous block" },
["<F"] = { query = "@function.outer", desc = "Swap previous function" },
["<A"] = { query = "@parameter.inner", desc = "Swap previous argument" },
},
},
},
swap_previous = {
["<K"] = { query = "@block.outer", desc = "Swap previous block" },
["<F"] = { query = "@function.outer", desc = "Swap previous function" },
["<A"] = { query = "@parameter.inner", desc = "Swap previous argument" },
},
},
},
}
return M

1
.config/tmux/tmux.conf
View file

@ -16,6 +16,7 @@ setw -g mode-keys vi
set -g destroy-unattached on
setw -g monitor-activity on
set -g visual-activity on
set -g focus-events on
set-option -g default-shell /bin/zsh
# UNDERCURL COMPATIBILITY