diff --git a/.config/git/config b/.config/git/config index 2be65db..5552dc5 100644 --- a/.config/git/config +++ b/.config/git/config @@ -4,6 +4,7 @@ tool = nvimdiff [core] editor = helix + pager = delta ; repositoryformatversion = 1 ; [extensions] ; objectformat = sha256 @@ -23,3 +24,9 @@ ; clean = git-lfs clean -- %f ; smudge = git-lfs smudge -- %f ; process = git-lfs filter-process +[interactive] + diffFilter = delta --color-only +[delta] + navigate = true +[merge] + conflictStyle = zdiff3 diff --git a/.config/helix/languages.toml b/.config/helix/languages.toml index 7507967..dde3e2e 100644 --- a/.config/helix/languages.toml +++ b/.config/helix/languages.toml @@ -1,3 +1,8 @@ +[[language]] +name = "lua" +auto-format = false + + [[language]] name = "markdown" [language.auto-pairs] @@ -7,31 +12,60 @@ name = "markdown" '[' = ']' '"' = '"' "'" = "'" -'`' = '`' +# '`' = '`' # '<' = '>' +[language-server.markdown-oxide.config] +unresolved_diagnostics = true +include_md_extension_md_link = true # [File](file.md) or [File](file) [[language]] -name = "lua" +name = "sql" auto-format = false +formatter = { command = "sqlformat", args = [ + "--keywords", + "upper", # "upper", "lower", "capitalize" + "--identifiers", + "upper", + # "--reindent", + "--indent_width", + "2", + # "--indent_columns", + # "--compact", "True", + "-", +] } + [[language]] name = "toml" auto-format = true +# TODO: still aligns +[language-server.taplo.config] +alignComments = false +align_comments = false + + +# [language-server.yaml-language-server.config.yaml] +# format = { enable = true } +# validate = true +# schemaStore = true +# [language-server.yaml-language-server.config.yaml.schemas] +# "" = "openapi.{yml,yaml}" + +# [language-server.nil] +# formatting.command = "alejandra" + + [[language]] -name = "sql" +name = "typst" auto-format = true -formatter = { command = "sqlformat", args = [ - "--keywords", - "upper", # "upper", "lower", "capitalize" - "--identifiers", - "lower", - "--reindent", - "--indent_width", - "2", - # "--compact", "True", - "-", -] } +language-servers = ["tinymist"] + +[language-server.tinymist.config] +formatterPrintWidth = 100 # can't stand 120 +formatterMode = "typstyle" # or typstfmt +exportPdf = "never" # onSave, default: never +semanticTokens = "enable" [[language]] @@ -50,31 +84,6 @@ args = { program = "{0}", initCommands = [ "command script import /usr/local/etc/lldb_vscode_rustc_primer.py", ] } - -# TODO: still aligns -[language-server.taplo.config] -alignComments = false -align_comments = false - - -# [language-server.yaml-language-server.config.yaml] -# format = { enable = true } -# validate = true -# schemaStore = true -# [language-server.yaml-language-server.config.yaml.schemas] -# "" = "openapi.{yml,yaml}" - -[language-server.tinymist.config] -formatterPrintWidth = 100 # can't stand 120 -formatterMode = "typstyle" # or typstfmt -exportPdf = "onSave" # "onDocumentHasTitle", # default: never -semanticTokens = "enable" - - -# [language-server.nil] -# formatting.command = "alejandra" - - [language-server.rust-analyzer.config] checkOnSave = true procMacro.enable = true diff --git a/.config/htop/htoprc b/.config/htop/htoprc index 01fdd58..48a76ac 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -40,14 +40,14 @@ column_meter_modes_0=1 1 column_meters_1=DateTime Uptime LoadAverage Tasks Battery DiskIO NetworkIO Memory Swap column_meter_modes_1=2 2 2 2 2 2 2 1 1 tree_view=0 -sort_key=0 +sort_key=47 tree_sort_key=0 sort_direction=-1 tree_sort_direction=-1 tree_view_always_by_pid=0 all_branches_collapsed=0 screen:Main=PID USER PRIORITY NICE M_VIRT M_SHARE M_RESIDENT STATE NLWP PROCESSOR PERCENT_CPU PERCENT_MEM TIME Command -.sort_key=PID +.sort_key=PERCENT_MEM .tree_sort_key=PID .tree_view_always_by_pid=0 .tree_view=0 diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf index 58fb8fa..1423a9c 100644 --- a/.config/hypr/binds.conf +++ b/.config/hypr/binds.conf @@ -77,12 +77,13 @@ bind = SHIFT, F8, exec, bluetoothctl power on bind = $mod, F9, exec, playerctl previous bind = $mod, F10, exec, playerctl next bindle = $mod, F11, exec, brightnessctl s 5%- -binde = CTRL, F11, exec, brightnessctl s 1%- -binde = SHIFT, F11, exec, brightnessctl s 15%- bindle = $mod, F12, exec, brightnessctl s 5%+ +binde = CTRL, F11, exec, brightnessctl s 1%- binde = CTRL, F12, exec, brightnessctl s 1%+ +binde = SHIFT, F11, exec, brightnessctl s 15%- binde = SHIFT, F12, exec, brightnessctl s 15%+ - +bindle = $mod ALT, F11, exec, ddcutil setvcp 10 - 5 +bindle = $mod ALT, F12, exec, ddcutil setvcp 10 + 5 bindle =, XF86MonBrightnessUP, exec, brightnessctl s 5%+ bindle =, XF86MonBrightnessDown, exec, brightnessctl s 5%- @@ -165,7 +166,7 @@ bind = SHIFT, O, exec, QT_SCALE_FACTOR=1.25 obs bind = SHIFT, O, submap, reset bind =, K, exec, klavaro bind =, K, submap, reset -bind = SHIFT, S, exec, gamemoderun steam-native +bind = SHIFT, S, exec, gamemoderun steam bind = SHIFT, S, submap, reset # bind =, D, exec, discord --enable-features=UseOzonePlatform --ozone-platform=wayland bind =, D, exec, vesktop # drawio diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 8fb061b..c181c57 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -1,7 +1,7 @@ #monitor = eDP-1, disable #monitor =, preferred, auto, 1 -source = ~/.config/hypr/displays.conf +source = ~/.config/hypr/monitors.conf source = ~/.config/hypr/binds.conf source = ~/.config/hypr/variables.conf source = ~/.config/hypr/rules.conf diff --git a/.config/hypr/displays.conf b/.config/hypr/monitors.conf similarity index 51% rename from .config/hypr/displays.conf rename to .config/hypr/monitors.conf index 0ed716d..8512481 100644 --- a/.config/hypr/displays.conf +++ b/.config/hypr/monitors.conf @@ -1,12 +1,3 @@ -monitor = eDP-1, disable -# monitorv2 { -# output = eDP-1 -# mode = preferred -# # position = 0x0 -# position = 1080x1200 -# scale = auto -# } - monitorv2 { output = DP-6 mode = preferred @@ -16,7 +7,16 @@ monitorv2 { # transform = 3 } -# monitor = DP-6, preferred, auto, 1, transform, 3 +monitorv2 { + output = eDP-1 + mode = preferred + # position = 0x0 + position = 320x1080 + scale = auto +} +# monitor = eDP-1, disable + + # monitor = DP-6, preferred, auto, 1, transform, 3 # monitor = eDP-1, preferred, auto, auto # monitor =, disable monitor =, preferred, auto, auto diff --git a/.config/hypr/other/swaylock.conf b/.config/hypr/other/swaylock.conf index b1def5b..b31591a 100644 --- a/.config/hypr/other/swaylock.conf +++ b/.config/hypr/other/swaylock.conf @@ -7,4 +7,4 @@ show-keyboard-layout # params #image=~/Pictures/wallpaper.jpg #scaling=fill -color=446666 +color=472472 diff --git a/.config/hypr/rules.conf b/.config/hypr/rules.conf index 682a750..bc78c7a 100644 --- a/.config/hypr/rules.conf +++ b/.config/hypr/rules.conf @@ -4,7 +4,8 @@ workspace = 1, monitor:DP-6, default:true workspace = 2, monitor:DP-6 workspace = 3, monitor:DP-6 workspace = 4, monitor:DP-6 -workspace = 5, monitor:eDP-1, default:true +workspace = 5, monitor:DP-6 +workspace = 6, monitor:eDP-1 windowrule = monitor 1, class:Liftoff.* windowrule = workspace 10, class:Liftoff.* diff --git a/.config/lazygit/config.yml b/.config/lazygit/config.yml new file mode 100644 index 0000000..c58afaa --- /dev/null +++ b/.config/lazygit/config.yml @@ -0,0 +1,12 @@ +promptToReturnFromSubprocess: false +gui: + # One of 'rounded' (default) | 'single' | 'double' | 'hidden' | 'bold' + border: single + +git: + # pagers: + # - pager: delta --dark --paging=never + paging: + colorArg: always + # --line-numbers + pager: delta --dark --paging=never diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index e34159a..f9f706f 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -1,7 +1,7 @@ -volume=50 +# volume=50 hwdec=auto ytdl-format=bestvideo[height<=?1080][vcodec!=?av01]+bestaudio/best -sub-pos=10 +# sub-pos=10 # sub-visibility=yes diff --git a/.config/yazi/yazi.toml b/.config/yazi/yazi.toml index 10018f7..1d216a4 100644 --- a/.config/yazi/yazi.toml +++ b/.config/yazi/yazi.toml @@ -1,7 +1,7 @@ "$schema" = "https://yazi-rs.github.io/schemas/yazi.json" [mgr] -ratio = [0, 2, 3] # prev, current, next / preview +ratio = [0, 2, 3] # prev, current, next / preview sort_by = "natural" # 1.md < 2.md < 10.md # sort_translit = false # replaces  as A, Æ as AE, etc. linemode = "mtime" @@ -19,7 +19,8 @@ image_delay = 0 # image_filter = "triangle" # image_quality = 75 -# [tasks] +[tasks] +image_bound = [0, 0] # suppress_preload = false # image_alloc = 536870912 # 512MB diff --git a/.gitignore b/.gitignore index fe9798b..afd7612 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,10 @@ .config/git/* !.config/git/config +!.config/lazygit/ +.config/lazygit/* +!.config/lazygit/config.yml + !.config/helix/ !.config/nvim/