Compare commits

...

12 commits

Author SHA1 Message Date
f05e2e11e1
nvim: Fix zk note creation mappings
Mappings to create a note with its content or title from the current
selection now work correctly.
2024-06-14 22:08:55 +02:00
dc465bb39a
nvim: Add mapping to show notification history
Added the `<leader>sh` (show history) mapping to display the recent
history of messages sent to notify. Uses fidget.nvim to accomplish this.
2024-06-14 22:08:12 +02:00
7761018507
task: Change taskrc includes to absolute paths
In preparation for integrating bugwarrior into these dotfiles I am
changing the taskwarrior include options to absolute paths (though still
retaining the `~` home shortcut).

This seems necessary as bugwarrior, both in its current 1.8.0 and its
git HEAD version, just absolutely refuses to run when the includes are
relative to the taskrc file. A little sad but not too bad overall since
the taskrc in these dotfiles will always live in the XDG_CONFIG_HOME
directory anyway.
2024-06-14 22:07:17 +02:00
8f679d0b1a
nvim: Disable flash.nvim in search mode
Hopefully definitively disabled the search mode for the flash.nvim
plugin. Previously only disabled the key mapping but it would still run
every now and again.
2024-06-14 22:02:47 +02:00
670057d543
river: Fix variable quoting 2024-06-14 22:01:56 +02:00
38c85d6de0
papis: Small variable fix to papis-reload script 2024-06-14 21:54:48 +02:00
a7b4e16f66
task: Add bugwarrior gitbug uda settings
Added settings for bugwarrior to import gitbug repository issues as
tasks into taskwarrior. This is still very experimental and I have to
continue hacking on it to arrive somewhere that is useful for me.
2024-06-13 16:57:34 +02:00
107a07693e
flavours: Fix zathura colorscheme file naming
In preparation for at some point leaving flavours in favour of tinty
(since flavours is not maintained anymore), started preparing a rough
translation of the config file for the new program. One of the things I
changed (to make more semantic sense) is the zathura colorscheme file
name.
2024-06-13 16:57:34 +02:00
d2499664cd
khard: Update to new vcard dir layout
After cleaning my personal contacts, I changed the layout of my vdir
synchronization. This updates it to the new format.
2024-06-13 16:34:50 +02:00
a665648b1e
nvim: Update plugins and lazy loading events 2024-06-13 16:33:33 +02:00
d1ef6584f1
river: Refactor layout engine definition
Since we can dynamically define and spawn layout engines this commit
changes the riverwm config file setup in a way that makes it possible to
change the layout engine with a single variable instead of all
throughout the file (variable extraction).
2024-06-13 16:32:15 +02:00
5cb4231fe9
dotter: Add vimiv to templated files 2024-06-13 10:26:26 +02:00
14 changed files with 91 additions and 53 deletions

View file

@ -89,6 +89,7 @@ desktop = "~"
"multimedia/.config/ncmpcpp/config" = { target = "~/.config/ncmpcpp/config", type = "symbolic" }
"multimedia/.config/mpv/fonts/uosc_icons.otf" = { target = "~/.config/mpv/fonts/uosc_icons.otf", type = "symbolic" }
"multimedia/.config/mpv/fonts/uosc_textures.ttf" = { target = "~/.config/mpv/fonts/uosc_textures.ttf", type = "symbolic" }
"multimedia/.config/vimiv/styles/base16" = { target = "~/.config/vimiv/styles/base16", type = "template" }
multimedia = "~"
[qutebrowser.files]

View file

@ -53,7 +53,7 @@ rewrite = true
[[items]]
template = "zathura"
file = "~/.local/state/zathura/zathurarc"
file = "~/.local/state/zathura/colors.config"
rewrite = true
[[items]]

View file

@ -3,6 +3,7 @@
mod="Mod4"
modemod="Mod1"
term=${TERMINAL:-foot}
layout="rivercarro"
time_to_lockscreen=300
time_to_screendim=600
time_to_suspend=900
@ -109,10 +110,10 @@ riverctl map normal $mod+Shift K swap previous
riverctl map normal $mod+Shift Return zoom
# change layout orientation
riverctl map normal $mod Up send-layout-cmd rivercarro "main-location top"
riverctl map normal $mod Right send-layout-cmd rivercarro "main-location right"
riverctl map normal $mod Down send-layout-cmd rivercarro "main-location bottom"
riverctl map normal $mod Left send-layout-cmd rivercarro "main-location left"
riverctl map normal $mod Up send-layout-cmd $layout "main-location top"
riverctl map normal $mod Right send-layout-cmd $layout "main-location right"
riverctl map normal $mod Down send-layout-cmd $layout "main-location bottom"
riverctl map normal $mod Left send-layout-cmd $layout "main-location left"
# snap views to screen edges
riverctl map normal $mod+Control H snap left
@ -127,8 +128,8 @@ riverctl map normal $mod F toggle-fullscreen
# Make all connected outputs show the desktop and no windows at all
riverctl map normal $mod+Shift M spawn 'for i in $(wlopm | wc -l); do riverctl set-focused-tags $((1 << 10)); riverctl focus-output next; done; riverctl set-focused-tags $((1 << 10)); riverctl focus-output next'
riverctl map normal $mod+Shift F10 spawn 'riverctl send-layout-cmd rivercarro "gaps 0"'
riverctl map normal $mod F10 spawn 'riverctl send-layout-cmd rivercarro "gaps 6"'
riverctl map normal $mod+Shift F10 spawn "riverctl send-layout-cmd $layout 'gaps 0'"
riverctl map normal $mod F10 spawn "riverctl send-layout-cmd $layout 'gaps 6'"
# toggle float
riverctl map normal $mod+Shift v toggle-float
@ -152,11 +153,11 @@ riverctl map interact_float $mod+Shift J move down 100
riverctl map interact_float $mod+Shift K move up 100
riverctl map interact_float $mod+Shift L move right 100
# decrease/increase the main ratio of layout
riverctl map interact_float None H send-layout-cmd rivercarro "main-ratio -0.05"
riverctl map interact_float None L send-layout-cmd rivercarro "main-ratio +0.05"
riverctl map interact_float None H send-layout-cmd $layout "main-ratio -0.05"
riverctl map interact_float None L send-layout-cmd $layout "main-ratio +0.05"
# increment/decrement the main layout
riverctl map interact_float None J send-layout-cmd rivercarro "main-count +1"
riverctl map interact_float None K send-layout-cmd rivercarro "main-count -1"
riverctl map interact_float None J send-layout-cmd $layout "main-count +1"
riverctl map interact_float None K send-layout-cmd $layout "main-count -1"
### End resize and moving mode
# focus the next/previous output
@ -289,9 +290,9 @@ riverctl spawn "wl-paste -t text --watch clipman store"
# killall polkit-gnome-authentication-agent-1
# /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
# start layouting engine
killall rivercarro
riverctl spawn "rivercarro -main-ratio 0.65"
killall $layout
riverctl spawn "$layout -main-ratio 0.65"
# River will send the process group of the init executable SIGTERM on exit.
riverctl default-layout rivercarro
# exec rivercarro -main-ratio 0.65 -view-padding 6 -outer-padding 6 & # -> does not work with current rivercarro version (0.1.4)
riverctl default-layout $layout
# exec $layout -main-ratio 0.65 -view-padding 6 -outer-padding 6 & # -> does not work with current rivercarro version (0.1.4)
brightnessctl set 70%

View file

@ -23,19 +23,19 @@
"cmp-treesitter": { "branch": "master", "commit": "958fcfa0d8ce46d215e19cc3992c542f576c4123" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
"completion-vcard": { "branch": "master", "commit": "2220fd517a985ececed1adcf0e5be8f2815564c7" },
"conform.nvim": { "branch": "master", "commit": "9b26e81c4292106e68dda3e7b64473434fd5b3e0" },
"conform.nvim": { "branch": "master", "commit": "797d1f622a23d4a21bb58218bdf5999a9beac4ef" },
"dial.nvim": { "branch": "master", "commit": "54b503f906bc9e5ab85288414840a1b86d40769f" },
"dressing.nvim": { "branch": "master", "commit": "572314728cb1ce012e825fd66331f52c94acac12" },
"fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" },
"flash.nvim": { "branch": "main", "commit": "7bb4a9c75d1e20cd24185afedeaa11681829ba23" },
"friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" },
"friendly-snippets": { "branch": "main", "commit": "700c4a25caacbb4648c9a27972c2fe203948e0c2" },
"fwatch.nvim": { "branch": "main", "commit": "a691f7349dc66285cd75a1a698dd28bca45f2bf8" },
"git-conflict.nvim": { "branch": "main", "commit": "bfd9fe6fba9a161fc199771d85996236a0d0faad" },
"gitsigns.nvim": { "branch": "main", "commit": "76927d14d3fbd4ba06ccb5246e79d93b5442c188" },
"glance.nvim": { "branch": "master", "commit": "51059bcf21016387b6233c89eed220cf47fca752" },
"headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" },
"image.nvim": { "branch": "master", "commit": "da64ce69598875c9af028afe129f916b02ccc42e" },
"lazy.nvim": { "branch": "main", "commit": "70f2c090d3ffb14f8702d468e05beb240b768881" },
"lazy.nvim": { "branch": "main", "commit": "fafe1f7c640aed75e70a10e6649612cd96f39149" },
"lsp-setup.nvim": { "branch": "main", "commit": "6e4e977512ce426d8b52c27f3b6e6aefc73e1452" },
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
"markmap.nvim": { "branch": "main", "commit": "5fb6755cf5434511cc23a4936c9eb76b9142fba5" },
@ -46,26 +46,26 @@
"mini.nvim": { "branch": "main", "commit": "f24747266a047617d06605a2316aa6c071662fa2" },
"molten-nvim": { "branch": "main", "commit": "df5ccef3b6fda3582f7746e45327ee031f668826" },
"neogen": { "branch": "main", "commit": "0daffcec249bf42275e322361fe55b89a05ff278" },
"neotest": { "branch": "master", "commit": "6f35d797882c6ce0ab7c87dc86561512dc3d7aba" },
"neotest": { "branch": "master", "commit": "f30bab1faef13d47f3905e065215c96a42d075ad" },
"neotest-python": { "branch": "master", "commit": "81d2265efac717bb567bc15cc652ae10801286b3" },
"nvim-FeMaco.lua": { "branch": "main", "commit": "96bbf843595dbe865838b3f2484b73557f34700c" },
"nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
"nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
"nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
"nvim-coverage": { "branch": "main", "commit": "aa4b4400588e2259e87e372b1e4e90ae13cf5a39" },
"nvim-lint": { "branch": "master", "commit": "1a3a8d047bc01f1760ae4a0f5e80f111ea222e67" },
"nvim-lspconfig": { "branch": "master", "commit": "92166b89ab4b3d60f24e58170cac53b7141fd032" },
"nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" },
"nvim-surround": { "branch": "main", "commit": "f1f0699a1d49f28e607ffa4361f1bbe757ac5ebc" },
"nvim-lint": { "branch": "master", "commit": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce" },
"nvim-lspconfig": { "branch": "master", "commit": "4d38bece98300e3e5cd24a9aa0d0ebfea4951c16" },
"nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" },
"nvim-surround": { "branch": "main", "commit": "687ea2f33955df0042bf228853a82696265e7e2d" },
"nvim-toggleterm.lua": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" },
"nvim-tree.lua": { "branch": "master", "commit": "2bc725a3ebc23f0172fb0ab4d1134b81bcc13812" },
"nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" },
"nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" },
"nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" },
"nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" },
"nvim-treesitter-textsubjects": { "branch": "master", "commit": "1428108f18ce9d8cc4481dcedebeeb490eabf395" },
"nvim-ts-autotag": { "branch": "main", "commit": "6eb4120a1aadef07ac312f1c4bc6456712220007" },
"nvim-ts-autotag": { "branch": "main", "commit": "06fe07d7523ba8c755fac7c913fceba43b1720ee" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" },
"nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" },
"otter.nvim": { "branch": "main", "commit": "5cd161f28835fada50d99c89dc05041565a27bdb" },
"otter.nvim": { "branch": "main", "commit": "cbb1be0586eae18cbea38ada46af428d2bebf81a" },
"peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" },
"plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
@ -75,12 +75,11 @@
"stickybuf.nvim": { "branch": "master", "commit": "2160fcd536d81f5fa43f7167dba6634e814e3154" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
"telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
"trouble.nvim": { "branch": "main", "commit": "7a9c235806d4d9e2e74889f7e359f183a6d0e20d" },
"trouble.nvim": { "branch": "main", "commit": "3609bb9a82bbab1ef95cf2c27ce7e52267a7d40d" },
"twilight.nvim": { "branch": "main", "commit": "8bb7fa7b918baab1ca81b977102ddb54afa63512" },
"undotree": { "branch": "main", "commit": "eab459ab87dd249617b5f7187bb69e614a083047" },
"vifm.vim": { "branch": "master", "commit": "a8130c37d144b51d84bee19f0532abcd3583383f" },
"vim-criticmarkup": { "branch": "master", "commit": "d15dc134eb177a170c79f6377f81eb02a9d20b02" },
"vim-easy-align": { "branch": "master", "commit": "0db4ea6132110631ec678a99a82aa49a0686ae65" },
"vim-numbertoggle": { "branch": "main", "commit": "df9b1fe616507340718716204ba7f434125bdf7a" },
"vim-pandoc-syntax": { "branch": "master", "commit": "16939cda184ff555938cc895cc62477c172997f9" },
"vim-scimark": { "branch": "master", "commit": "9b66a88fa4bb87b8baab3c4aecc43b985b32e7fd" },

View file

@ -47,7 +47,13 @@ return {
{
"folke/flash.nvim",
event = "VeryLazy",
opts = {},
opts = {
modes = {
search = {
enabled = false,
},
},
},
keys = {
{
"s",

View file

@ -98,7 +98,7 @@ return {
},
{ "WhoIsSethDaniel/mason-tool-installer.nvim" },
},
event = { "BufRead", "BufNewFile", "InsertEnter" },
event = { "BufReadPost", "BufNewFile", "BufWritePre" },
after = { "nvim-cmp" },
config = function()
require("plugins.config.lsp")
@ -125,7 +125,7 @@ return {
end,
})
end,
event = { "BufWritePre", "InsertEnter" },
event = { "BufReadPost", "BufNewFile", "BufWritePre" },
},
-- formatting setup
@ -167,7 +167,7 @@ return {
})
end,
cmd = { "ConformInfo" },
event = { "BufReadPre" },
event = { "BufReadPost", "BufNewFile", "BufWritePre" },
keys = {
{
"<localleader>ll",
@ -238,7 +238,12 @@ return {
},
keys = {
{ "<leader>sd", "<cmd>Trouble diagnostics toggle<cr>", silent = true, desc = "diagnostics workspace" },
{ "<leader>sD", "<cmd>Trouble diagnostics toggle filter.buf=0<cr>", silent = true, desc = "diagnostics document" },
{
"<leader>sD",
"<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
silent = true,
desc = "diagnostics document",
},
},
},

View file

@ -125,8 +125,8 @@ local prose_plugs = {
{ "<leader>nl", "<cmd>ZkLinks<cr>", desc = "note links" },
{ "<leader>nb", "<cmd>ZkBacklinks<cr>", desc = "note backlinks" },
{ "<localleader>nn", "<cmd>ZkNew { title = vim.fn.input('Title: ') }<cr>", desc = "new note" },
{ "<localleader>nn", "<cmd>ZkNewFromTitleSelection<cr>", desc = "new note from selection", mode = "v" },
{ "<localleader>nN", "<cmd>ZkNewFromContentSelection<cr>", desc = "content from selection", mode = "v" },
{ "<localleader>nn", ":'<,'>ZkNewFromTitleSelection<cr>", desc = "new note from selection", mode = "v" },
{ "<localleader>nN", ":'<,'>ZkNewFromContentSelection<cr>", desc = "content from selection", mode = "v" },
},
},
@ -144,17 +144,20 @@ local prose_plugs = {
-- ADDITIONAL DEPENDENCIES: papis and yq in shell env
-- {
-- "jghauser/papis.nvim",
-- cond = vim.fn.executable("papis") == 1 and vim.fn.executable("yq") == 1,
-- ft = writing_ft,
-- dependencies = {
-- "kkharji/sqlite.lua",
-- "nvim-lua/plenary.nvim",
-- "MunifTanjim/nui.nvim",
-- "pysan3/pathlib.nvim",
-- "nvim-neotest/nvim-nio",
-- "nvim-treesitter/nvim-treesitter",
-- },
-- cond = vim.fn.executable("papis") == 1 and vim.fn.executable("yq") == 1,
-- ft = writing_ft,
-- lazy = false,
-- config = true,
-- }
-- config = function()
-- require("papis").setup({})
-- end,
-- },
}
return prose_plugs

View file

@ -63,7 +63,7 @@ return {
filetype = "nu",
}
end,
event = "BufReadPost",
event = { "BufReadPost", "BufNewFile", "BufWritePre", "VeryLazy" },
cmd = {
"TSBufDisable",
"TSBufEnable",
@ -94,7 +94,7 @@ return {
{
"https://gitlab.com/HiPhish/rainbow-delimiters.nvim",
lazy = false,
event = { "BufReadPost", "BufNewFile"},
event = { "BufReadPost", "BufNewFile", "BufWritePre", "VeryLazy" },
config = function()
require("rainbow-delimiters.setup").setup({})
end,

View file

@ -43,7 +43,7 @@ return {
extensions = { "quickfix", "toggleterm" },
})
end,
event = { "BufNewFile", "BufAdd", "BufWinEnter" },
event = { "VeryLazy" },
},
-- create pretty unobtrusive notifications
{
@ -58,6 +58,10 @@ return {
},
},
event = { "VeryLazy" },
cmd = {"Fidget"},
keys = {
{ "<leader>sh", "<cmd>Fidget history<cr>", { silent = true, desc = "show notification history" } },
}
},
-- make all vim.ui interfaces prettyy
{ "stevearc/dressing.nvim", config = true, event = "VeryLazy" },

View file

@ -1,6 +1,6 @@
[addressbooks]
[[contacts]]
path = ~/documents/contacts/myconts
path = ~/documents/contacts/personal
[general]
debug = no

View file

@ -71,13 +71,13 @@ urgency.inherit=1
include /usr/share/doc/task/rc/holidays.de-DE.rc
# Themes are in additional file
include colorscheme
include ~/.config/task/colorscheme
# Taskserver sync settings
include task-sync.rc
include ~/.config/task/task-sync.rc
# My personal tw contexts (e.g. work/personal)
include contexts
include ~/.config/task/contexts
# try to fix some color weirdness, especially in tmux
# color.scheduled=on grey15
@ -92,4 +92,20 @@ report._reviewed.columns=uuid
report._reviewed.sort=reviewed+,modified+
report._reviewed.filter=( reviewed.none: or reviewed.before:now-6days ) and ( +PENDING or +WAITING )
news.version=2.6.0
# Bugwarrior UDAs
uda.gitbugauthor.type=string
uda.gitbugauthor.label=Gitbug Issue Author
uda.gitbugid.type=string
uda.gitbugid.label=Gitbug UUID
uda.gitbugstate.type=string
uda.gitbugstate.label=Gitbug state
uda.gitbugstate.values=OPEN,CLOSED
uda.gitbugtitle.type=string
uda.gitbugtitle.label=Gitbug Title
# END Bugwarrior UDAs
report.issues.description=Git Issue Open or Closed state
report.issues.columns=id,project,priority,due,gitbugstate,description,tags,scheduled
report.issues.filter=( +PENDING or +WAITING ) and ( gitbugstate:OPEN )
news.version=3.0.2

View file

@ -0,0 +1,3 @@
# from papis import config
#
# config.set("ref-format", f"{doc[author].split()[0] if 'author' in doc else 'Unknown'}{doc[year] if 'year' in doc else '0000'}")

View file

@ -13,7 +13,7 @@ import papis.api
from argparse import ArgumentParser
parser = ArgumentParser()
parser.add_argument(
_ = parser.add_argument(
"--all", "-a", help="reload all libraries not just current", action="store_true"
)
args = parser.parse_args()
@ -25,4 +25,4 @@ else:
for lib in libs:
papis.api.clear_lib_cache(lib)
papis.api.get_all_documents_in_lib()
_ = papis.api.get_all_documents_in_lib()

View file

@ -1,6 +1,6 @@
# overwritten by below colors
include colorscheme
include /home/marty/.local/state/zathura/zathurarc
include /home/marty/.local/state/zathura/colors.config
set recolor "true"
set selection-clipboard "clipboard"