Misc elvish/kakoune changes. Many other minor changes.

bin/elvmv

@@ -27,9 +27,9 @@ for i $items {
 
 editor = vi
 if (has-env VISUAL) {
-  editor = (get-env VISUAL)
+  editor = $E:VISUAL
 } elif (has-env EDITOR) {
-  editor = (get-env EDITOR)
+  editor = $E:EDITOR
 }
 
 fn abort [&code=1 a]{

bin/mpw-get

@@ -2,9 +2,9 @@
 name = (cat ~/sns/mpwname)
 t=""
 if (eq 0 (count $args)) {
-  @sites=(cat (get-env XDG_CONFIG_HOME)/mpwc/$name.mpsites)
+  @sites=(cat $E:XDG_CONFIG_HOME/mpwc/$name.mpsites)
   t=(echo &sep="\n" $@sites | rofi -dmenu -p 'Enter site: ' -width 20 -columns 1)
 } else {
   t=$args[0]
 }
-gpg2 -d -q ~/sns/password.gpg | mpwc -S -k max -n $name -s $t 2>/dev/null | xclip -sel c -r -l 1
+gpg2 -d -q ~/sns/password.gpg | mpwc -S -k max -n $name -s $t 2>&- | xclip -sel c -r -l 1

bin/wal-to-context

@@ -6,7 +6,7 @@ col    = $data[colors]
 spec   = $data[special]
 wall   = $data[wallpaper]
 name   = (re:replace '(\..+)?$' '' (path-base $wall))
-author = (get-env USER)
+author = $E:USER
 
 if (> (count $args) 0) {
   name = $args[0]

elvish/lib/completers.elv

@@ -16,7 +16,7 @@ fn prefix-completer [p a]{
     if (eq (count $cmd) 2) {
       $a $@cmd
     } elif (has-key $edit:completion:arg-completer $cmd[1]) {
-      $edit:completion:arg-completer[$cmd[1]] (explode $cmd[1:])
+      $edit:completion:arg-completer[$cmd[1]] (all $cmd[1:])
     } else {
       edit:complete-filename $cmd[-1]
     }
@@ -71,9 +71,9 @@ edit:completion:arg-completer[kitty] = [@cmd]{
     @kitty-kittens = (pwd=/usr/lib/kitty/kittens fd main.py | peach [x]{ path-dir $x })
   }
   if (has-value [kitten '+kitten'] $cmd[-2]) {
-    explode $kitty-kittens
+    all $kitty-kittens
   } elif (eq $cmd[-2] '@') {
-    explode $kitty-cmds
+    all $kitty-cmds
   } else {
     edit:complete-filename $cmd[-1]
   }
@@ -89,8 +89,8 @@ edit:completion:arg-completer[sv] = [@cmd]{
 }
 
 edit:completion:arg-completer[man] = [@cmd]{
-  pwd=/usr/share/man put man*/* | peach [a]{
-    re:replace &literal=$true '\.\dp?$' '' (path-base $a)
+  pwd=/bedrock/cross/man put man*/* | each [a]{
+    re:replace &literal=$true '(\.\dp?)?(\.gz)?$' '' (path-base $a)
   }
 }
 
@@ -104,7 +104,7 @@ edit:completion:arg-completer[nimble] = [@cmd]{
     put {un,}install develop check init publish build c cc js test doc{,2} \
       refresh search list tasks path dump
     if ?(isnimbleproject) {
-      nimble tasks 2>/dev/null | eawk [_ a @_]{ put $a }
+      nimble tasks 2>&- | eawk [_ a @_]{ put $a }
     }
   } elif (eq $cmd[-2] install) {
     for x (from-json <~/.nimble/packages_official.json) { put $x[name] }
@@ -133,7 +133,7 @@ pijul-cmds = [add apply branches checkout clone credit delete-branch diff dist\
 
 edit:completion:arg-completer[pijul] = [@cmd]{
   if (eq (count $cmd) 2) {
-    explode $pijul-cmds
+    all $pijul-cmds
   }
 }
 
@@ -148,7 +148,7 @@ edit:completion:arg-completer[neofetch] = [@cmd]{
       }
     })) --logo -L -v -vv]
   }
-  explode $neofetch-opts
+  all $neofetch-opts
 }
 
 edit:completion:arg-completer[bspc] = [@cmd]{
@@ -193,10 +193,10 @@ edit:completion:arg-completer[xbps-src] = [@cmd]{
     @xbps-src-arch = (xbps-src -h | take 162 | drop 136)[1:]
   }
   if (eq $cmd[-2] '-a') {
-    explode $xbps-src-arch
+    all $xbps-src-arch
   } else {
     if (not (overlap-at $xbps-src-cmds $cmd)) {
-      explode $xbps-src-cmds
+      all $xbps-src-cmds
     } else {
       pwd=$E:XBPS_DISTDIR/srcpkgs put *
     }
@@ -207,9 +207,9 @@ edit:completion:arg-completer[strat] = [@cmd]{
   @strata = (brl list)
   has-strat = (overlap-at $strata $cmd)
   if (not $has-strat) {
-    explode $strata
+    all $strata
   } else {
-    # edit:complete-sudo (explode $cmd[(+ $has-strat 1):])
+    edit:complete-sudo (all $cmd[(put $has-strat):])
   }
 }
 
@@ -217,11 +217,11 @@ brl-cmds = $nil
 
 edit:completion:arg-completer[brl] = [@cmd]{
   if (not $brl-cmds) {
-    @brl-cmds = (brl -h | take 35 | drop 5 | each [x]{ put (re:find &max=1 '^  \w+' $x)[text][2:] })
+    @brl-cmds = (brl -h | take 36 | drop 5 | each [x]{ put (re:find &max=1 '^  \w+' $x)[text][2:] })
   }
   len = (count $cmd)
   if (== $len 2) {
-    explode $brl-cmds
+    all $brl-cmds
   } else {
     c = $cmd[1]
     if (has-value [status enable disable hide show] $c) {

elvish/lib/config.elv

@@ -1,13 +1,9 @@
-conf = (get-env XDG_CONFIG_HOME)
-dot = (get-env DOTS_DIR)
+conf = $E:XDG_CONFIG_HOME
+dot = $E:DOTS_DIR
 ntrtmp = $conf/ntr/templates
 
-fn list [@a]{
-  fd . -L -t f $@a
-}
-
 fn select [@a]{
-  sk --height=35% --layout=reverse -m $@a
+  fd . -L -t f $@a | sk --height=35% --layout=reverse -m
 }
 
 fn edit [&type='' @a]{
@@ -27,10 +23,10 @@ fn sxhkd { edit $conf/sxhkd/sxhkdrc; pkill -USR1 -x sxhkd }
 fn polybar { edit $ntrtmp/polybar }
 fn rofi { edit &type=css $conf/rofi/config.rasi }
 fn dunst { edit $ntrtmp/dunst }
-fn elvish { pwd=~/.elvish edit (list -e elv | select) }
+fn elvish { pwd=~/.elvish edit (select -e elv) }
 fn nim { edit $conf/nim/config.nims }
 fn min { edit $E:HOME/.minrc }
-fn ntr { pwd=$conf/ntr edit (list | select) }
+fn ntr { pwd=$conf/ntr edit (select) }
 fn splug { edit $conf/splug/config.toml }
 fn kitty { edit &type=ini $conf/kitty/kitty.conf }
 fn kitty-diff { edit &type=ini $conf/kitty/diff.conf }
@@ -41,6 +37,6 @@ fn lc { edit $conf/lc/config }
 fn kak { edit $conf/kak/kakrc }
 fn pqiv { edit $conf/pqivrc }
 fn mpv { edit $conf/mpv/mpv.conf }
-fn mpwc { edit $conf/mpwc/(get-env MPW_FULLNAME).mpsites }
+fn mpwc { edit $conf/mpwc/(cat ~/sns/mpwname).mpsites }
 fn ncmpcpp { edit &type=ini $conf/ncmpcpp/config }
 fn bedrock { edit /bedrock/etc/bedrock.conf; sudo brl apply }

elvish/lib/git.elv

@@ -14,11 +14,11 @@ fn refresh-status {
   behind    = 0
 
   _ = ?(
-    @data = (git --no-optional-locks status --ignore-submodules --porcelain=v2 -b 2>/dev/null)
+    @data = (git --no-optional-locks status --ignore-submodules --porcelain=v2 -b 2>&-)
     branch = [(splits ' ' $data[1])][2]
 
     if (and (> (count $data) 3) (has-prefix $data[3] '# branch.ab')) {
-      ahead behind = (explode [(splits ' ' $data[3])][2:])[1:]
+      ahead behind = (all [(splits ' ' $data[3])][2:])[1:]
     }
 
     for i $data {

elvish/lib/module.elv

@@ -1,7 +0,0 @@
-fn exported [a]{
-  result = [&]
-  keys $a | each [x]{
-    result[$x] = $a[$x]
-  }
-  put $result
-}

elvish/lib/stack.elv

@@ -1,21 +0,0 @@
-fn calc [@a]{
-  s = []
-
-  for x $a {
-    if (eq $x '+') {
-      s = [(+ $@s)]
-    } elif (or (eq $x '*') (eq $x 'x')) {
-      s = [(* $@s)]
-    } elif (eq $x '-') {
-      i = (- $s[-2] $s[-1])
-      s = [(put $@s | take (- (count $s) 2)) $i]
-    } elif (eq $x '/') {
-      i = (/ $s[-2] $s[-1])
-      s = [(put $@s | take (- (count $s) 2)) $i]
-    } else {
-      s = [$@s $x]
-    }
-  }
-
-  put $@s
-}

elvish/lib/util.elv

@@ -46,9 +46,3 @@ fn add-after-readline [@hooks]{
     }
   }
 }
-
-fn is-upper-ascii [a]{ and (< (ord $a) 91) (> (ord $a) 64) }
-fn is-lower-ascii [a]{ and (< (ord $a) 123) (> (ord $a) 96) }
-
-fn to-upper-ascii [a]{ if (is-lower-ascii $a) { chr (- (ord $a) 32) } else { put $a } }
-fn to-lower-ascii [a]{ if (is-upper-ascii $a) { chr (+ (ord $a) 32) } else { put $a } }

elvish/rc.elv

@@ -10,34 +10,35 @@ fn r [@a]{
   rm -f $f
 }
 
-fn alias [cmd @a]{ put [@b]{ (external $cmd) (explode $a) $@b } }
+fn alias [cmd @a]{ put [@b]{ (external $cmd) $@a $@b } }
 
 ls~ = (alias lc)
 cat~ = (alias bat --paging=never)
 xr~ = (alias sudo xbps-remove -R)
 o~ = (alias gio open)
 
--exports- = [&]
-
 edit:insert:binding[Ctrl-X] = { edit:-instant:start }
 
+edit:abbr = [
+  &'.etc'='.local/etc/'
+]
+
 {
   use github.com/xiaq/edit.elv/smart-matcher
   use theme
   use completers
-  use stack
-  use module
-  -exports- = (module:exported $stack:)
+  use autopairs
   smart-matcher:apply
+  autopairs:enable
   util:add-before-readline {
-    util:set-title (tilde-abbr $pwd) >/dev/tty
+    util:set-title (tilde-abbr $pwd)
   }
   util:add-after-readline [a]{
-    if (eq $a '') { ls } >/dev/tty
-    util:set-title (splits ' ' $a | take 1)' '(tilde-abbr $pwd) >/dev/tty
+    if (eq $a '') { ls }
+    util:set-title (splits ' ' $a | take 1)' '(tilde-abbr $pwd)
   }
 }
 
 -override-wcwidth 🦀 2
-set-env GPG_TTY (tty)
-set-env NIMPH_TOKEN (cat ~/sns/github.key)
+E:GPG_TTY = (tty)
+E:NIMPH_TOKEN = (cat ~/sns/github.key)

kak.kak

@@ -7,7 +7,10 @@ eval %sh{
 
 # Initialization
 
+require-module connect-skim
+
 decl -hidden regex curword
+decl -hidden regex curword_word_class
 
 set global ui_options ncurses_assistant=none
 set global scrolloff 7,7
@@ -20,9 +23,13 @@ set global modelinefmt '%opt{modeline_git_branch} %val{bufname}
 alias global sw sudo-write
 alias global cdb change-directory-current-buffer
 alias global f find
+alias global g grep
 alias global s sort-selections
+alias global explore-files skim-files
+alias global explore-buffers skim-buffers
 
 face global LineNumbersWrapped black
+face global CurWord +b
 
 addhl global/number-lines number-lines -hlcursor -separator ' '
 addhl global/ruler column 80 default,rgb:303030
@@ -30,7 +37,7 @@ addhl global/trailing-whitespace regex '\h+$' 0:default,red
 addhl global/todo regex \b(TODO|FIXME|XXX|NOTE)\b 0:default+rb
 addhl global/matching-brackets show-matching
 addhl global/wrap wrap -word -indent -marker ''
-addhl global/current-word dynregex '%opt{curword}' 0:+b
+addhl global/current-word dynregex '%opt{curword}' 0:CurWord
 
 # Keybinds
 
@@ -51,17 +58,6 @@ map global normal <a-q> ': word-select-previous-big-word<ret>'
 map global normal Q B
 map global normal <a-Q> <a-B>
 
-map global user -docstring 'add phantom selection' <a-f> ': phantom-selection-add-selection<ret>'
-map global user -docstring 'clear all phantom selections' <a-F> ': phantom-selection-select-all<ret>: phantom-selection-clear<ret>'
-map global user -docstring 'next phantom selection' f ': phantom-selection-iterate-next<ret>'
-map global user -docstring 'previous phantom selection' F ': phantom-selection-iterate-prev<ret>'
-
-map global normal -docstring 'select view' <a-%> ': select-view<ret>'
-map global view   -docstring 'select view' s '<esc>: select-view<ret>'
-
-map global user -docstring 'add mark' m ': mark-word<ret>'
-map global user -docstring 'clear marks' M ': mark-clear<ret>'
-
 map global user -docstring 'replace mode' r ': replace<ret>'
 
 map global user -docstring 'expand selection' e ': expand<ret>'
@@ -69,9 +65,7 @@ map global user -docstring 'expand repeat' E ': expand-repeat<ret>'
 
 map global normal -docstring 'buffers…' b ': enter-buffers-mode<ret>'
 map global normal -docstring 'buffers (lock)…' B ': enter-user-mode -lock buffers<ret>'
-
-map global user -docstring "next error" l ': lint-next-error<ret>'
-map global user -docstring "previous error" L ': lint-previous-error<ret>'
+map global normal -docstring 'select buffer' <a-b> ': explore-buffers<ret>'
 
 declare-user-mode anchor
 map global normal ';' ': enter-user-mode anchor<ret>'
@@ -97,9 +91,10 @@ def type -params 1 -docstring 'Set buffer filetype' %{
     set buffer filetype %arg{1}
 }
 
-def lint-on-write -docstring 'Activate linting on buffer write' %{
-    lint-enable
-    hook buffer BufWritePost .* lint
+def lint-engage -docstring 'Enable linting' %{
+	lint-enable
+	map global user -docstring "next error" l ': lint-next-error<ret>'
+	map global user -docstring "previous error" L ': lint-previous-error<ret>'
 }
 
 def lsp-engage -docstring 'Enable language server' %{
@@ -108,9 +103,20 @@ def lsp-engage -docstring 'Enable language server' %{
     map global user -docstring 'Enter lsp user mode' <a-l> ': enter-user-mode lsp<ret>'
 }
 
+def lint-on-write -docstring 'Activate linting on buffer write' %{
+    lint-engage
+    hook buffer BufWritePost .* lint
+}
+
+def set-indent -params 1 -docstring 'Set indentation width' %{
+    set buffer indentwidth %arg{1}
+    set buffer tabstop %arg{1}
+    set buffer softtabstop %arg{1}
+}
+
 def no-tabs -params 1 -docstring 'Indent with spaces' %{
     expandtab
-    set buffer indentwidth %arg{1}
+    set-indent %arg{1}
     hook buffer InsertKey <space> %{ try %{
         exec -draft h<a-i><space><a-k>^\h+<ret>
         exec -with-hooks <tab>
@@ -121,6 +127,7 @@ def clean-trailing-whitespace -docstring 'Remove trailing whitespace' %{
     try %{ exec -draft '%s\h+$<ret>d' }
 }
 
+
 # Hooks
 
 hook global WinCreate .* %{
@@ -132,35 +139,59 @@ hook global WinCreate .* %{
 }
 
 hook global KakBegin .* %{
-    state-save-reg-sync colon
-    state-save-reg-sync pipe
-    state-save-reg-sync slash
+    state-save-reg-load colon
+    state-save-reg-load pipe
+    state-save-reg-load slash
 }
 
 hook global KakEnd .* %{
-    state-save-reg-sync colon
-    state-save-reg-sync pipe
-    state-save-reg-sync slash
+    state-save-reg-save colon
+    state-save-reg-save pipe
+    state-save-reg-save slash
 }
 
 hook global WinDisplay .* info-buffers
 hook global NormalIdle .* %{ try %{ exec -draft '<a-i>w: palette-status<ret>' } }
 
-hook global BufCreate .* %{
-    set buffer tabstop %opt{indentwidth}
-}
-
 hook global BufWritePre .* %{ nop %sh{
     mkdir -p "$(dirname "$kak_buffile")"
 }}
 
 hook global NormalIdle .* %{
-    eval -draft %{ try %{
-        exec <space><a-i>w <a-k>\A\w+\z<ret>
-        set buffer curword "\b\Q%val{selection}\E\b"
-    } catch %{
-        set buffer curword ''
-    }}
+    eval -draft %{
+        try %{
+            exec <space><a-i>w
+            set buffer curword "(?<!%opt{curword_word_class})\Q%val{selection}\E(?!%opt{curword_word_class})"
+        } catch %{
+            set buffer curword ''
+        }
+    }
+}
+
+hook global WinSetOption extra_word_chars=.* %{
+    eval %sh{
+        eval set -- "$kak_quoted_opt_extra_word_chars"
+        word_class='['
+        while [ $# -ne 0 ]; do
+            case "$1" in
+                -) word_class="$word_class-";;
+            esac
+            shift
+        done
+        word_class="$word_class"'\w'
+        eval set -- "$kak_quoted_opt_extra_word_chars"
+        while [ $# -ne 0 ]; do
+            case "$1" in
+                "-") ;;
+                "]") word_class="$word_class"'\]';;
+                "'") word_class="$word_class''";;
+                *)   word_class="$word_class$1";;
+            esac
+            shift
+        done
+        word_class="$word_class]"
+        printf "set window curword_word_class '%s'\\n" "$word_class"
+    }
 }
 
 eval %sh{ git rev-parse --is-inside-work-tree 2>/dev/null 1>/dev/null && printf %s "
@@ -172,12 +203,6 @@ hook global ModuleLoaded kitty %{
     set global kitty_window_type kitty
 }
 
-hook global ModuleLoaded smarttab %{
-	hook global BufCreate .* %{
-		set buffer softtabstop %opt{indentwidth}
-	}
-}
-
 # Filetype detection
 
 hook global BufCreate .*srcpkgs/.+/template$ %{

lc

@@ -170,6 +170,9 @@ Style = r"""LLi = -HsLLai -xdot"""
 Style = r"""debug = -H "-f%0%1%2%3%4%5%6%7%8%9%.%/ %f%R"""
 #Almost exactly GNU ls -lA --no-color
 Style = r"""gls = "-tp1g -> " --ageFmt,= --ageFmt,= "-a-15778476@%b %e  %Y" "-a-0@%b %e %H:%M" -of "-f%l%p%Q %n %U %G %S %m %f%r"""
+Style = r"""c4 = "-Fm-4,,,*,?[](){} ';!$#^`~"""
+Style = r"""c5 = "-Fm-5,,,*,?[](){} ';!$#^`~"""
+Style = r"""c6 = "-Fm-6,,,*,?[](){} ';!$#^`~"""
 
 glyph  = "▶ "
 order  = 0134EN   #Default sort order: kind-order0,1; fmtKindNum0,1; longExt,Nm

nim.nim

@@ -2,7 +2,7 @@ from macros import error
 
 type Compiler = enum gcc = "gcc", clang = "clang"
 
-var cross = false
+var cross {.used.} = false
 
 proc setCompiler(s: string, compiler = gcc, cpp = false) {.used.} =
   let c = findExe s

ntr/templates/dunst

@@ -65,6 +65,12 @@ startup_notification = false
 
 force_xinerama = false
 
+### Mouse
+
+mouse_left_click = close_current
+mouse_middle_click = do_action
+mouse_right_click = close_all
+
 [experimental]
 per_monitor_dpi = false
 

profile

@@ -46,6 +46,6 @@ fi
 
 # Start X or shell
 if [ "$GPG_TTY" = /dev/tty1 ]; then
-	exec dbus-launch sx
+	exec sx
 fi
 exec elvish

ranger/rifle.conf

@@ -119,7 +119,9 @@ ext mobi, has ebook-viewer, X, flag f = ebook-viewer -- "$@"
 mime ^image/svg, has display,  X, flag f = display -- "$@"
 mime ^image/svg, has inkscape, X, flag f = inkscape -- "$@"
 
+mime ^image, has vimiv,     X, flag f = vimiv -- "$@"
 mime ^image, has qimgv,     X, flag f = qimgv "$@"
+mime ^image, has pqiv,      X, flag f = pqiv -- "$@"
 mime ^image, has sxiv,      X, flag f = sxiv -- "$@"
 mime ^image, has gimp,      X, flag f = gimp -- "$@"
 ext xcf,                    X, flag f = gimp -- "$@"

splug.toml

@@ -17,9 +17,6 @@ files = ["rc/word-select.kak"]
 ["https://github.com/alexherbo2/explore.kak"]
 files = ["rc/explore/files.kak", "rc/explore/buffers.kak"]
 
-["https://github.com/lenormf/kakoune-extra"]
-files = ["widgets/git-branch.kak", "vcs.kak"]
-
 ["https://github.com/Delapouite/kakoune-auto-percent"]
 files = ["auto-percent.kak"]
 
@@ -32,9 +29,6 @@ files = ["cd.kak"]
 ["https://github.com/Delapouite/kakoune-buffers"]
 files = ["buffers.kak"]
 
-["https://github.com/Delapouite/kakoune-select-view"]
-files = ["select-view.kak"]
-
 ["https://github.com/Delapouite/kakoune-palette"]
 files = ["palette.kak"]
 
@@ -62,6 +56,9 @@ files = ["rc/smarttab.kak"]
 ["https://github.com/chambln/kakoune-readline"]
 files = ["readline.kak"]
 
+["https://github.com/lenormf/kakoune-extra"]
+files = ["widgets/git-branch.kak", "vcs.kak"]
+
 ["https://gitlab.com/Screwtapello/kakoune-state-save"]
 files = ["state-save.kak"]
 

sx.sh

@@ -1,4 +1,5 @@
 xrdb -nocpp "$HOME/.Xresources" &
+dbus-update-activation-environment DISPLAY XAUTHORITY
 xsetroot -cursor_name left_ptr &
 setxkbmap -layout us,ru -variant ,ruu -option 'grp:shift_caps_toggle,grp_led:scroll,lv3:ralt_switch,compose:rwin-altgr,nbsp:level3' &
 start-pulseaudio-x11 &
@@ -8,11 +9,11 @@ perWindowLayoutD &
 disown sxhkd &
 disown unclutter &
 disown /usr/libexec/xfce-polkit &
-disown dunst &
 disown syncthing -no-browser &
 disown polybar -q main &
 disown devmon -s \
  --exec-on-drive 'notify-send -a udevil -i media-removable "$l" "$f mounted at $d"' \
  --exec-on-unmount 'notify-send -a udevil -i media-removable "$l" "$f unmounted from $d"' \
  --exec-on-remove 'notify-send -a udevil -i media-removable "$l" "$f removed from $d"' &
-exec bspwm
+export MANGOHUD=1
+exec dbus-launch bspwm

sxhkd

@@ -3,34 +3,29 @@
 #
 
 # power operations
-super + End ; {s,S,alt + s}
-	loginctl {suspend,hibernate,hybrid-sleep}
+super + End ; {s,S,alt + s,r,p}
+	loginctl {suspend,hibernate,hybrid-sleep,reboot,poweroff}
 
-super + End ; {r,p}
-	loginctl {reboot,poweroff}
-
-super + End ; {l,b}
-	{lockscreen,xset dpms force off}
-
-alt + Tab
-	rofi-windowswitcher
+super + End ; b
+	xset dpms force off
 
+# rofi
 super + shift + {End,Insert,Return}
 	exec {rofi-powermenu,rofi-bspwm-unhide,rofi -modi emoji -show emoji}
 
-super + {_,shift + }Print
-	exec {peek -t, peek}
-
-# applications
-super + Return
-	exec kitty -1
-
 super + Home
 	exec rofi -modi calc -show calc
 
 super + space
 	exec rofi -show drun
 
+alt + Tab
+	rofi-windowswitcher
+
+# applications
+super + Return
+	exec kitty -1
+
 super + shift + m
 	exec mpv "$(xclip -sel c -o)"
 
@@ -41,21 +36,19 @@ super + shift + {n,p}
 super + Insert
 	carpalx-helper
 
-# sxhkd reload
 super + Escape
 	pkill -USR1 -x sxhkd
 
-# brightness
 XF86MonBrightness{Up,Down}
 	xbacklight {+,-}5
 
-#
-# screencap
-#
-
 {_,ctrl} + Print
 	screenshot {-s -u,-u}
 
+super + {_,shift + }Print
+	exec {peek -t, peek}
+
+
 #
 # bspwm hotkeys
 #

xbps-src

@@ -5,6 +5,8 @@ CFLAGS="-flto=${THREADS} ${GRAPHITE} -ftree-vectorize"
 CXXFLAGS="${CFLAGS}"
 LDFLAGS="${CFLAGS} -fuse-linker-plugin"
 
+RUSTFLAGS="-C target-cpu=native"
+
 XBPS_MAKEJOBS="${THREADS}"
 XBPS_CCACHE=yes
 XBPS_ALLOW_RESTRICTED=yes