r

.config/fish/conf.d/abbr.fish

@@ -8,7 +8,7 @@ abbr t trash put
 # abbr m mpv
 abbr mm -- mpv --shuffle \$XDG_MUSIC_DIR
 
-abbr l lazygit
+abbr lg lazygit
 # abbr dots -- git --git-dir \~/.dotfiles/ --work-tree \~
 abbr gl git log
 abbr ga git add

.config/fish/conf.d/source.fish

@@ -0,0 +1 @@
+zoxide init fish | source

.config/fish/functions/fish_right_prompt.fish

@@ -14,9 +14,7 @@ function fish_right_prompt
     set -g __fish_git_prompt_showcolorhints 1
     set -g __fish_git_prompt_use_informative_chars 1
 
-    # Unfortunately this only works if we have a sensible locale
+    set -g __fish_git_prompt_char_dirtystate '!'
-    string match -qi '*.utf-8' -- $LANG $LC_CTYPE $LC_ALL
-    and set -g __fish_git_prompt_char_dirtystate \U1F4a9
     set -g __fish_git_prompt_char_untrackedfiles '?'
 
     set -l vcs (fish_vcs_prompt '%s' 2>/dev/null)

.config/fish/functions/fish_user_key_bindings.fish

@@ -24,7 +24,7 @@ function fish_user_key_bindings
         echo (set_color brcyan)'INFO: fzf not found'
     end
 
-    # Unused: alt-z, insert ctrl-r
+    # Unused: alt-g, alt-z, insert ctrl-r
 
     bind            alt-t transpose-words
     bind -M insert  alt-t transpose-words
@@ -32,9 +32,14 @@ function fish_user_key_bindings
     bind            ctrl-t transpose-chars
     bind -M insert  ctrl-t transpose-chars
     bind -M visual  ctrl-t transpose-chars
+
     bind            ctrl-z 'fish_commandline_append " &; disown"'
     bind -M insert  ctrl-z 'fish_commandline_append " &; disown"'
     bind -M visual  ctrl-z 'fish_commandline_append " &; disown"'
 
+    bind            ctrl-g lazygit
+    bind -M insert  ctrl-g lazygit
+    bind -M visual  ctrl-g lazygit
+
     # bind -M insert ctrl-d exit
 end

.config/git/config

@@ -12,6 +12,8 @@
     abbrevCommit = true
 [gpg "ssh"]
     allowedSignersFile = ~/.config/git/allowed_signers
+[fetch]
+    prune = true
 
 [includeIf "gitdir:~/src/"]
     path = ~/src/.gitconfig

.config/helix/languages.toml

@@ -57,6 +57,13 @@ 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

.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=46
+sort_key=0
 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=PERCENT_CPU
+.sort_key=PID
 .tree_sort_key=PID
 .tree_view_always_by_pid=0
 .tree_view=0

.config/hypr/binds.conf

@@ -131,7 +131,7 @@ bind = $mod, R, submap, resize
 bind = $mod SHIFT, W, submap, wallpaper
 bind = $mod SHIFT, M, submap, mako
 bind = $mod SHIFT, S, submap, system
-bind = $mod SHIFT, D, submap, displays
+# bind = $mod SHIFT, D, submap, displays
 bind = $mod CTRL, M, submap, move
 
 # launch {{{
@@ -402,26 +402,26 @@ bind =, Escape, submap, reset
 # }}}
 
 # displays {{{
-submap = displays
+# submap = displays
 
-bind =, L, exec, ~/.config/hypr/scripts/displays.sh eDP-1 -
+# bind =, L, exec, ~/.config/hypr/scripts/displays.sh eDP-1 -
-bind =, L, submap, reset
+# bind =, L, submap, reset
-bind =, H, exec, ~/.config/hypr/scripts/displays.sh HDMI-A-1 -
+# bind =, H, exec, ~/.config/hypr/scripts/displays.sh HDMI-A-1 -
-bind =, H, submap, reset
+# bind =, H, submap, reset
-bind =, A, exec, ~/.config/hypr/scripts/displays.sh eDP-1 ''
+# bind =, A, exec, ~/.config/hypr/scripts/displays.sh eDP-1 ''
-bind =, A, submap, reset
+# bind =, A, submap, reset
-bind =, O, exec, ~/.config/hypr/scripts/displays.sh '' -eDP-1
+# bind =, O, exec, ~/.config/hypr/scripts/displays.sh '' -eDP-1
-bind =, O, submap, reset
+# bind =, O, submap, reset
 
-bind =, D, exec, hyprctl keyword monitor eDP-1,preferred,auto,1
+# bind =, D, exec, hyprctl keyword monitor eDP-1,preferred,auto,1
-bind =, D, submap, reset
+# bind =, D, submap, reset
-bind = SHIFT, D, exec, hyprctl keyword monitor eDP-1,disable
+# bind = SHIFT, D, exec, hyprctl keyword monitor eDP-1,disable
-bind = SHIFT, D, submap, reset
+# bind = SHIFT, D, submap, reset
 
-bind = $mod SHIFT, D, submap, reset
+# bind = $mod SHIFT, D, submap, reset
-bind =, Space, submap, reset
+# bind =, Space, submap, reset
-bind =, Return, submap, reset
+# bind =, Return, submap, reset
-bind =, Escape, submap, reset
+# bind =, Escape, submap, reset
 # }}}
 
 # resize {{{

.config/hypr/displays.conf

@@ -1,2 +1,22 @@
-monitor = eDP-1, preferred, 0x0, 1
+monitor = eDP-1, disable
-monitor =, disable
+# monitorv2 {
+#   output = eDP-1
+#   mode = preferred
+#   # position = 0x0
+#   position = 1080x1200
+#   scale = auto
+# }
+
+monitorv2 {
+  output = DP-6
+  mode = preferred
+  position = 0x0
+  # position = auto
+  scale = 1
+  # transform = 3
+}
+
+# monitor = DP-6, preferred, auto, 1, transform, 3
+# monitor = eDP-1, preferred, auto, auto
+# monitor =, disable
+monitor =, preferred, auto, auto

.config/hypr/rules.conf

@@ -1,10 +1,10 @@
 #https://wiki.hyprland.org/Configuring/Window-Rules/
 #https://wiki.hyprland.org/Configuring/Workspace-Rules/
-#workspace = 1, monitor:HDMI-A-1
+workspace = 1, monitor:DP-6, default:true
-#workspace = 2, monitor:HDMI-A-1
+workspace = 2, monitor:DP-6
-#workspace = 3, monitor:HDMI-A-1
+workspace = 3, monitor:DP-6
-#workspace = 4, monitor:HDMI-A-1
+workspace = 4, monitor:DP-6
-#workspace = 5, monitor:eDP-1
+workspace = 5, monitor:eDP-1, default:true
 
 windowrule = monitor 1, class:Liftoff.*
 windowrule = workspace 10, class:Liftoff.*
@@ -31,7 +31,7 @@ windowrule = rounding 0, floating:0, onworkspace:f[1]
 # layerrule =  noscreenshare, notifications
 windowrule = noscreenshare, class:^(Bitwarden)$
 windowrule = noscreenshare, class:^(nheko)$
-# windowrule = noscreenshare, class:^(vesktop)$
+windowrule = noscreenshare, class:^(vesktop)$
 windowrule = noscreenshare, class:^(org.telegram.desktop)$
 
 windowrule = float, class:^(Bitwarden)$

.config/kitty/kitty.conf

@@ -7,7 +7,7 @@ bold_font        Hack Nerd Font Bold
 italic_font      Hack Nerd Font Italic
 bold_italic_font Hack Nerd Font Bold Italic
 
-font_size 20
+font_size 18
 force_ltr yes
 text_composition_strategy 1 0