This commit is contained in:
2025-11-08 10:26:41 +02:00
parent 83071c5b36
commit b085e86c5a
12 changed files with 97 additions and 62 deletions
+7
View File
@@ -4,6 +4,7 @@
tool = nvimdiff tool = nvimdiff
[core] [core]
editor = helix editor = helix
pager = delta
; repositoryformatversion = 1 ; repositoryformatversion = 1
; [extensions] ; [extensions]
; objectformat = sha256 ; objectformat = sha256
@@ -23,3 +24,9 @@
; clean = git-lfs clean -- %f ; clean = git-lfs clean -- %f
; smudge = git-lfs smudge -- %f ; smudge = git-lfs smudge -- %f
; process = git-lfs filter-process ; process = git-lfs filter-process
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true
[merge]
conflictStyle = zdiff3
+48 -39
View File
@@ -1,3 +1,8 @@
[[language]]
name = "lua"
auto-format = false
[[language]] [[language]]
name = "markdown" name = "markdown"
[language.auto-pairs] [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]] [[language]]
name = "lua" name = "sql"
auto-format = false auto-format = false
formatter = { command = "sqlformat", args = [
"--keywords",
"upper", # "upper", "lower", "capitalize"
"--identifiers",
"upper",
# "--reindent",
"--indent_width",
"2",
# "--indent_columns",
# "--compact", "True",
"-",
] }
[[language]] [[language]]
name = "toml" name = "toml"
auto-format = true 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]] [[language]]
name = "sql" name = "typst"
auto-format = true auto-format = true
formatter = { command = "sqlformat", args = [ language-servers = ["tinymist"]
"--keywords",
"upper", # "upper", "lower", "capitalize" [language-server.tinymist.config]
"--identifiers", formatterPrintWidth = 100 # can't stand 120
"lower", formatterMode = "typstyle" # or typstfmt
"--reindent", exportPdf = "never" # onSave, default: never
"--indent_width", semanticTokens = "enable"
"2",
# "--compact", "True",
"-",
] }
[[language]] [[language]]
@@ -50,31 +84,6 @@ args = { program = "{0}", initCommands = [
"command script import /usr/local/etc/lldb_vscode_rustc_primer.py", "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] [language-server.rust-analyzer.config]
checkOnSave = true checkOnSave = true
procMacro.enable = true procMacro.enable = true
+2 -2
View File
@@ -40,14 +40,14 @@ column_meter_modes_0=1 1
column_meters_1=DateTime Uptime LoadAverage Tasks Battery DiskIO NetworkIO Memory Swap 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 column_meter_modes_1=2 2 2 2 2 2 2 1 1
tree_view=0 tree_view=0
sort_key=0 sort_key=47
tree_sort_key=0 tree_sort_key=0
sort_direction=-1 sort_direction=-1
tree_sort_direction=-1 tree_sort_direction=-1
tree_view_always_by_pid=0 tree_view_always_by_pid=0
all_branches_collapsed=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 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_sort_key=PID
.tree_view_always_by_pid=0 .tree_view_always_by_pid=0
.tree_view=0 .tree_view=0
+5 -4
View File
@@ -77,12 +77,13 @@ bind = SHIFT, F8, exec, bluetoothctl power on
bind = $mod, F9, exec, playerctl previous bind = $mod, F9, exec, playerctl previous
bind = $mod, F10, exec, playerctl next bind = $mod, F10, exec, playerctl next
bindle = $mod, F11, exec, brightnessctl s 5%- 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%+ bindle = $mod, F12, exec, brightnessctl s 5%+
binde = CTRL, F11, exec, brightnessctl s 1%-
binde = CTRL, F12, 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%+ 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 =, XF86MonBrightnessUP, exec, brightnessctl s 5%+
bindle =, XF86MonBrightnessDown, 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 = SHIFT, O, submap, reset
bind =, K, exec, klavaro bind =, K, exec, klavaro
bind =, K, submap, reset bind =, K, submap, reset
bind = SHIFT, S, exec, gamemoderun steam-native bind = SHIFT, S, exec, gamemoderun steam
bind = SHIFT, S, submap, reset bind = SHIFT, S, submap, reset
# bind =, D, exec, discord --enable-features=UseOzonePlatform --ozone-platform=wayland # bind =, D, exec, discord --enable-features=UseOzonePlatform --ozone-platform=wayland
bind =, D, exec, vesktop # drawio bind =, D, exec, vesktop # drawio
+1 -1
View File
@@ -1,7 +1,7 @@
#monitor = eDP-1, disable #monitor = eDP-1, disable
#monitor =, preferred, auto, 1 #monitor =, preferred, auto, 1
source = ~/.config/hypr/displays.conf source = ~/.config/hypr/monitors.conf
source = ~/.config/hypr/binds.conf source = ~/.config/hypr/binds.conf
source = ~/.config/hypr/variables.conf source = ~/.config/hypr/variables.conf
source = ~/.config/hypr/rules.conf source = ~/.config/hypr/rules.conf
@@ -1,12 +1,3 @@
monitor = eDP-1, disable
# monitorv2 {
# output = eDP-1
# mode = preferred
# # position = 0x0
# position = 1080x1200
# scale = auto
# }
monitorv2 { monitorv2 {
output = DP-6 output = DP-6
mode = preferred mode = preferred
@@ -16,6 +7,15 @@ monitorv2 {
# transform = 3 # 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 = DP-6, preferred, auto, 1, transform, 3
# monitor = eDP-1, preferred, auto, auto # monitor = eDP-1, preferred, auto, auto
# monitor =, disable # monitor =, disable
+1 -1
View File
@@ -7,4 +7,4 @@ show-keyboard-layout
# params # params
#image=~/Pictures/wallpaper.jpg #image=~/Pictures/wallpaper.jpg
#scaling=fill #scaling=fill
color=446666 color=472472
+2 -1
View File
@@ -4,7 +4,8 @@ workspace = 1, monitor:DP-6, default:true
workspace = 2, monitor:DP-6 workspace = 2, monitor:DP-6
workspace = 3, monitor:DP-6 workspace = 3, monitor:DP-6
workspace = 4, 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 = monitor 1, class:Liftoff.*
windowrule = workspace 10, class:Liftoff.* windowrule = workspace 10, class:Liftoff.*
+12
View File
@@ -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
+2 -2
View File
@@ -1,7 +1,7 @@
volume=50 # volume=50
hwdec=auto hwdec=auto
ytdl-format=bestvideo[height<=?1080][vcodec!=?av01]+bestaudio/best ytdl-format=bestvideo[height<=?1080][vcodec!=?av01]+bestaudio/best
sub-pos=10 # sub-pos=10
# sub-visibility=yes # sub-visibility=yes
+2 -1
View File
@@ -19,7 +19,8 @@ image_delay = 0
# image_filter = "triangle" # image_filter = "triangle"
# image_quality = 75 # image_quality = 75
# [tasks] [tasks]
image_bound = [0, 0]
# suppress_preload = false # suppress_preload = false
# image_alloc = 536870912 # 512MB # image_alloc = 536870912 # 512MB
+4
View File
@@ -31,6 +31,10 @@
.config/git/* .config/git/*
!.config/git/config !.config/git/config
!.config/lazygit/
.config/lazygit/*
!.config/lazygit/config.yml
!.config/helix/ !.config/helix/
!.config/nvim/ !.config/nvim/