diff --git a/_cli/zsh/aliases.zsh b/_cli/zsh/aliases.zsh index 03b3aa1..ee73536 100644 --- a/_cli/zsh/aliases.zsh +++ b/_cli/zsh/aliases.zsh @@ -1,7 +1,7 @@ alias ga='git add .; git commit --no-edit --amend; git push --force-with-lease' alias gae='git add .; git commit --amend; git push --force-with-lease' alias less='less -R' -alias startx='xinit ~/.config/xinitrc -- /etc/X11/xinit/xserverrc :0 -ardelay 280 -arinterval 30' +alias qt="dbus-launch --sh-syntax --exit-with-session qtile start -b wayland" if [[ $(command -v bat) ]]; then alias cat='bat -pp --color=always --tabs=2 --theme=Monokai\ Extended\ Bright' diff --git a/_unused/foot/foot.ini b/_gui/_configs/foot/foot.ini similarity index 83% rename from _unused/foot/foot.ini rename to _gui/_configs/foot/foot.ini index eb78fe8..00979ed 100644 --- a/_unused/foot/foot.ini +++ b/_gui/_configs/foot/foot.ini @@ -31,4 +31,10 @@ foreground=c7c7c7 urls=005577 [key-bindings] +search-start=Control+f show-urls-launch=Control+o + +[search-bindings] +commit=y +find-prev=Control+p +find-next=Control+n diff --git a/_unused/kanshi/config b/_gui/_configs/kanshi/config similarity index 100% rename from _unused/kanshi/config rename to _gui/_configs/kanshi/config diff --git a/_gui/_configs/qtile/config.py b/_gui/_configs/qtile/config.py index 640288c..e44e0bf 100644 --- a/_gui/_configs/qtile/config.py +++ b/_gui/_configs/qtile/config.py @@ -3,6 +3,16 @@ import subprocess from libqtile import bar, extension, hook, layout, widget from libqtile.lazy import lazy from libqtile.config import Click, Drag, DropDown, Group, Key, Match, ScratchPad, Screen +from libqtile.backend.wayland import InputConfig + +os.environ["MOZ_ENABLE_WAYLAND"] = "1" +os.environ["MOZ_DBUS_REMOTE"] = "1" + +wl_input_rules = { + "type:pointer": InputConfig(natural_scroll=True), + "type:touchpad": InputConfig(tap=True,natural_scroll=True), + "type:keyboard": InputConfig(kb_layout="pl",kb_repeat_delay=280,kb_repeat_rate=30), +} @hook.subscribe.startup_once def autostart(): @@ -13,7 +23,7 @@ mod = "mod4" groups = [ Group("1", label="\uf292"), Group("2", label="\uf738", matches=[Match(wm_class=["firefox"])]), - Group("3", label="\uf70d", matches=[Match(wm_class=["Ferdium", "discord", "Signal"])]), + Group("3", label="\uf70d", matches=[Match(wm_class=["ferdium", "discord", "Signal"])]), Group("4", label="\uf7aa", matches=[Match(wm_class=["mutt"])]), Group("5", label="\uf120"), Group("6", label="\uf120"), @@ -45,14 +55,14 @@ keys = [ Key([mod, "shift"], "k", lazy.layout.grow_up()), Key([mod, "shift", "control"], "0", lazy.layout.normalize()), # app binds - Key([mod], "Return", lazy.spawn("sh -c 'BROWSER=firefox st'")), + Key([mod], "Return", lazy.spawn("footclient")), Key([mod], "space", lazy.spawncmd()), Key([mod], "a", lazy.spawn("authenticator")), Key([mod], "e", lazy.spawn("selector-chars")), - Key([mod], "i", lazy.spawn("scrot -f -s 'scrot_%Y-%m-%d_%H-%M-%S_%s.png'")), - Key([mod], "m", lazy.spawn("sh -c 'pgrep -x neomutt > /dev/null || BROWSER=firefox st -n mutt -e neomutt'")), - Key([mod, "shift"], "i", lazy.spawn("scrot -f 'scrot_%Y-%m-%d_%H-%M-%S_%s.png'")), - Key([mod, "shift"], "Return", lazy.spawn("sh -c 'terminal_profile=work BROWSER=workfx st'")), + Key([mod], "i", lazy.spawn("sh -c 'grim -g \"$(slurp)\"'")), + Key([mod], "m", lazy.spawn("sh -c 'pgrep -x neomutt > /dev/null || footclient -a mutt -o bold-text-in-bright=yes neomutt'")), + Key([mod, "shift"], "i", lazy.spawn("grim")), + Key([mod, "shift"], "Return", lazy.spawn("sh -c 'terminal_profile=work foot -o url.launch=workfx\ \${url}'")), Key([mod, "control"], "a", lazy.spawn("selector-audio")), Key([mod, "control"], "b", lazy.spawn("selector-bluetooth")), # WM control @@ -165,7 +175,9 @@ screens = [ widget.Clock( format='[%d] %H:%M:%S', ), - widget.Systray(), + widget.StatusNotifier( + icon_size=18, + ), ], 24, margin=[5, 5, 0, 5] @@ -184,6 +196,13 @@ mouse = [ floating_layout = layout.Floating( float_rules=[ *layout.Floating.default_float_rules, + Match(title="File Upload"), + Match(title="Open File"), + Match(title="Open file"), + Match(title="Open Files"), + Match(title="Firefox — Sharing Indicator"), + Match(title="Enter name of file to save to…"), + Match(title="Save Image"), ], border_focus='#005577', border_normal="#272822", diff --git a/_gui/_configs/qtile/wallpaper.img b/_gui/_configs/qtile/wallpaper.img index c6576c7..6eacb9a 100644 Binary files a/_gui/_configs/qtile/wallpaper.img and b/_gui/_configs/qtile/wallpaper.img differ diff --git a/_gui/_scripts/selector-audio b/_gui/_scripts/selector-audio index 21d2ee1..8aba452 100755 --- a/_gui/_scripts/selector-audio +++ b/_gui/_scripts/selector-audio @@ -3,7 +3,7 @@ div="---" set_output() { - sel_sink=$(printf "$sinks\\n$div\\nback\\n$div\\nexit" | dmenu -l 20 -c -i -p "select output device") + sel_sink=$(printf "$sinks\\n$div\\nback\\n$div\\nexit" | wofi -G -dmenu -i -p "select output device") case "$sel_sink" in back) show_current ;; exit) exit ;; @@ -14,7 +14,7 @@ set_output() { } set_input() { - sel_source=$(printf "$sources\\n$div\\nbluetooth profile\\n$div\\nback\\n$div\\nexit" | dmenu -l 20 -c -i -p "select input device") + sel_source=$(printf "$sources\\n$div\\nbluetooth profile\\n$div\\nback\\n$div\\nexit" | wofi -G -dmenu -i -p "select input device") case "$sel_source" in back) show_current ;; exit) exit ;; @@ -29,7 +29,7 @@ set_bt_profile() { bt_sink=$(pactl list cards | awk -F'"' '/device.name.*bluez/ {print $2}') [ -z "${bt_sink}" ] && { notify-send -t 2000 -u critical "ﳌ no headphones connected"; exit; } - profile_chosen=$(printf "profile mSBC\\nprofile LDAC\\n$div\\nback\\nexit" | dmenu -l 20 -c -i -p "select bluettoth profile") + profile_chosen=$(printf "profile mSBC\\nprofile LDAC\\n$div\\nback\\nexit" | wofi -G -dmenu -i -p "select bluettoth profile") case "$profile_chosen" in back) show_current ;; exit) exit ;; @@ -44,7 +44,7 @@ set_bt_profile() { show_current() { def_snk=$(pactl list | grep -A 1 "Name: $(pactl get-default-sink)\$" | awk -F': ' '/Description: / {print $2}') def_src=$(pactl list | grep -A 1 "Name: $(pactl get-default-source)\$" | awk -F': ' '/Description: / {print $2}') - chosen=$(printf "output: $def_snk\\ninput: $def_src" | dmenu -l 20 -c -i -p "current audio devices") + chosen=$(printf "output: $def_snk\\ninput: $def_src" | wofi -G -dmenu -i -p "current audio devices") if [ "$1" = "no_switch" ]; then case "$chosen" in *) notify-send -t 2000 -u critical "婢 no device to switch" ;; diff --git a/_gui/_scripts/selector-bluetooth b/_gui/_scripts/selector-bluetooth index b173381..0fed0b8 100755 --- a/_gui/_scripts/selector-bluetooth +++ b/_gui/_scripts/selector-bluetooth @@ -287,7 +287,7 @@ show_menu() { } # command to pipe into, can add any options here -rofi_command="dmenu -l 10 -c -i -p" +rofi_command="wofi -G -dmenu -i -p" case "$1" in --status) diff --git a/_gui/_scripts/selector-chars b/_gui/_scripts/selector-chars index 1c78883..a521130 100755 --- a/_gui/_scripts/selector-chars +++ b/_gui/_scripts/selector-chars @@ -1,11 +1,11 @@ #!/bin/sh -chosen=$(cut -d ';' -f1 $XDG_CONFIG_HOME/qtile/chars/* | dmenu -l 20 -i -p "select character to copy" | sed "s/ .*//") +chosen=$(cut -d ';' -f1 $XDG_CONFIG_HOME/qtile/chars/* | wofi -G -dmenu -i -p "select character to copy" | sed "s/ .*//") [ -z "$chosen" ] && exit if [ -n "$1" ]; then xdotool type "$chosen" else - printf "$chosen" | xclip -rmlastnl + printf "$chosen" | wl-copy -n notify-send -t 2000 "'$chosen' copied to clipboard" & fi diff --git a/_gui/_configs/autorandr/home-dp0/config b/_unused/autorandr/home-dp0/config similarity index 100% rename from _gui/_configs/autorandr/home-dp0/config rename to _unused/autorandr/home-dp0/config diff --git a/_gui/_configs/autorandr/home-dp0/setup b/_unused/autorandr/home-dp0/setup similarity index 100% rename from _gui/_configs/autorandr/home-dp0/setup rename to _unused/autorandr/home-dp0/setup diff --git a/_gui/_configs/autorandr/home-dp1/config b/_unused/autorandr/home-dp1/config similarity index 100% rename from _gui/_configs/autorandr/home-dp1/config rename to _unused/autorandr/home-dp1/config diff --git a/_gui/_configs/autorandr/home-dp1/setup b/_unused/autorandr/home-dp1/setup similarity index 100% rename from _gui/_configs/autorandr/home-dp1/setup rename to _unused/autorandr/home-dp1/setup diff --git a/_gui/_configs/autorandr/nomad/config b/_unused/autorandr/nomad/config similarity index 100% rename from _gui/_configs/autorandr/nomad/config rename to _unused/autorandr/nomad/config diff --git a/_gui/_configs/autorandr/nomad/setup b/_unused/autorandr/nomad/setup similarity index 100% rename from _gui/_configs/autorandr/nomad/setup rename to _unused/autorandr/nomad/setup diff --git a/_gui/_configs/clipit/clipitrc b/_unused/clipit/clipitrc similarity index 100% rename from _gui/_configs/clipit/clipitrc rename to _unused/clipit/clipitrc