This commit is contained in:
2025-12-30 22:37:05 +02:00
parent c38936dcdd
commit 7aaba91407
10 changed files with 76 additions and 12 deletions
+3
View File
@@ -0,0 +1,3 @@
[global]
warn_timeout = "2m"
hide_env_diff = true
+1
View File
@@ -0,0 +1 @@
source ~/.nix-profile/share/nix-direnv/direnvrc
+4 -2
View File
@@ -18,14 +18,16 @@ set -gx CARGO_HOME $XDG_DATA_HOME/cargo
set -gx CLIPPY_CONF_DIR $XDG_DATA_HOME/cargo/
# Can't use '~' in universal variables
set -gx fish_user_paths ~/.local/bin $CARGO_HOME/bin $GOPATH/bin
fish_add_path -g ~/.local/bin $CARGO_HOME/bin $GOPATH/bin
set -gx npm_config_prefix ~/.local
# -agx is a bad idea as login shell itself also does it
# set -gx WINEPATH /usr/x86_64-w64-mingw32/bin
# set -gx CPATH /usr/x86_64-w64-mingw32/include
set -gx WINEPATH /opt/llvm-mingw/x86_64-w64-mingw32/bin/
set -gx BROWSER librewolf # for fish documentation mainly
set -gx BROWSER librewolf
# Convenience
set -gx SCREENSHOT_DIR $XDG_PICTURES_DIR/screen
+14 -5
View File
@@ -14,6 +14,8 @@
# colorMoved = default
[pull]
rebase = true
[push]
recurseSubmodules = check
[merge]
conflictStyle = zdiff3
[interactive]
@@ -35,17 +37,24 @@
showSignature = true
abbrevCommit = true
[gpg]
format = ssh
[gpg "ssh"]
allowedSignersFile = ~/.config/git/allowed_signers
[user]
name = -
email = -
# [tag]
# gpgSign = true
# [commit]
# gpgsign = true
[includeIf "gitdir:~/src/"]
path = ~/src/.gitconfig
; [filter "lfs"]
; required = true
; clean = git-lfs clean -- %f
; smudge = git-lfs smudge -- %f
; process = git-lfs filter-process
# [filter "lfs"]
# required = true
# clean = git-lfs clean -- %f
# smudge = git-lfs smudge -- %f
# process = git-lfs filter-process
+42 -2
View File
@@ -58,8 +58,9 @@ align_comments = false
# [language-server.yaml-language-server.config.yaml.schemas]
# "" = "openapi.{yml,yaml}"
# [language-server.nil]
# formatting.command = "alejandra"
# [[language]]
# name = "nix"
# formatter = { command = "alejandra" }
[[language]]
@@ -76,6 +77,45 @@ formatterMode = "typstyle" # or typstfmt
exportPdf = "never" # onSave, default: never
[[language]]
name = "devicetree"
file-types = ["dts", "dtsi", "keymap"]
# language-servers = ["devicetree_ls"]
# [language-server.devicetree_ls]
# command = "devicetree-language-server"
# args = ["--stdio"]
# [language-server.devicetree_ls.config.devicetree]
# # cwd = "~/src/keyboard/zmk"
# defaultIncludePaths = [
# "~/src/keyboard/zmk/app/dts",
# ]
# # defaultBindingType = "Zephyr"
# # defaultZephyrBindings = ["./zephyr/dts/bindings"]
# # contexts = []
# [[language]]
# name = "python"
# language-servers = ["pylsp", "ruff"]
# auto-format = true
# scope = "source.python"
# [language.formatter]
# command = "ruff"
# args = ["format", "-"]
# [language-server.ruff]
# command = "ruff"
# args = ["server"]
# [language-server.pylsp.config.pylsp.plugins]
# pylsp_mypy.enabled = true
# pylsp_mypy.live_mode = true
# rope_autoimport.enabled = true
[[language]]
name = "rust"
+1 -1
View File
@@ -18,7 +18,7 @@ highlight_changes=1
highlight_changes_delay_secs=4
find_comm_in_cmdline=1
strip_exe_from_cmdline=1
show_merged_command=1
show_merged_command=0
header_margin=1
screen_tabs=0
detailed_cpu_time=0
+3 -1
View File
@@ -159,8 +159,10 @@ bind =, M, exec, mpv --force-window --idle
bind =, M, submap, reset
bind =, E, exec, kitty helix
bind =, E, submap, reset
bind =, N, exec, nheko
bind =, N, exec, nemo
bind =, N, submap, reset
bind = SHIFT, N, exec, nheko
bind = SHIFT, N, submap, reset
bind =, Y, exec, kitty yazi
bind =, Y, submap, reset
bind =, L, exec, logseq
+3
View File
@@ -0,0 +1,3 @@
gui:
border: single
returnImmediately: true
+1 -1
View File
@@ -7,5 +7,5 @@ git:
- pager: delta --paging=never
- pager: delta --paging=never --side-by-side --line-numbers
# - externalDiffCommand: difft --color=always --display=inline --context=5
# - externalDiffCommand: ~/.local/bin/difft --color=always --display=inline --context=5 --line-numbers=off
- externalDiffCommand: difft --color=always --context=5
# colorArg: always