kakoune: add ctags-file-symbols

alacritty/.config/alacritty/alacritty.toml

@@ -5,7 +5,7 @@ draw_bold_text_with_bright_colors = false
 TERM = "xterm-256color"
 
 [font]
-size = 11
+size = 10
 
 [font.bold]
 family = "HurmitNerdFont"

alacritty/.config/alacritty/dark.toml

@@ -1,33 +1,31 @@
-# Colors (five-colors dark)
+# https://github.com/alacritty/alacritty-theme/blob/master/themes/nordic.toml
+
+# Colors (Nordic)
 
 [colors.primary]
-foreground           = '#a29e98'
+background = '#242933'
-background           = '#272117'
+foreground = '#BBBDAF'
 
 [colors.normal]
-black = '#85919b'
+black = '#191C1D'
-red = '#c37583'
+red = '#BD6062'
-green = '#44a386'
+green = '#A3D6A9'
-yellow = '#af8842'
+yellow = '#F0DFAF'
-blue = '#5396c7'
+blue = '#8FB4D8'
-magenta = '#a57cba'
+magenta = '#C7A9D9'
-cyan = '#2da0ad'
+cyan = '#B6D7A8'
-white = '#b0bcc7'
+white = '#BDC5BD'
 
 [colors.bright]
-black = '#85919b'
+black = '#727C7C'
-red = '#f2a0ae'
+red = '#D18FAF'
-green = '#73d0b1'
+green = '#B7CEB0'
-yellow = '#dcb46e'
+yellow = '#BCBCBC'
-blue = '#7fc3f5'
+blue = '#E0CF9F'
-magenta = '#d2a8e8'
+magenta = '#C7A9D9'
-cyan = '#62cdda'
+cyan = '#BBDA97'
-white = '#a29e98'
+white = '#BDC5BD'
-
-[colors.cursor]
-cursor = '#73d0b1'
-text = '#272117'
 
 [colors.selection]
-background = '#276c9a'
+text = '#000000'
-text = '#272117'
+background = '#F0DFAF'

alacritty/.config/alacritty/light.toml

@@ -1,33 +1,35 @@
-# Colors (five-colors light)
+# https://github.com/alacritty/alacritty-theme/blob/master/themes/night_owlish_light.toml
+
+# Colors (Night Owlish Light)
 
 [colors.primary]
-foreground = '#696257'
+background = '#ffffff'
-background = '#faf8f5'
+foreground = '#403f53'
 
 [colors.normal]
-black = '#272117'
+black = '#011627'
-red = '#d0818f'
+red = '#d3423e'
-green = '#52af92'
+green = '#2aa298'
-yellow = '#bc944f'
+yellow = '#daaa01'
-blue = '#60a3d4'
+blue = '#4876d6'
-magenta = '#b289c7'
+magenta = '#403f53'
-cyan = '#3dadba'
+cyan = '#08916a'
-white = '#b6c3cd'
+white = '#7a8181'
 
 [colors.bright]
-black = '#919da7'
+black = '#7a8181'
-red = '#85c9fc'
+red = '#f76e6e'
-green = '#7ad6b7'
+green = '#49d0c5'
-yellow = '#e3ba74'
+yellow = '#dac26b'
-blue = '#60a3d4'
+blue = '#5ca7e4'
-magenta = '#d9aeee'
+magenta = '#697098'
-cyan = '#85c9fc'
+cyan = '#00c990'
-white = '#faf8f5'
+white = '#989fb1'
 
 [colors.cursor]
-cursor = '#7ad6b7'
+cursor = '#403f53'
-text = '#faf8f5'
+text = '#fbfbfb'
 
 [colors.selection]
-background = '#3a7ead'
+background = '#f2f2f2'
-text = '#faf8f5'
+text = '#403f53'

argen/.config/argen/init

@@ -1,160 +0,0 @@
-#!/bin/sh
-
-wlr-randr --output DP-1 --mode 3840x2160 --scale 2
-wlr-randr --output HDMI-A-1 --mode 3840x2160 --scale 2 --left-of DP-1
-
-foot --server &
-
-argenctl config set label-mode modifier
-
-# Terminal
-#argenctl binding set normal Super Return sh "kitty --single-instance --instance-group default"
-argenctl binding set normal Super Return sh "
-    if [ -e ~/.lightmode ]; then
-        exec footclient -o initial-color-theme=light
-    else
-        exec footclient -o initial-color-theme=dark
-    fi
-"
-
-# Reload config
-argenctl binding set normal Super+Shift R exec "$0"
-
-argenctl binding set normal Super P exec fuzzel
-argenctl binding set normal Super+Shift L exec waylock
-argenctl binding set normal Super+Shift T sh "lupan-set-theme toggle"
-
-# Window focus and swap
-argenctl binding set normal Super J window focus next
-argenctl binding set normal Super K window focus prev
-argenctl binding set normal Super+Shift J window swap next
-argenctl binding set normal Super+Shift K window swap prev
-
-argenctl binding set normal Super F window fullscreen
-argenctl binding set normal Super W window float
-
-argenctl binding set normal Super+Shift C window close
-argenctl binding set normal Super+Shift X window detach
-
-# Output focus and send
-argenctl binding set normal Super Period output focus next
-argenctl binding set normal Super Comma output focus prev
-argenctl binding set normal Super+Shift Period window send next
-argenctl binding set normal Super+Shift Comma window send prev
-
-# Layout
-argenctl binding set normal Super C layout switch columns
-argenctl binding set normal Super M layout switch monocle
-argenctl binding set normal Super S layout switch stacktile
-argenctl binding set normal Super H layout set primary-ratio -0.05
-argenctl binding set normal Super L layout set primary-ratio +0.05
-argenctl binding set normal Super+Control K layout set secondary-ratio -0.05
-argenctl binding set normal Super+Control J layout set secondary-ratio +0.05
-
-# Pointer
-argenctl pointer-binding set normal Super BTN_LEFT move-window
-argenctl pointer-binding set normal Super BTN_RIGHT resize-window
-
-# Context
-argenctl binding set normal Super+Shift+Control X context close
-argenctl binding set normal Super Tab context switch --last
-
-# Switch contexts interactively
-argenctl binding set normal Super Space sh 'argenctl context switch "$(argenctl context list | fuzzel -d --only-match)"'
-
-# Create new context interactively
-argenctl binding set normal Super+Shift Space sh '
-    set -eu
-    prompt="$(fuzzel -d --prompt-only "new > ")"
-    argenctl context new "$prompt"
-'
-
-# Rename current context interactively
-argenctl binding set normal Super+Control Space sh '
-    set -eu
-    prompt="$(fuzzel -d --prompt-only "rename > ")"
-    argenctl context rename "$prompt"
-'
-
-# Assign currently focused window to be toggled with Super U
-argenctl binding set normal Super+Shift U sh '
-    set -eu
-    id=$(argenctl window list --json | jq -r ".[] | select(.focused) | .id")
-    argenctl binding set normal Super U window toggle "$id"
-'
-
-# Attach window interactively
-argenctl binding set normal Super+Shift D sh '
-    set -eu
-    id=$(argenctl window list | fuzzel -d --with-nth 2 --accept-nth 1 --only-match)
-    argenctl window attach "$id"
-'
-
-# Adopt all orphans
-argenctl binding set normal Super+Control D sh '
-    argenctl window list --json | jq -r ".[] | select(.contexts | length == 0) | .id" | while read -r id; do
-        argenctl window attach "$id"
-    done
-'
-
-# Quit after confirmed with 'yes'
-argenctl binding set normal Super+Shift Q sh '
-    set -eu
-    confirm="$(fuzzel -d --prompt-only "quit? > ")"
-    if [ "$confirm" = yes ]; then
-        argenctl exit
-    fi
-'
-
-# Audio and brightness controls
-VOL_DEC='wpctl set-volume @DEFAULT_SINK@ 5%-'
-VOL_INC='wpctl set-mute @DEFAULT_SINK@ 0 && wpctl set-volume @DEFAULT_SINK@ --limit 1.5 5%+'
-VOL_TOGGLE='wpctl set-mute @DEFAULT_SINK@ toggle'
-for mode in normal locked; do
-    argenctl binding set $mode Super Bracketleft sh "$VOL_DEC"
-    argenctl binding set $mode Super Bracketright sh "$VOL_INC"
-    argenctl binding set $mode Super+Shift M sh "$VOL_TOGGLE"
-    argenctl binding set $mode None XF86AudioLowerVolume sh "$VOL_DEC"
-    argenctl binding set $mode None XF86AudioRaiseVolume sh "$VOL_INC"
-    argenctl binding set $mode None XF86AudioMute sh "$VOL_TOGGLE"
-
-    argenctl binding set $mode None XF86MonBrightnessDown sh "brightnessctl s 5%-"
-    argenctl binding set $mode None XF86MonBrightnessUp sh "brightnessctl s +5%"
-    argenctl binding set $mode Super+Shift Bracketleft sh "brightnessctl s 5%-"
-    argenctl binding set $mode Super+Shift Bracketright sh "brightnessctl s +5%"
-done
-
-# Passthrough mode
-argenctl mode declare passthrough
-argenctl binding set normal Super Grave mode enter passthrough
-argenctl binding set passthrough Super Grave mode enter normal
-
-# Select/swap window by index
-for num in 1 2 3 4 5 6 7 8 9; do
-    idx=$((num - 1))
-    argenctl binding set normal Super $num sh "
-        argenctl window focus \$(argenctl context list --json | jq -r '.[] | select(.current) | .windows | .[$idx]')
-    "
-    argenctl binding set normal Super+Shift $num sh "
-        context_id=\$(argenctl context list --json | jq -r '.[] | select(.current) | .id')
-        length=\$(argenctl context list --json | jq -r '.[] | select(.current) | .windows | length')
-        focused_window=\$(argenctl context list --json | jq -r '.[] | select(.current) | .focused_window')
-        dest_window=\$(argenctl context list --json | jq -r '.[] | select(.current) | .windows | .[$idx]')
-        focused_output_id=\$(argenctl window list --json | jq -r \".[] | select(.id == \\\"\$focused_window\\\") | .contexts[] | select(.id = \$context_id) | .output_id\")
-        dest_output_id=\$(argenctl window list --json | jq -r \".[] | select(.id == \\\"\$dest_window\\\") | .contexts[] | select(.id = \$context_id) | .output_id\")
-        if [ -n \"\$focused_output_id\" -a \"\$focused_output_id\" = \"\$dest_output_id\" ]; then
-            for i in \$(seq \$length); do
-                if [ \"\$focused_window\" = \"\$dest_window\" ]; then
-                    break
-                fi
-                argenctl window swap next
-                dest_window=\$(argenctl context list --json | jq -r '.[] | select(.current) | .windows | .[$idx]')
-            done
-        fi
-    "
-done
-
-argenctl binding set normal Super+Shift S exec ~/.config/argen/session.sh
-
-# Rules
-argenctl rule add float --app-id "my-app"

argen/.config/argen/session.sh

@@ -1,29 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-id=$(for name in $(ls ~/.config/argen/sessions/*.sh); do echo $(basename "${name%.sh}"); done | fuzzel -d -p'session> ')
-if argenctl context list | grep "^${id}\$"; then
-    argenctl context switch "${id}"
-    exit
-fi
-argenctl context new "$id"
-
-first=$(argenctl output list --json | jq -r 'min_by(80000 * .y + .x).id')
-length=$(argenctl output list --json | jq -r 'length')
-for n in $(seq $length); do
-    current=$(argenctl output list --json | jq -r '.[] | select(.focused).id')
-    if [ "$current" = "$first" ]; then
-        break
-    fi
-    argenctl output focus next
-done
-
-if [ -e ~/.lightmode ]; then
-    THEME=light
-else
-    THEME=dark
-fi
-export TERMINAL="footclient -o initial-color-theme=$THEME"
-
-exec sh ~/.config/argen/sessions/"${id}.sh"

argen/.config/argen/sessions/dotfiles.sh

@@ -1,3 +0,0 @@
-argenctl output focus next
-
-argenctl sh "$TERMINAL -D ~/dotfiles kak -s dotfiles"

argen/.config/argen/sessions/web.sh

@@ -1,6 +0,0 @@
-argenctl exec librewolf
-
-sleep 1
-argenctl output focus next
-
-argenctl exec qutebrowser

foot/.config/foot/foot.ini

@@ -1,60 +1,4 @@
 [main]
-font = HurmitNerdFont:size=10
+font = Fira Code Nerd Font:size=11
-initial-color-theme = dark
 
-[colors-dark]
+include = /usr/share/foot/themes/nord
-foreground           = a29e98
-background           = 272117
-cursor               = 272117 73d0b1
-selection-foreground = 272117
-selection-background = 276c9a
-
-regular0 = 85919b
-regular1 = c37583
-regular2 = 44a386
-regular3 = af8842
-regular4 = 5396c7
-regular5 = a57cba
-regular6 = 2da0ad
-regular7 = b0bcc7
-
-bright0 = 85919b
-bright1 = f2a0ae
-bright2 = 73d0b1
-bright3 = dcb46e
-bright4 = 7fc3f5
-bright5 = d2a8e8
-bright6 = 62cdda
-bright7 = a29e98
-
-[colors-light]
-foreground           = 696257
-background           = faf8f5
-cursor               = faf8f5 7ad6b7
-selection-foreground = faf8f5
-selection-background = 3a7ead
-
-regular0 = 272117
-regular1 = d0818f
-regular2 = 52af92
-regular3 = bc944f
-regular4 = 60a3d4
-regular5 = b289c7
-regular6 = 3dadba
-regular7 = b6c3cd
-
-bright0 = 919da7
-bright1 = 85c9fc
-bright2 = 7ad6b7
-bright3 = e3ba74
-bright4 = 60a3d4
-bright5 = d9aeee
-bright6 = 85c9fc
-bright7 = faf8f5
-
-[key-bindings]
-color-theme-toggle = Control+Shift+t
-primary-paste = Shift+Insert Control+Shift+i
-
-[search-bindings]
-primary-paste = Shift+Insert Control+Shift+i

kakoune/.config/kak-tree-sitter/config.toml

@@ -1,34 +0,0 @@
-# gotmpl
-[grammar.gotmpl.source.git]
-url = "https://github.com/ngalaiko/tree-sitter-go-template"
-pin = "aa71f63de226c5592dfbfc1f29949522d7c95fac"
-
-[language.gotmpl.queries.source.git]
-url = "https://github.com/helix-editor/helix"
-pin = "7275b7f85014aad7e15d4987ec4f2249572eecfb"
-
-# odin
-[grammar.odin.source.git]
-url = "https://github.com/tree-sitter-grammars/tree-sitter-odin"
-pin = "d2ca8efb4487e156a60d5bd6db2598b872629403"
-
-[grammar.odin]
-compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."]
-link_args = ["-shared", "-fpic", "scanner.o", "parser.o", "-o", "odin.so"]
-
-[language.odin.queries.source.git]
-url = "https://github.com/helix-editor/helix"
-pin = "7275b7f85014aad7e15d4987ec4f2249572eecfb"
-
-# templ
-[grammar.templ.source.git]
-url = "https://github.com/vrischmann/tree-sitter-templ"
-pin = "04bae7c82de2fcfec94254fef50f5f1c5924f5f5"
-
-[grammar.templ]
-compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."]
-link_args = ["-shared", "-fpic", "scanner.o", "parser.o", "-o", "templ.so"]
-
-[language.templ.queries.source.git]
-url = "https://github.com/helix-editor/helix"
-pin = "7275b7f85014aad7e15d4987ec4f2249572eecfb"

kakoune/.config/kak/colors/five-colors-dark.kak

@@ -121,55 +121,5 @@ evaluate-commands %sh{
 
         set-face global SnippetsNextPlaceholders $bg,$green2
         set-face global SnippetsOtherPlaceholders $bg,$yellow2
-
-        # kak-tree-sitter
-
-        set-face global ts_attribute $green3
-        set-face global ts_comment $gray
-        set-face global ts_constant $violet2
-        set-face global ts_conceal $red1
-        set-face global ts_constructor $red1
-        set-face global ts_diff_plus $green2
-        set-face global ts_diff_minus $red2
-        set-face global ts_diff_delta $blue2
-        set-face global ts_error $red2
-        set-face global ts_function $blue2
-        set-face global ts_hint $green2
-        set-face global ts_info $blue2
-        set-face global ts_keyword $violet3
-        set-face global ts_label $red1
-        set-face global ts_bold $green2+b
-        set-face global ts_markup_heading $red3
-        set-face global ts_markup_italic $green2+i
-        set-face global ts_markup_list_checked $red2
-        set-face global ts_markup_list_numbered $red2
-        set-face global ts_markup_list_unchecked $red2
-        set-face global ts_markup_list_unnumbered $red2
-        set-face global ts_markup_link_label $green2
-        set-face global ts_markup_link_url $blue2
-        set-face global ts_markup_link_uri $blue2
-        set-face global ts_markup_link_text $red1
-        set-face global ts_markup_quote $blue3
-        set-face global ts_markup_raw $yellow2
-        set-face global ts_markup_strikethrough $red2+s
-        set-face global ts_namespace $green3
-        set-face global ts_operator $red2
-        set-face global ts_property $green3
-        set-face global ts_punctuation $red3
-        set-face global ts_special $red3
-        set-face global ts_spell $red1+c
-        set-face global ts_string $yellow2
-        set-face global ts_string_regex $yellow1+b
-        set-face global ts_string_regexp $yellow1+b
-        set-face global ts_string_escape $yellow1+b
-        set-face global ts_string_special $yellow1+b
-        set-face global ts_string_symbol $yellow1+b
-        set-face global ts_tag $green2
-        set-face global ts_tag_error $red2+c
-        set-face global ts_text $red1
-        set-face global ts_text_title $red3
-        set-face global ts_type $green2
-        set-face global ts_variable $blue3
-        set-face global ts_warning $yellow2+c
     "
 }

kakoune/.config/kak/colors/five-colors-light.kak

@@ -121,55 +121,5 @@ evaluate-commands %sh{
 
         set-face global SnippetsNextPlaceholders $bg,$green2
         set-face global SnippetsOtherPlaceholders $bg,$yellow2
-
-        # kak-tree-sitter
-
-        set-face global ts_attribute $green3
-        set-face global ts_comment $gray
-        set-face global ts_constant $violet2
-        set-face global ts_conceal $red1
-        set-face global ts_constructor $red1
-        set-face global ts_diff_plus $green2
-        set-face global ts_diff_minus $red2
-        set-face global ts_diff_delta $blue2
-        set-face global ts_error $red2
-        set-face global ts_function $blue2
-        set-face global ts_hint $green2
-        set-face global ts_info $blue2
-        set-face global ts_keyword $violet3
-        set-face global ts_label $red1
-        set-face global ts_bold $green2+b
-        set-face global ts_markup_heading $red3
-        set-face global ts_markup_italic $green2+i
-        set-face global ts_markup_list_checked $red2
-        set-face global ts_markup_list_numbered $red2
-        set-face global ts_markup_list_unchecked $red2
-        set-face global ts_markup_list_unnumbered $red2
-        set-face global ts_markup_link_label $green2
-        set-face global ts_markup_link_url $blue2
-        set-face global ts_markup_link_uri $blue2
-        set-face global ts_markup_link_text $red1
-        set-face global ts_markup_quote $blue3
-        set-face global ts_markup_raw $yellow2
-        set-face global ts_markup_strikethrough $red2+s
-        set-face global ts_namespace $green3
-        set-face global ts_operator $red2
-        set-face global ts_property $green3
-        set-face global ts_punctuation $red3
-        set-face global ts_special $red3
-        set-face global ts_spell $red1+c
-        set-face global ts_string $yellow2
-        set-face global ts_string_regex $yellow1+b
-        set-face global ts_string_regexp $yellow1+b
-        set-face global ts_string_escape $yellow1+b
-        set-face global ts_string_special $yellow1+b
-        set-face global ts_string_symbol $yellow1+b
-        set-face global ts_tag $green2
-        set-face global ts_tag_error $red2+c
-        set-face global ts_text $red1
-        set-face global ts_text_title $red3
-        set-face global ts_type $green2
-        set-face global ts_variable $blue3
-        set-face global ts_warning $yellow2+c
     "
 }

kakoune/.config/kak/kakrc

@@ -6,11 +6,7 @@ set-option global ui_options terminal_assistant=none
 hook global WinCreate .* %{
     add-highlighter window/number-lines number-lines -relative -hlcursor
 }
-
+add-highlighter global/ show-matching
-hook global BufCreate .*\.templ %{ set buffer filetype templ }
-hook global BufCreate .*\.html.tmpl %{ set buffer filetype gotmpl }
-
-hook global WinCreate ^[^*]+$ %{editorconfig-load}
 
 # LOCAL
 
@@ -19,44 +15,34 @@ nop %sh{
 	[ -e "$kak_config/autoload/stdlib" ] || ln -s "$kak_runtime/autoload" "$kak_config/autoload/stdlib"
 }
 
-map global -docstring 'Buffer' user ' ' ': buffer '
+map global -docstring 'Buffer' user ' ' ': b '
 
 declare-user-mode file-mode
 map global -docstring 'Search/open' user 's' ': enter-user-mode file-mode<ret>'
 
-map global -docstring 'Open (fd)' file-mode 'a' ': file-open<ret>'
+map global -docstring 'Open (git)' file-mode 'a' ': file-open-git<ret>'
+map global -docstring 'Open (fd)' file-mode 'f' ': file-open<ret>'
 map global -docstring 'Open (fd -H)' file-mode 'h' ': file-open-with-hidden<ret>'
 map global -docstring 'Open (recent)' file-mode 'r' ': file-open-recent<ret>'
-map global -docstring 'Open (nnn)' file-mode 'd' ': nnn-open %val{buffile}<ret>'
+map global -docstring 'Open (nnn)' file-mode 'n' ': nnn-open %val{buffile}<ret>'
-map global -docstring 'Open (nnn)' file-mode 'D' ': nnn-open .<ret>'
+map global -docstring 'Open (nnn)' file-mode 'N' ': nnn-open .<ret>'
 map global -docstring 'Open/create in dir' file-mode 'c' ': open-create-in-dir<ret>'
 map global -docstring 'ctags file symbols' file-mode 's' ': ctags-file-symbols<ret>'
-map global -docstring 'ctags project symbols' file-mode 'w' ': ctags-project-symbols<ret>'
+map global -docstring 'ctags project symbols' file-mode 'p' ': ctags-project-symbols<ret>'
-map global -docstring 'Grep' file-mode 'g' ':grep '
-map global -docstring 'Grep next match' file-mode 'n' ': grep-next-match<ret>'
-map global -docstring 'Grep previous match' file-mode 'p' ': grep-prev-match<ret>'
-map global -docstring 'Grep current file' file-mode 'l' ':grep-file '
-map global -docstring 'Grep current file' file-mode 'L' ': grep-file %val{selection}<ret>'
-map global -docstring 'Delete buffer' file-mode 'x' ': delete-buffer '
-map global -docstring 'REPL send selection' file-mode 'u' ': repl-send-text<ret>'
-map global -docstring 'REPL send paragraph' file-mode 'U' ': repl-send-paragraph<ret>'
 
 declare-user-mode git-mode
 map global -docstring 'Git' user 'g' ': enter-user-mode git-mode<ret>'
 
-map global -docstring 'Open file' git-mode 'a' ': file-open-git<ret>'
 map global -docstring 'Blame' git-mode 'b' ': git blame<ret>'
 map global -docstring 'Blame' git-mode 'B' ': git blame-jump<ret>'
 map global -docstring 'Diff file' git-mode 'd' ': git diff %val{buffile}<ret>'
 map global -docstring 'Diff' git-mode 'D' ': git diff<ret>'
-map global -docstring 'Grep' git-mode 'g' ':git grep '
+map global -docstring 'Grep' git-mode 'g' ': git grep '
-map global -docstring 'Grep' git-mode 'G' ': git grep %val{selection}<ret>'
 map global -docstring 'Log' git-mode 'l' ': git log -- %val{buffile}<ret>'
 map global -docstring 'Log' git-mode 'L' ': git log<ret>'
 map global -docstring 'Show branch' git-mode 'c' ': git show-branch<ret>'
 map global -docstring 'Status' git-mode 't' ': git status<ret>'
 map global -docstring 'Show diff' git-mode 's' ': git-show-diff<ret>'
-map global -docstring 'Show' git-mode 'S' ': git show<ret>'
 map global -docstring 'Hide diff' git-mode 'h' ': git-hide-diff<ret>'
 map global -docstring 'Next hunk' git-mode 'n' ': git next-hunk<ret>'
 map global -docstring 'Prev hunk' git-mode 'p' ': git prev-hunk<ret>'
@@ -66,6 +52,8 @@ map global -docstring 'Options' user 'o' ': enter-user-mode options-mode<ret>'
 
 map global -docstring 'Five Dark mode' options-mode 'd' ': colorscheme five-colors-dark<ret>'
 map global -docstring 'Five Light mode' options-mode 'l' ': colorscheme five-colors-light<ret>'
+map global -docstring 'Light mode' options-mode 'L' ': colorscheme one-light<ret>'
+map global -docstring 'Dark mode' options-mode 'D' ': colorscheme one-darker<ret>'
 
 declare-user-mode make-mode
 map global -docstring 'Make' user 'k' ': enter-user-mode make-mode<ret>'
@@ -75,12 +63,6 @@ map global -docstring 'Next' make-mode 'n' ': make-next-error<ret>'
 map global -docstring 'Previous' make-mode 'p' ': make-previous-error<ret>'
 map global -docstring 'General messages' make-mode 'g' ': set window make_error_pattern "^([^:\n]+):(\d+):(?:(\d+):)? ([^\n]+)?"<ret>'
 
-declare-user-mode code-mode
-map global -docstring 'Code' user 'c' ': enter-user-mode code-mode<ret>'
-
-map global -docstring 'Comment block' code-mode 'b' ': comment-block<ret>'
-map global -docstring 'Comment line' code-mode 'l' ': comment-line<ret>'
-
 evaluate-commands %sh{
     if [ -n "$WAYLAND_DISPLAY" ]; then
         echo "
@@ -117,10 +99,6 @@ define-command -override file-open-recent %{
     prompt -menu -shell-script-candidates %{ cat ~/.cache/kak-mru } 'File (recent): ' %{ edit -- %val{text} }
 }
 
-define-command -override grep-file -params 1- %{
-    grep %arg{@} -- %val{buffile}
-}
-
 define-command -override -params 1 nnn-open %{
     terminal nnn-kak-edit %arg{1} %val{session} %val{client}
 }
@@ -129,10 +107,6 @@ define-command -override open-create-in-dir %{
     execute-keys ': edit ' %sh{dirname "$kak_buffile"}/
 }
 
-define-command -override repl-send-paragraph %{
-    execute-keys -draft '<a-i>p: repl-send-text<ret>'
-}
-
 define-command git-log-show-current-commit %{
     execute-keys ';<a-/>^commit\s[0-9a-f]+<ret>b'
     git show %val{selection}
@@ -150,17 +124,18 @@ define-command -override git-hide-diff %{
 
 define-command -override ctags-file-symbols %{
     prompt -menu -shell-script-candidates %{
-        ctags -uo - -x "$kak_buffile" | awk -f "$kak_config/scripts/filesymbols.awk"
+        ctags -uo - -x $kak_buffile | awk '{ print $1 ":" $2 ":" $3 }'
     } 'File symbols: ' %{
-        evaluate-commands %sh{ awk -f "$kak_config/scripts/filesymbolscmd.awk" # "$kak_text" }
+        evaluate-commands %sh{ printf '%s\n' $kak_text | awk -F ':' '{ print "execute-keys", $3, "g", "/\\b" $1 "\\b<ret>" }' }
     }
 }
 
 define-command -override ctags-project-symbols %{
     prompt -menu -shell-script-candidates %{
-        git ls-files | xargs wc | awk '$1 > 0 && $3/$1 < 1024 { print $4 }' | xargs ctags -uo - -x | awk -f "$kak_config/scripts/projectsymbols.awk"
+        ctags -uo - -x $(git ls-files | grep $(printf "%s\n" $kak_buffile | awk -F '.' '{print "\\." $NF}')) | awk '{ print $1 ":" $2 ":" $3 ":" $4 }'
-    } 'Project symbols: ' %{
+    } 'File symbols: ' %{
-        evaluate-commands %sh{ awk -f "$kak_config/scripts/projectsymbolscmd.awk" # "$kak_text" }
+        edit -- %sh{ printf '%s\n' $kak_text | awk -F ':' '{ print $4 }' } %sh{ printf '%s\n' $kak_text | awk -F ':' '{ print $3 }' }
+        evaluate-commands %sh{ printf '%s\n' $kak_text | awk -F ':' '{ print "execute-keys /\\b" $1 "\\b<ret>" }' }
     }
 }
 
@@ -184,12 +159,6 @@ hook global BufSetOption filetype=odin %{
     set-option buffer formatcmd 'odinfmt -stdin'
 }
 
-hook global BufSetOption filetype=go %{
-    hook -group buf-write-pre-fmt buffer BufWritePre .* %{
-        lsp-formatting-sync
-    }
-}
-
 # LSP
 
 eval %sh{kak-lsp}
@@ -219,7 +188,19 @@ map global lsp p '<esc>: lsp-find-error --previous error<ret>'   -docstring 'fin
 source "%val{config}/bundle/kak-bundle/rc/kak-bundle.kak"
 bundle-noload kak-bundle https://codeberg.org/jdugan6240/kak-bundle
 
-# RECENT
+# COLORSCHEME
+
+bundle-theme kak-one 'https://codeberg.org/raiguard/kak-one'
+
+bundle-theme kakoune-themes 'https://codeberg.org/anhsirk0/kakoune-themes'
+
+# FZF
+
+bundle fzf.kak 'https://github.com/andreyorst/fzf.kak' %{
+    map global -docstring 'FZF menu' user 'f' ': fzf-mode<ret>'
+    require-module fzf
+    set-option global fzf_highlight_command "bat"
+}
 
 hook global BufCreate [^*].* %{
     nop %sh{
@@ -250,24 +231,48 @@ bundle kak-harpoon 'https://codeberg.org/raiguard/kak-harpoon' %{
     harpoon-add-bindings
 }
 
-# TREE SITTER
+# PENEIRA
 
-eval %sh{ kak-tree-sitter -dks --init $kak_session }
+bundle 'luar' 'https://github.com/gustavo-hms/luar' %{
+    require-module luar
+}
 
-define-command -override tree-sitter-user-after-highlighter %{
+bundle 'peneira' 'https://github.com/gustavo-hms/peneira' %{
-    add-highlighter -override buffer/show-matching show-matching
+    require-module peneira
+
+    define-command buffers %{
+        peneira 'buffers: ' %{ eval "printf '%s\n' $kak_quoted_buflist" } %{
+            buffer %arg{1}
+        }
+    }
+    define-command peneira-git-files %{
+        peneira 'git files: ' %{ git ls-files } %{ edit -- %arg{1} }
+    }
+    define-command peneira-files-with-hidden %{
+        peneira 'git files: ' %{ fd -t f -H } %{ edit -- %arg{1} }
+    }
+    define-command peneira-recent-files %{
+        peneira 'mru files: ' %{ cat ~/.cache/kak-mru } %{ edit -- %arg{1} }
+    }
+
+    map global -docstring 'Buffer' user ' ' ': buffers<ret>'
+
+    map global -docstring 'Git files' file-mode 'a' ': peneira-git-files<ret>'
+    map global -docstring 'Buffers' file-mode 'b' ': buffers<ret>'
+    map global -docstring 'Files' file-mode 'f' ': peneira-files<ret>'
+    map global -docstring 'Files' file-mode 'F' ': peneira-local-files<ret>'
+    map global -docstring 'Files (with hidden)' file-mode 'h' ': peneira-files-with-hidden<ret>'
+    map global -docstring 'Lines' file-mode 'l' ': peneira-lines<ret>'
+    map global -docstring 'Symbols' file-mode 's' ': peneira-symbols<ret>'
+    map global -docstring 'Recent files' file-mode 'r' ': peneira-recent-files<ret>'
 }
 
 # LOCAL
 
-define-command set-dark-or-light-colorscheme %{
+colorscheme %sh{
-    colorscheme %sh{
+	if [ -e ~/.lightmode ]; then
-    	if [ -e ~/.lightmode ]; then
+		echo five-colors-light
-    		echo five-colors-light
+	else
-    	else
+		echo five-colors-dark
-    		echo five-colors-dark
+	fi
-    	fi
-    }
 }
-
-set-dark-or-light-colorscheme

kakoune/.config/kak/scripts/filesymbols.awk

@@ -1,9 +0,0 @@
-{
-    for (i = 3; i < NF; ++i) {
-        if ($i ~ /^[0-9]+$/) {
-            j = match($0, "[ ]+" $(i-1) "[ ]+" $i " ")
-            print substr($0, 0, j - 1) "·" $(i-1) "·" $i
-            break
-        }
-    }
-}

kakoune/.config/kak/scripts/filesymbolscmd.awk

@@ -1,10 +0,0 @@
-BEGIN {
-    n = split(ENVIRON["kak_text"], a, "·")
-    line = a[3]
-    if (n == 3 && line ~ /^[0-9]+/) {
-        pat = a[1]
-        gsub(/'/, "''", pat)
-        gsub(/\\/, "\\\\", pat)
-        print "execute-keys " line " g vv x s '/\\b\\Q" pat "\\E\\b|\\Q" pat "<ret>' <a-)>,"
-    }
-}

kakoune/.config/kak/scripts/projectsymbols.awk

@@ -1,9 +0,0 @@
-{
-    for (i = 3; i < NF; ++i) {
-        if ($i ~ /^[0-9]+$/) {
-            j = match($0, "[ ]+" $(i-1) "[ ]+" $i " ")
-            print substr($0, 0, j - 1) "·" $(i-1) "·" $i "·" $(i+1)
-            break
-        }
-    }
-}

kakoune/.config/kak/scripts/projectsymbolscmd.awk

@@ -1,11 +0,0 @@
-BEGIN {
-    n = split(ENVIRON["kak_text"], a, "·")
-    line = a[3]
-    if (n == 4 && line ~ /^[0-9]+/) {
-        pat = a[1]
-        gsub(/'/, "''", pat)
-        gsub(/\\/, "\\\\", pat)
-        print "edit --", a[4], line
-        print "execute-keys vv x s %{/\\b\\Q" pat "\\E\\b|\\Q" pat "<ret>} <a-)>,"
-    }
-}

kwm/.config/kwm/config.zon

@@ -1024,17 +1024,6 @@
                     },
                 },
             },
-            .{
-                .keysym = "l",
-                .modifiers = .{ .mod4 = true, .shift = true },
-                .event = .{
-                    .click = .{
-                        .pressed = .{
-                                .spawn = .{ .argv = .{ "waylock" } },
-                        },
-                    },
-                },
-            },
         },
 
         // list of pointer bindings

lazygit-use-zsh/.config/lazygit/bin/bash

@@ -1 +0,0 @@
-/bin/zsh

lazygit-use-zsh/bin/lazygit

@@ -1,2 +0,0 @@
-#!/bin/sh
-PATH="$PATH:$HOME/.config/lazygit/bin" exec /usr/bin/lazygit "$@"

lazygit/.config/lazygit/config.yml

@@ -1,9 +1,9 @@
 os:
-  edit: 'kak {{filename}}'
+  edit: 'nvim {{filename}}'
-  editAtLine: 'kak +{{line}} {{filename}}'
+  editAtLine: 'nvim +{{line}} {{filename}}'
-  editAtLineAndWait: 'kak +{{line}} {{filename}}'
+  editAtLineAndWait: 'nvim +{{line}} {{filename}}'
   editInTerminal: true
-  openDirInEditor: 'kak -e "nnn-open {{dir}}"'
+  openDirInEditor: 'nvim {{dir}}'
 
 gui:
   nerdFontsVersion: "3"
@@ -11,6 +11,3 @@ gui:
   theme:
     selectedLineBgColor:
       - reverse
-
-git:
-    autoFetch: false

mango/.config/mango/config.conf

@@ -1,311 +0,0 @@
-# More option see https://mangowm.github.io/docs/configuration
-
-exec-once=waybar
-exec-once=openrc -q -U gui
-
-# Window effect
-blur=0
-blur_layer=0
-blur_optimized=1
-blur_params_num_passes = 2
-blur_params_radius = 5
-blur_params_noise = 0.02
-blur_params_brightness = 0.9
-blur_params_contrast = 0.9
-blur_params_saturation = 1.2
-
-shadows = 0
-layer_shadows = 0
-shadow_only_floating = 1
-shadows_size = 10
-shadows_blur = 15
-shadows_position_x = 0
-shadows_position_y = 0
-shadowscolor= 0x000000ff
-
-border_radius=6
-no_radius_when_single=0
-focused_opacity=1.0
-unfocused_opacity=1.0
-
-# Animation Configuration(support type:zoom,slide)
-# tag_animation_direction: 1-horizontal,0-vertical
-animations=1
-layer_animations=1
-animation_type_open=slide
-animation_type_close=slide
-animation_fade_in=1
-animation_fade_out=1
-tag_animation_direction=1
-zoom_initial_ratio=0.4
-zoom_end_ratio=0.8
-fadein_begin_opacity=0.5
-fadeout_begin_opacity=0.8
-animation_duration_move=500
-animation_duration_open=400
-animation_duration_tag=350
-animation_duration_close=800
-animation_duration_focus=0
-animation_curve_open=0.46,1.0,0.29,1
-animation_curve_move=0.46,1.0,0.29,1
-animation_curve_tag=0.46,1.0,0.29,1
-animation_curve_close=0.08,0.92,0,1
-animation_curve_focus=0.46,1.0,0.29,1
-animation_curve_opafadeout=0.5,0.5,0.5,0.5
-animation_curve_opafadein=0.46,1.0,0.29,1
-
-# Scroller Layout Setting
-scroller_structs=20
-scroller_default_proportion=0.8
-scroller_focus_center=0
-scroller_prefer_center=0
-edge_scroller_pointer_focus=1
-edge_scroller_focus_allow_speed=0.0
-scroller_default_proportion_single=1.0
-scroller_proportion_preset=0.5,0.8,1.0
-
-# Master-Stack Layout Setting
-new_is_master=1
-default_mfact=0.55
-default_nmaster=1
-smartgaps=0
-
-# Dwindle Layout Setting
-dwindle_smart_split=0
-dwindle_drop_simple_split=1
-dwindle_manual_split=0
-dwindle_hsplit=1
-dwindle_vsplit=1
-dwindle_preserve_split=0
-
-# Overview Setting
-hotarea_size=10
-enable_hotarea=0
-ov_tab_mode=1
-ov_no_resize=1
-overviewgappi=5
-overviewgappo=30
-
-# Misc
-no_border_when_single=0
-axis_bind_apply_timeout=100
-focus_on_activate=1
-idleinhibit_ignore_visible=0
-sloppyfocus=1
-warpcursor=1
-focus_cross_monitor=0
-focus_cross_tag=0
-enable_floating_snap=0
-snap_distance=30
-cursor_size=24
-drag_tile_to_tile=1
-drag_tile_small=1
-
-# keyboard
-repeat_rate=25
-repeat_delay=600
-numlockon=0
-xkb_rules_layout=pl
-
-# Trackpad
-# need relogin to make it apply
-disable_trackpad=0
-tap_to_click=1
-tap_and_drag=1
-drag_lock=1
-trackpad_natural_scrolling=0
-disable_while_typing=1
-left_handed=0
-middle_button_emulation=0
-swipe_min_threshold=1
-
-# mouse
-# need relogin to make it apply
-mouse_natural_scrolling=0
-
-# Appearance
-gappih=5
-gappiv=5
-gappoh=10
-gappov=10
-scratchpad_width_ratio=0.8
-scratchpad_height_ratio=0.9
-borderpx=4
-rootcolor=0x201b14ff
-bordercolor=0x444444ff
-dropcolor=0x8FBA7C55
-splitcolor=0xEB441EFF
-focuscolor=0xc9b890ff
-maximizescreencolor=0x89aa61ff
-urgentcolor=0xad401fff
-scratchpadcolor=0x516c93ff
-globalcolor=0xb153a7ff
-overlaycolor=0x14a57cff
-
-# layout support:
-# tile,scroller,grid,deck,monocle,center_tile,vertical_tile,vertical_scroller
-tagrule=id:1,layout_name:tile
-tagrule=id:2,layout_name:tile
-tagrule=id:3,layout_name:tile
-tagrule=id:4,layout_name:tile
-tagrule=id:5,layout_name:tile
-tagrule=id:6,layout_name:tile
-tagrule=id:7,layout_name:tile
-tagrule=id:8,layout_name:tile
-tagrule=id:9,layout_name:tile
-
-# Key Bindings
-# key name refer to `xev` or `wev` command output,
-# mod keys name: super,ctrl,alt,shift,none
-
-# reload config
-bind=SUPER,r,reload_config
-
-# menu and terminal
-bind=SUPER,p,spawn,rofi -show drun
-bind=SUPER,Return,spawn,foot
-
-# lock and toggle theme
-bind=SUPER+CTRL+SHIFT,l,spawn,swaylock
-bind=SUPER+CTRL+SHIFT,t,spawn,lupan-set-theme toggle
-
-# exit
-bind=SUPER+SHIFT,q,quit
-bind=SUPER+SHIFT,c,killclient,
-
-# switch window focus
-bind=SUPER,Tab,focusstack,next
-bind=SUPER,h,focusdir,left
-bind=SUPER,l,focusdir,right
-bind=SUPER,k,focusdir,up
-bind=SUPER,j,focusdir,down
-
-# swap window
-bind=SUPER+SHIFT,k,exchange_client,up
-bind=SUPER+SHIFT,j,exchange_client,down
-bind=SUPER+SHIFT,h,exchange_client,left
-bind=SUPER+SHIFT,l,exchange_client,right
-
-# switch window status
-bind=SUPER,g,toggleglobal,
-bind=SUPER,Tab,toggleoverview,
-bind=SUPER,backslash,togglefloating,
-bind=SUPER,m,togglemaximizescreen,
-bind=SUPER,f,togglefullscreen,
-bind=SUPER+SHIFT,f,togglefakefullscreen,
-bind=SUPER,i,minimized,
-bind=SUPER,o,toggleoverlay,
-bind=SUPER+SHIFT,I,restore_minimized
-bind=SUPER,z,toggle_scratchpad
-
-# scroller layout
-bind=SUPER,e,set_proportion,1.0
-bind=SUPER,x,switch_proportion_preset,
-bind=alt+super+ctrl,Left,scroller_stack,left
-bind=alt+super+ctrl,Right,scroller_stack,right
-bind=alt+super+ctrl,Up,scroller_stack,up
-bind=alt+super+ctrl,Down,scroller_stack,down
-
-#dwindle layout(manual split mode)
-bind=SUPER+shift,Return,dwindle_toggle_split_direction
-
-# switch layout
-bind=SUPER,n,switch_layout
-bind=SUPER+CTRL,c,setlayout,center_tile
-bind=SUPER+CTRL,d,setlayout,deck
-bind=SUPER+CTRL,e,setlayout,vertical_deck
-bind=SUPER+CTRL,f,setlayout,fair
-bind=SUPER+CTRL,g,setlayout,grid
-bind=SUPER+CTRL,i,setlayout,vertical_fair
-bind=SUPER+CTRL,r,setlayout,right_tile
-bind=SUPER+CTRL,s,setlayout,scroller
-bind=SUPER+CTRL,t,setlayout,tile
-bind=SUPER+CTRL,u,setlayout,vertical_scroller
-bind=SUPER+CTRL,v,setlayout,vertical_tile
-bind=SUPER+CTRL,w,setlayout,dwindle
-
-# tag switch
-bind=SUPER,Left,viewtoleft,0
-bind=SUPER+CTRL,Left,viewtoleft_have_client,0
-bind=SUPER,Right,viewtoright,0
-bind=SUPER+CTRL,Right,viewtoright_have_client,0
-bind=CTRL+SHIFT+SUPER,Left,tagtoleft,0
-bind=CTRL+SHIFT+SUPER,Right,tagtoright,0
-
-bind=SUPER+Alt,h,viewtoleft_have_client,0
-bind=SUPER+Alt,l,viewtoright_have_client,0
-
-bind=SUPER,1,view,1,0
-bind=SUPER,2,view,2,0
-bind=SUPER,3,view,3,0
-bind=SUPER,4,view,4,0
-bind=SUPER,5,view,5,0
-bind=SUPER,6,view,6,0
-bind=SUPER,7,view,7,0
-bind=SUPER,8,view,8,0
-bind=SUPER,9,view,9,0
-
-# tag: move client to the tag and focus it
-# tagsilent: move client to the tag and not focus it
-# bind=Alt,1,tagsilent,1
-bind=SUPER+shift,1,tag,1,0
-bind=SUPER+shift,2,tag,2,0
-bind=SUPER+shift,3,tag,3,0
-bind=SUPER+shift,4,tag,4,0
-bind=SUPER+shift,5,tag,5,0
-bind=SUPER+shift,6,tag,6,0
-bind=SUPER+shift,7,tag,7,0
-bind=SUPER+shift,8,tag,8,0
-bind=SUPER+shift,9,tag,9,0
-
-# monitor switch
-bind=SUPER+alt+shift,Left,focusmon,left
-bind=SUPER+alt+shift,Right,focusmon,right
-bind=SUPER+Alt,Left,tagmon,left
-bind=SUPER+Alt,Right,tagmon,right
-
-bind=SUPER,comma,focusmon,left
-bind=SUPER,period,focusmon,right
-bind=SUPER+shift,comma,tagmon,left
-bind=SUPER+shift,period,tagmon,right
-
-# gaps
-bind=SUPER+SHIFT,X,incgaps,1
-bind=SUPER+SHIFT,Z,incgaps,-1
-bind=SUPER+SHIFT,R,togglegaps
-
-# movewin
-bind=SUPER+CTRL,k,movewin,+0,-50
-bind=SUPER+CTRL,j,movewin,+0,+50
-bind=SUPER+CTRL,h,movewin,-50,+0
-bind=SUPER+CTRL,l,movewin,+50,+0
-
-# resizewin
-bind=SUPER+CTRL+ALT,Up,resizewin,+0,-50
-bind=SUPER+CTRL+ALT,Down,resizewin,+0,+50
-bind=SUPER+CTRL+ALT,Left,resizewin,-50,+0
-bind=SUPER+CTRL+ALT,Right,resizewin,+50,+0
-
-bind=SUPER+CTRL+ALT,k,resizewin,+0,-50
-bind=SUPER+CTRL+ALT,j,resizewin,+0,+50
-bind=SUPER+CTRL+ALT,h,resizewin,-50,+0
-bind=SUPER+CTRL+ALT,l,resizewin,+50,+0
-
-# Mouse Button Bindings
-# btn_left and btn_right can't bind none mod key
-mousebind=SUPER,btn_left,moveresize,curmove
-mousebind=NONE,btn_middle,togglemaximizescreen,0
-mousebind=SUPER,btn_right,moveresize,curresize
-
-
-# Axis Bindings
-axisbind=SUPER,UP,viewtoleft_have_client
-axisbind=SUPER,DOWN,viewtoright_have_client
-
-
-# layer rule
-layerrule=animation_type_open:zoom,layer_name:rofi
-layerrule=animation_type_close:zoom,layer_name:rofi
-
-monitorrule=name:^HDMI-A-1$,scale:2,x:0
-monitorrule=name:^HDMI-A-2$,scale:2,x:1920

mango/.config/waybar/config

@@ -1,20 +0,0 @@
-{
-  "modules-left": [
-    "ext/workspaces",
-    "dwl/window"
-  ],
-  "modules-right": [
-      "tray",
-      "clock"
-  ],
-  "ext/workspaces": {
-    "format": "{icon}",
-    "ignore-hidden": true,
-    "on-click": "activate",
-    "on-click-right": "deactivate",
-    "sort-by-id": true
-  },
-  "dwl/window": {
-    "format": "[{layout}] {title}"
-  }
-}

mango/.config/waybar/dark.css

@@ -1,12 +0,0 @@
-* {
-    background-color: #282e38;
-    color: #a29e98;
-}
-
-#workspaces button.active {
-    border-bottom: 3px solid #04785d;
-}
-
-#workspaces button.urgent {
-    border-bottom: 3px solid #c37583;
-}

mango/.config/waybar/light.css

@@ -1,12 +0,0 @@
-* {
-    background-color: #f6ede0;
-    color: #696257;
-}
-
-#workspaces button.active {
-    border-bottom: 3px solid #278a6e;
-}
-
-#workspaces button.urgent {
-    border-bottom: 3px solid #d0818f;
-}

mango/.config/waybar/style.css

@@ -1,25 +0,0 @@
-@import url("file:///home/lupan/.config/waybar/dark.css");
-
-* {
-    font-family: HurmitNerdFont;
-    font-size: 12px;
-}
-
-#workspaces {
-    padding: 0 0.5rem;
-}
-
-#workspaces button {
-    padding: 0 3px;
-    border-radius: 0;
-    border-bottom: 3px solid transparent;
-}
-
-#window {
-    border-bottom: 3px solid transparent;
-}
-
-#clock {
-    padding: 0 0.5rem;
-    border-bottom: 3px solid transparent;
-}

shell/.ashrc

@@ -1,5 +0,0 @@
-alias k=kak
-alias kc='kak -c "$(kak -l | fzf)"'
-alias kd='kak -s "$(printf %s $PWD | xargs basename)"'
-alias lg=lazygit
-alias z='cd $(fzf --walker dir --walker-root ~)'

shell/.config/shellconfig/aliases.sh

@@ -1,6 +1,5 @@
 alias v=nvim
 alias k=kak
-alias kd='kak -s "$(basename $PWD)"'
 alias ll='ls -l'
 alias tl='tmux list-sessions'
 alias rgh='rg -.'
@@ -23,7 +22,7 @@ elif which exa > /dev/null; then
 	alias tree='exa --tree --icons'
 else
 	eval $(dircolors)
-	alias ls='ls --color=auto'
+	alias ls='ls --color'
 fi
 
 alias nocaps='setxkbmap pl -option ctrl:nocaps'
@@ -38,12 +37,6 @@ a4i() {
 	fi
 }
 
-kc() {
-    local Q="${@:-}"
-    local NAME=$(kak -l | fzy -q "$Q")
-    [ -n "$NAME" ] && kak -c "$NAME"
-}
-
 tn() {
 	if [ $# -eq 0 ]; then
 		tmux new

shell/.profile

@@ -38,25 +38,17 @@ fi
 export GOPATH=~/.cache/go
 export GOBIN=~/.local/bin
 
-export ENV=~/.ashrc
-
 # start X or Hyprland at login
 if [ -z "$DISPLAY" -a -z "$WAYLAND_DISPLAY" -a "$(tty)" = /dev/tty1 ]; then
-    if which /usr/bin/sx > /dev/null; then
+    if which niri > /dev/null; then
-        exec /usr/bin/sx ~/.xinitrc
-    elif which /usr/bin/startx > /dev/null; then
-        exec /usr/bin/startx
-    elif which niri > /dev/null; then
         exec niri
-    elif which river argen > /dev/null; then
-        export XKB_DEFAULT_LAYOUT=pl
-        exec river -c 'argen'
     elif which river kwm stdout-clock > /dev/null; then
         export XKB_DEFAULT_LAYOUT=pl
         exec river -c 'stdout-clock | kwm'
-    elif which river rill > /dev/null; then
+    elif which /usr/bin/sx > /dev/null; then
-        export XKB_DEFAULT_LAYOUT=pl
+        exec /usr/bin/sx ~/.xsession
-        exec river -c rill
+    elif which /usr/bin/startx > /dev/null; then
+        exec /usr/bin/startx ~/.xsession
     elif which Hyprland > /dev/null && [ -d ~/.config/hypr ]; then
         exec Hyprland
     elif which river > /dev/null && [ -d ~/.config/river ]; then

xsession/.xsession

@@ -30,16 +30,16 @@ xsetroot -cursor_name left_ptr
 
 picom -b -I 1 -O 1 -e 1 --no-fading-openclose --backend glx || compton -b --no-fading-openclose
 
+if which awesome > /dev/null; then
+    exec awesome
+fi
+
 if which dwm > /dev/null; then
     dunst &
     lupan-clock &
     exec dwm
 fi
 
-if which awesome > /dev/null; then
-    exec awesome
-fi
-
 if which dk > /dev/null; then
     for m in $(polybar --list-monitors | cut -d: -f1); do
 	MONITOR=$m polybar --reload bar &

xsession/bin/lupan-set-theme

@@ -23,8 +23,8 @@ fi
 
 pkill -USR1 '^dwm$'
 
-XRES=$(readlink -f ~/.Xresources)
+XRES=$(readlink -e ~/.Xresources)
-if [ -f "$XRES" ]; then
+if [ -n "$XRES" ]; then
     if [ "$THEME" = dark ]; then
         sed -i 's/^#undef THEME_DARK/#define THEME_DARK/' "$XRES"
     elif [ "$THEME" = light ]; then
@@ -35,49 +35,37 @@ if [ -f "$XRES" ]; then
 fi
 
 # Alacritty
-AYML=$(readlink -f ~/.config/alacritty/alacritty.yml)
+AYML=$(readlink -e ~/.config/alacritty/alacritty.yml)
-if [ -f "$AYML" ]; then
+if [ -n "$AYML" ]; then
     sed -i "s/^colors: [*].*/colors: *$THEME/" "$AYML"
 fi
-ATOML=$(readlink -f ~/.config/alacritty/alacritty.toml)
+ATOML=$(readlink -e ~/.config/alacritty/alacritty.toml)
 if [ -f "$ATOML" ]; then
     sed -i "s#^import =.*#import = [\"~/.config/alacritty/$THEME.toml\"]#" "$ATOML"
 fi
 
-# Kitty
 if [ "$THEME" = dark ]; then
     kitten themes --reload-in=all 'five-colors-dark'
 elif [ "$THEME" = light ]; then
     kitten themes --reload-in=all 'five-colors-light'
 fi
 
-# Foot
-FOOT=$(readlink -f ~/.config/foot/foot.ini)
-if [ -f "$FOOT" ]; then
-    sed -i "s/^initial-color-theme .*/initial-color-theme = $THEME/" "$FOOT"
-fi
-
 # GTK
-XSET=$(readlink -f ~/.config/xsettingsd/xsettingsd.conf)
+XSET=$(readlink -e ~/.config/xsettingsd/xsettingsd.conf)
-if [ -f "$XSET" ]; then
+if [ -n "$XSET" ]; then
     sed -i -E "s#(Net/ThemeName) .*#\\1 \"${GTK_THEME}\"#" "$XSET"
     pkill -HUP -x xsettingsd
     gsettings set org.gnome.desktop.interface gtk-theme "${GTK_THEME}"
 fi
 
 # niri
-NIRI=$(readlink -f ~/.config/niri/config.kdl)
+NIRI=$(readlink -e ~/.config/niri/config.kdl)
-if [ -f "$NIRI" ]; then
+if [ -n "$NIRI" ]; then
     sed -i -E "s%^(include) \"(dark|light).kdl\".*%\\1 \"${THEME}.kdl\"%" "$NIRI"
 fi
 
 # waybar
-WCSS=$(readlink -f ~/.config/waybar/style.css)
+WCSS=$(readlink -e ~/.config/waybar/style.css)
 if [ -f "$WCSS" ]; then
     sed -i -E "s#file:///.*/(light|dark)[.]css#file://$HOME/.config/waybar/$THEME.css#" "$WCSS"
-    killall -SIGUSR2 waybar
 fi
-
-for session in $(kak -l); do
-    echo set-dark-or-light-colorscheme | kak -p $session
-done