stuff
This commit is contained in:
parent
c5b629b295
commit
69165bbbf7
9 changed files with 213 additions and 94 deletions
|
@ -6,8 +6,8 @@
|
|||
excludesFile = ~/.config/git/ignore
|
||||
# Paginate output
|
||||
pager = less
|
||||
# Use Codium as default editor
|
||||
editor = codium --wait
|
||||
# Use Helix as default editor
|
||||
editor = hx
|
||||
# Don't consider trailing space change as a cause for merge conflicts
|
||||
whitespace = -trailing-space
|
||||
[init]
|
||||
|
@ -36,12 +36,12 @@
|
|||
wordRegex = .
|
||||
# Display submodule-related information (commit listings)
|
||||
submodule = log
|
||||
# Use VSCode as default diff tool when running `git difftool`
|
||||
tool = codium
|
||||
# Use Helix as default diff tool when running `git difftool` (TODO)
|
||||
# tool = helix
|
||||
[difftool]
|
||||
prompt = false
|
||||
[difftool "codium"]
|
||||
cmd = codium --wait --diff -- "$LOCAL" "$REMOTE"
|
||||
# [difftool "helix"]
|
||||
# cmd = hx --wait --diff -- "$LOCAL" "$REMOTE"
|
||||
[fetch]
|
||||
# Auto-fetch submodule changes (won't auto-update)
|
||||
recurseSubmodules = on-demand
|
||||
|
|
4
home/git/.config/git/config-work
Normal file
4
home/git/.config/git/config-work
Normal file
|
@ -0,0 +1,4 @@
|
|||
[user]
|
||||
name = Lukas Wurzinger
|
||||
email = lukas@wrz.one
|
||||
signingkey = ~/.ssh/id_ed25519.pub
|
|
@ -50,7 +50,6 @@ after-delay.enable = true
|
|||
after-delay.timeout = 3000
|
||||
|
||||
[keys.normal]
|
||||
# Nicities
|
||||
esc = ["collapse_selection", "keep_primary_selection"]
|
||||
|
||||
C-h = "select_prev_sibling"
|
||||
|
@ -65,13 +64,7 @@ C-r = "redo"
|
|||
|
||||
x = "extend_line"
|
||||
|
||||
# Vim-like
|
||||
V = ["select_mode", "extend_to_line_bounds"]
|
||||
C = ["extend_to_line_end", "yank_main_selection_to_clipboard", "delete_selection", "insert_mode"]
|
||||
D = ["extend_to_line_end", "yank_main_selection_to_clipboard", "delete_selection"]
|
||||
G = "goto_last_line"
|
||||
|
||||
# Vim-like but also generally useful
|
||||
# Vim
|
||||
"{" = ["goto_prev_paragraph", "collapse_selection"]
|
||||
"}" = ["goto_next_paragraph", "collapse_selection"]
|
||||
|
||||
|
@ -84,7 +77,9 @@ a = ["append_mode", "collapse_selection"]
|
|||
|
||||
u = ["undo", "collapse_selection"]
|
||||
|
||||
## Search for word under cursor
|
||||
G = "goto_last_line"
|
||||
|
||||
# Search for word under cursor
|
||||
"*" = ["move_char_right", "move_prev_word_start", "move_next_word_end", "search_selection", "search_next"]
|
||||
"#" = ["move_char_right", "move_prev_word_start", "move_next_word_end", "search_selection", "search_prev"]
|
||||
|
||||
|
@ -92,20 +87,13 @@ u = ["undo", "collapse_selection"]
|
|||
esc = ["collapse_selection", "normal_mode"]
|
||||
|
||||
[keys.select]
|
||||
# Nicities
|
||||
esc = ["collapse_selection", "keep_primary_selection", "normal_mode"]
|
||||
|
||||
";" = ["collapse_selection", "normal_mode"]
|
||||
|
||||
x = "extend_line"
|
||||
|
||||
# Vim-like
|
||||
V = ["select_mode", "extend_to_line_bounds"]
|
||||
C = ["extend_to_line_end", "yank_main_selection_to_clipboard", "delete_selection", "insert_mode"]
|
||||
D = ["extend_to_line_end", "yank_main_selection_to_clipboard", "delete_selection"]
|
||||
G = "goto_last_line"
|
||||
|
||||
# Vim-like but also generally useful
|
||||
# Vim
|
||||
"{" = ["goto_prev_paragraph", "collapse_selection"]
|
||||
"}" = ["goto_next_paragraph", "collapse_selection"]
|
||||
|
||||
|
@ -115,3 +103,5 @@ a = "select_textobject_around"
|
|||
0 = "goto_first_nonwhitespace"
|
||||
"^" = "goto_line_start"
|
||||
"$" = "goto_line_end"
|
||||
|
||||
G = "goto_last_line"
|
||||
|
|
|
@ -6,3 +6,11 @@ file-types = ["tmpl"]
|
|||
name = "python"
|
||||
language-servers = [ "basedpyright" ]
|
||||
formatter = {command = 'ruff', args = ["format", "--quiet", "-"]}
|
||||
|
||||
[language-server]
|
||||
zk-lsp = { command = "zk", args = [ "lsp" ] }
|
||||
|
||||
[[language]]
|
||||
name = "markdown"
|
||||
roots = [ ".zk" ]
|
||||
language-servers = [ "zk-lsp" ]
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
auto-optimise-store = true
|
||||
experimental-features = nix-command flakes
|
||||
use-xdg-base-directories = true
|
||||
substituters = https://cache.nixos.org https://fossar.cachix.org
|
||||
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= fossar.cachix.org-1:Zv6FuqIboeHPWQS7ysLCJ7UT7xExb4OE8c4LyGb5AsE=
|
||||
substituters = https://cache.nixos.org https://cosmic.cachix.org/ https://cache.nixos.org/ https://fossar.cachix.org https://cosmic.cachix.org
|
||||
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE= fossar.cachix.org-1:Zv6FuqIboeHPWQS7ysLCJ7UT7xExb4OE8c4LyGb5AsE=
|
||||
|
|
50
home/zk/.config/zk/config.toml
Normal file
50
home/zk/.config/zk/config.toml
Normal file
|
@ -0,0 +1,50 @@
|
|||
[notebook]
|
||||
dir = "~/Notes"
|
||||
|
||||
[note]
|
||||
language = "en"
|
||||
default-title = "Untitled"
|
||||
filename = "{{id}}-{{slug title}}"
|
||||
extension = "md"
|
||||
template = "default.md"
|
||||
|
||||
id-charset = "alphanum"
|
||||
id-length = 4
|
||||
id-case = "lower"
|
||||
|
||||
[extra]
|
||||
author = "Helvetica"
|
||||
|
||||
[group.journal]
|
||||
paths = ["journal/weekly", "journal/daily"]
|
||||
|
||||
[group.journal.note]
|
||||
filename = "{{format-date now}}"
|
||||
|
||||
[format.markdown]
|
||||
hashtags = true
|
||||
colon-tags = true
|
||||
|
||||
[tool]
|
||||
editor = "hx"
|
||||
# shell = "/bin/bash"
|
||||
# pager = "less -FIRX"
|
||||
fzf-preview = "bat -p --color always {-1}"
|
||||
|
||||
[filter]
|
||||
recents = "--sort created- --created-after 'last two weeks'"
|
||||
|
||||
[alias]
|
||||
# Edit the last modified note.
|
||||
edlast = "zk edit --limit 1 --sort modified- $@"
|
||||
# Edit the notes selected interactively among the notes created the last two weeks.
|
||||
recent = "zk edit --sort created- --created-after 'last two weeks' --interactive"
|
||||
# Show a random note.
|
||||
lucky = "zk list --quiet --format full --sort random --limit 1"
|
||||
|
||||
[lsp]
|
||||
[lsp.diagnostics]
|
||||
# Report titles of wiki-links as hints.
|
||||
wiki-title = "hint"
|
||||
# Warn for dead links between notes.
|
||||
dead-link = "error"
|
Loading…
Add table
Add a link
Reference in a new issue