diff --git a/_desktop/_scripts/selector-audio b/_desktop/_scripts/selector-audio index 2ed6659..21d2ee1 100755 --- a/_desktop/_scripts/selector-audio +++ b/_desktop/_scripts/selector-audio @@ -3,7 +3,7 @@ div="---" set_output() { - sel_sink=$(printf "$sinks\\n$div\\nback\\n$div\\nexit" | rofi -dmenu -i -p "select output device") + sel_sink=$(printf "$sinks\\n$div\\nback\\n$div\\nexit" | dmenu -l 20 -c -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" | rofi -dmenu -i -p "select input device") + sel_source=$(printf "$sources\\n$div\\nbluetooth profile\\n$div\\nback\\n$div\\nexit" | dmenu -l 20 -c -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" | rofi -dmenu -i -p "select bluettoth profile") + profile_chosen=$(printf "profile mSBC\\nprofile LDAC\\n$div\\nback\\nexit" | dmenu -l 20 -c -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" | rofi -dmenu -i -p "current audio devices") + chosen=$(printf "output: $def_snk\\ninput: $def_src" | dmenu -l 20 -c -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/_desktop/_scripts/selector-bluetooth b/_desktop/_scripts/selector-bluetooth index 8aa1e96..b173381 100755 --- a/_desktop/_scripts/selector-bluetooth +++ b/_desktop/_scripts/selector-bluetooth @@ -287,7 +287,7 @@ show_menu() { } # command to pipe into, can add any options here -rofi_command="rofi -dmenu -i -p" +rofi_command="dmenu -l 10 -c -i -p" case "$1" in --status) diff --git a/_desktop/_scripts/selector-chars b/_desktop/_scripts/selector-chars index 7a1bdce..d93cf3d 100755 --- a/_desktop/_scripts/selector-chars +++ b/_desktop/_scripts/selector-chars @@ -1,6 +1,6 @@ #!/bin/sh -chosen=$(cut -d ';' -f1 $XDG_CONFIG_HOME/qtile/chars/* | rofi -dmenu -i -p "select character to copy" | sed "s/ .*//") +chosen=$(cut -d ';' -f1 $XDG_CONFIG_HOME/qtile/chars/* | dmenu -l 20 -i -p "select character to copy" | sed "s/ .*//") [ -z "$chosen" ] && exit if [ -n "$1" ]; then diff --git a/_desktop/autorandr/home-dp0/config b/_desktop/autorandr/home-dp0/config new file mode 100644 index 0000000..624f2b0 --- /dev/null +++ b/_desktop/autorandr/home-dp0/config @@ -0,0 +1,20 @@ +output HDMI-A-0 +off +output DisplayPort-1 +off +output eDP +off +output DisplayPort-0 +crtc 1 +filter bilinear +mode 3840x2160 +pos 0x0 +rate 60.00 +transform 0.699997,0.000000,0.000000,0.000000,0.699997,0.000000,0.000000,0.000000,1.000000 +x-prop-max_bpc 8 +x-prop-non_desktop 0 +x-prop-scaling_mode None +x-prop-tearfree on +x-prop-underscan off +x-prop-underscan_hborder 0 +x-prop-underscan_vborder 0 diff --git a/_desktop/autorandr/home-dp0/setup b/_desktop/autorandr/home-dp0/setup new file mode 100644 index 0000000..f8fca52 --- /dev/null +++ b/_desktop/autorandr/home-dp0/setup @@ -0,0 +1,2 @@ +DisplayPort-0 00ffffffffffff001e6d0777dadb04000c1d0104b53c22789e3e31ae5047ac270c50542108007140818081c0a9c0d1c08100010101014dd000a0f0703e803020650c58542100001a286800a0f0703e800890650c58542100001a000000fd00383d1e8738000a202020202020000000fc004c472048445220344b0a20202001aa0203197144900403012309070783010000e305c000e3060501023a801871382d40582c450058542100001e565e00a0a0a029503020350058542100001a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000029 +eDP 00ffffffffffff0006af3d5700000000001c0104a51f1178022285a5544d9a270e505400000001010101010101010101010101010101b43780a070383e401010350035ae100000180000000f0000000000000000000000000020000000fe0041554f0a202020202020202020000000fe004231343048414e30352e37200a0070 diff --git a/_desktop/autorandr/home-dp1/config b/_desktop/autorandr/home-dp1/config new file mode 100644 index 0000000..3f84c70 --- /dev/null +++ b/_desktop/autorandr/home-dp1/config @@ -0,0 +1,20 @@ +output HDMI-A-0 +off +output DisplayPort-0 +off +output eDP +off +output DisplayPort-1 +crtc 1 +filter bilinear +mode 3840x2160 +pos 0x0 +rate 60.00 +transform 0.699997,0.000000,0.000000,0.000000,0.699997,0.000000,0.000000,0.000000,1.000000 +x-prop-max_bpc 8 +x-prop-non_desktop 0 +x-prop-scaling_mode None +x-prop-tearfree on +x-prop-underscan off +x-prop-underscan_hborder 0 +x-prop-underscan_vborder 0 diff --git a/_desktop/autorandr/home-dp1/setup b/_desktop/autorandr/home-dp1/setup new file mode 100644 index 0000000..bdc2ae5 --- /dev/null +++ b/_desktop/autorandr/home-dp1/setup @@ -0,0 +1,2 @@ +DisplayPort-1 00ffffffffffff001e6d0777dadb04000c1d0104b53c22789e3e31ae5047ac270c50542108007140818081c0a9c0d1c08100010101014dd000a0f0703e803020650c58542100001a286800a0f0703e800890650c58542100001a000000fd00383d1e8738000a202020202020000000fc004c472048445220344b0a20202001aa0203197144900403012309070783010000e305c000e3060501023a801871382d40582c450058542100001e565e00a0a0a029503020350058542100001a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000029 +eDP 00ffffffffffff0006af3d5700000000001c0104a51f1178022285a5544d9a270e505400000001010101010101010101010101010101b43780a070383e401010350035ae100000180000000f0000000000000000000000000020000000fe0041554f0a202020202020202020000000fe004231343048414e30352e37200a0070 diff --git a/_desktop/autorandr/nomad/config b/_desktop/autorandr/nomad/config new file mode 100644 index 0000000..17dff9d --- /dev/null +++ b/_desktop/autorandr/nomad/config @@ -0,0 +1,20 @@ +output HDMI-A-0 +off +output DisplayPort-0 +off +output DisplayPort-1 +off +output eDP +crtc 0 +gamma 1.0:0.833:0.714 +mode 1920x1080 +pos 0x0 +primary +rate 60.03 +x-prop-max_bpc 8 +x-prop-non_desktop 0 +x-prop-scaling_mode None +x-prop-tearfree on +x-prop-underscan off +x-prop-underscan_hborder 0 +x-prop-underscan_vborder 0 diff --git a/_desktop/autorandr/nomad/setup b/_desktop/autorandr/nomad/setup new file mode 100644 index 0000000..ff6927c --- /dev/null +++ b/_desktop/autorandr/nomad/setup @@ -0,0 +1 @@ +eDP 00ffffffffffff0006af3d5700000000001c0104a51f1178022285a5544d9a270e505400000001010101010101010101010101010101b43780a070383e401010350035ae100000180000000f0000000000000000000000000020000000fe0041554f0a202020202020202020000000fe004231343048414e30352e37200a0070 diff --git a/_unused/clipit/clipitrc b/_desktop/clipit/clipitrc similarity index 100% rename from _unused/clipit/clipitrc rename to _desktop/clipit/clipitrc diff --git a/_desktop/install-desktop.sh b/_desktop/install-desktop.sh index e24a17e..80bc73b 100644 --- a/_desktop/install-desktop.sh +++ b/_desktop/install-desktop.sh @@ -4,7 +4,7 @@ mkdir -p ~/.config ~/.local/bin # link config -for i in foot gammastep gtk-3.0 kanshi neofetch qtile rofi zathura; do +for i in autorandr clipit gammastep gtk-3.0 neofetch qtile xinitrc zathura; do rm -rf ~/.config/${i} ln -sf $(pwd)/${i} ~/.config done diff --git a/_desktop/qtile/config.py b/_desktop/qtile/config.py index 8759bde..05c2adc 100644 --- a/_desktop/qtile/config.py +++ b/_desktop/qtile/config.py @@ -1,16 +1,8 @@ import os import subprocess -from libqtile import bar, extension, hook, layout +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 -from qtile_extras import widget - -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(): @@ -20,8 +12,8 @@ def autostart(): mod = "mod4" groups = [ Group("1", label="\uf292"), - Group("2", label="\uf738"), - Group("3", label="\uf70d", matches=[Match(wm_class=["ferdium", "discord", "Signal"])]), + Group("2", label="\uf738", matches=[Match(wm_class=["firefox"])]), + 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"), @@ -53,14 +45,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("footclient")), + Key([mod], "Return", lazy.spawn("sh -c 'BROWSER=firefox-bin st'")), Key([mod], "space", lazy.spawncmd()), Key([mod], "a", lazy.spawn("authenticator")), Key([mod], "e", lazy.spawn("selector-chars")), - 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], "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-bin 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, "control"], "a", lazy.spawn("selector-audio")), Key([mod, "control"], "b", lazy.spawn("selector-bluetooth")), # WM control @@ -173,9 +165,7 @@ screens = [ widget.Clock( format='[%d] %H:%M:%S', ), - widget.StatusNotifier( - icon_size=18, - ), + widget.Systray(), ], 24, margin=[5, 5, 0, 5] @@ -195,13 +185,6 @@ floating_layout = layout.Floating( float_rules=[ *layout.Floating.default_float_rules, Match(wm_class='authenticator'), - 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/_desktop/xinitrc b/_desktop/xinitrc new file mode 100644 index 0000000..d586b32 --- /dev/null +++ b/_desktop/xinitrc @@ -0,0 +1 @@ +exec dbus-launch --sh-syntax --exit-with-session qtile start diff --git a/_desktop/foot/foot.ini b/_unused/_wayland/foot/foot.ini similarity index 100% rename from _desktop/foot/foot.ini rename to _unused/_wayland/foot/foot.ini diff --git a/_desktop/kanshi/config b/_unused/_wayland/kanshi/config similarity index 100% rename from _desktop/kanshi/config rename to _unused/_wayland/kanshi/config diff --git a/_desktop/rofi/config.rasi b/_unused/_wayland/rofi/config.rasi similarity index 100% rename from _desktop/rofi/config.rasi rename to _unused/_wayland/rofi/config.rasi diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index fef4b38..be018e3 100644 --- a/zsh/aliases.zsh +++ b/zsh/aliases.zsh @@ -1,6 +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' [ $(command -v bat) ] && alias cat='bat -pp --color=always --tabs=2 --theme=Monokai\ Extended\ Bright' if [ $(command -v exa) ]; then diff --git a/zsh/cleanhome.zsh b/zsh/cleanhome.zsh index 18a439b..8f9df38 100644 --- a/zsh/cleanhome.zsh +++ b/zsh/cleanhome.zsh @@ -1,3 +1,4 @@ -#export GNUPGHOME="$XDG_DATA_HOME/gnupg" +export GNUPGHOME="$XDG_DATA_HOME/gnupg" export LESSHISTFILE='/dev/null' +export XAUTHORITY="$XDG_CACHE_HOME/Xauthority" mkdir -p ~/.local/share/tig