From 7aaba9140782b508feaf48bd02cf13bd08c5d299 Mon Sep 17 00:00:00 2001 From: Anton Bilous Date: Tue, 30 Dec 2025 22:37:05 +0200 Subject: [PATCH] misc --- .config/direnv/direnv.toml | 3 +++ .config/direnv/direnvrc | 1 + .config/fish/conf.d/env.fish | 6 +++-- .config/git/config | 19 +++++++++++---- .config/helix/languages.toml | 44 +++++++++++++++++++++++++++++++++-- .config/htop/htoprc | 2 +- .config/hypr/binds.conf | 4 +++- .config/lazydocker/config.yml | 3 +++ .config/lazygit/config.yml | 2 +- .gitignore | 4 ++++ 10 files changed, 76 insertions(+), 12 deletions(-) create mode 100644 .config/direnv/direnv.toml create mode 100644 .config/direnv/direnvrc create mode 100644 .config/lazydocker/config.yml diff --git a/.config/direnv/direnv.toml b/.config/direnv/direnv.toml new file mode 100644 index 0000000..4cf5e71 --- /dev/null +++ b/.config/direnv/direnv.toml @@ -0,0 +1,3 @@ +[global] +warn_timeout = "2m" +hide_env_diff = true diff --git a/.config/direnv/direnvrc b/.config/direnv/direnvrc new file mode 100644 index 0000000..6f7015c --- /dev/null +++ b/.config/direnv/direnvrc @@ -0,0 +1 @@ +source ~/.nix-profile/share/nix-direnv/direnvrc diff --git a/.config/fish/conf.d/env.fish b/.config/fish/conf.d/env.fish index e164a12..850362b 100644 --- a/.config/fish/conf.d/env.fish +++ b/.config/fish/conf.d/env.fish @@ -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 diff --git a/.config/git/config b/.config/git/config index ec280e1..54b4eac 100644 --- a/.config/git/config +++ b/.config/git/config @@ -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 diff --git a/.config/helix/languages.toml b/.config/helix/languages.toml index 26acb56..ae85927 100644 --- a/.config/helix/languages.toml +++ b/.config/helix/languages.toml @@ -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" diff --git a/.config/htop/htoprc b/.config/htop/htoprc index 578398b..dcf018a 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -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 diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf index f445ea5..674a39c 100644 --- a/.config/hypr/binds.conf +++ b/.config/hypr/binds.conf @@ -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 diff --git a/.config/lazydocker/config.yml b/.config/lazydocker/config.yml new file mode 100644 index 0000000..1d52df6 --- /dev/null +++ b/.config/lazydocker/config.yml @@ -0,0 +1,3 @@ +gui: + border: single + returnImmediately: true diff --git a/.config/lazygit/config.yml b/.config/lazygit/config.yml index d6177ed..3d57541 100644 --- a/.config/lazygit/config.yml +++ b/.config/lazygit/config.yml @@ -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 diff --git a/.gitignore b/.gitignore index a5dae26..7bd95af 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ !.config/paru/ !.config/htop/ !.config/tealdeer/ +!.config/direnv/ !.config/yazi/ .config/yazi/*/ @@ -37,6 +38,9 @@ !.config/lazygit/ .config/lazygit/* !.config/lazygit/config.yml +!.config/lazydocker/ +.config/lazydocker/* +!.config/lazydocker/config.yml !.config/helix/