diff --git a/.local/share/kaomoji b/.local/share/kaomoji index 6c8d1d3..b03258a 100644 --- a/.local/share/kaomoji +++ b/.local/share/kaomoji @@ -451,3 +451,4 @@ o(>< )o⌒* Mad (3) (；^＿^)ッ☆(　゜o゜) Slapping ＼（～Ｏ～）／ Good Morning \＿(´▽｀)♪＿/ Bathtub +( • )( • )ԅ(≖‿≖ԅ) BOOB diff --git a/Xdefaults b/Xdefaults index 88728cb..9abab04 100644 --- a/Xdefaults +++ b/Xdefaults @@ -1,5 +1,8 @@ #define FG #fefefe #define BG #191919 +#define font1 xft:mononoki:minispace=False:size=10:antialias=true +#define font2 xft:MesloLGM Nerd Font Mono:minispace=False:size=10 +#define font3 xft:Noto Sans Mono CJK TC:minispace=False:size=10 *.foreground: FG URxvt.background: BG URxvt.borderColor: BG @@ -40,10 +43,10 @@ URxvt.borderColor: BG ! Set depth to make transparency work. URxvt*depth: 32 -URxvt.font: xft:mononoki:minispace=False:size=10:antialias=true,xft:MesloLGM Nerd Font:minispace=False:size=10,Noto Sans Mono CJK TC:minispace=False:size=10 -URxvt.boldFont: xft:mononoki:minispace=False:style=bold:size=10,xft:MesloLGM Nerd Font:minispace=False:size=10,Noto Sans Mono CJK TC:minispace=False:size=10 -URxvt.italicFont: xft:mononoki:minispace=False:style=italic:size=10 -URxvt.boldItalicfont: xft:mononoki:minispace=False:style=bolditalic:size=10 +URxvt.font: font1,font2,font3 +URxvt.boldFont: font1:style=bold,font2:style=bold,font3:style=bold +URxvt.italicFont:font1:style=italic,font2:style=italic,font3:style=italic +URxvt.boldItalicfont: font1:style=bolditalic,font2:style=bolditalic,font3:style=bolditalic URxvt.letterSpace: 0 URxvt.lineSpace: -4 @@ -69,7 +72,8 @@ Xft.rgba: rgb Xft.hinting: true Xft.hintstyle: hintfull -URxvt.perl-ext-common: default,matcher,font-size,config-reload +URxvt.perl-ext-common: resize-font + URxvt.url-launcher: /usr/bin/xdg-open URxvt.matcher.button: 1 diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc index a9f1bb8..ccd9cc1 100755 --- a/config/bspwm/bspwmrc +++ b/config/bspwm/bspwmrc @@ -10,6 +10,7 @@ xsetroot -cursor_name left_ptr & xrdb ~/.Xdefaults pgrep -x sxhkd > /dev/null || sxhkd & +pgrep -x picom > /dev/null || picom & pgrep -x xss-lock > /dev/null || xss-lock slock & pgrep -x bg.sh > /dev/null || $HOME/.scripts/bg.sh > /dev/null & diff --git a/config/cava/config b/config/cava/config index 9f8e2b8..2ddd926 100644 --- a/config/cava/config +++ b/config/cava/config @@ -58,8 +58,8 @@ # For shmem 'source' will be /squeezelite-AA:BB:CC:DD:EE:FF where 'AA:BB:CC:DD:EE:FF' will be squeezelite's MAC address ; source = auto -; method = alsa -; source = hw:Loopback,1 +method = alsa + source = hw:Loopback,1 ; method = fifo ; source = /tmp/mpd.fifo diff --git a/config/gtk-3.0/bookmarks b/config/gtk-3.0/bookmarks index d741357..3bdccb3 100644 --- a/config/gtk-3.0/bookmarks +++ b/config/gtk-3.0/bookmarks @@ -1,3 +1,4 @@ +file:///home/x/pics/screenshot file:///home/david/hd1/important file:///home/david/docs docs file:///home/david/pics pics diff --git a/config/mpd/mpd.conf b/config/mpd/mpd.conf index 679ebd1..b086d5e 100644 --- a/config/mpd/mpd.conf +++ b/config/mpd/mpd.conf @@ -13,14 +13,6 @@ audio_output { max_clients "0" } -audio_output { - type "httpd" - name "HQ HTTP Stream" - encoder "wave" # optional, vorbis or lame - port "6681" - max_clients "0" -} - audio_output { type "pulse" name "mpd" diff --git a/config/polybar/config b/config/polybar/config index ec82e1e..6267651 100644 --- a/config/polybar/config +++ b/config/polybar/config @@ -43,7 +43,7 @@ inherit = bar/base width = 100% offset-x = 0 modules-left = workspaces xwindow -modules-right = mpd temperature memory wlan battery pulseaudio microphone time +modules-right = mpd temperature memory network battery pulseaudio microphone time tray-position = right background = ${color.bga} border-size = 0 diff --git a/config/rofi/colors-rofi-dark.rasi b/config/rofi/colors-rofi-dark.rasi index 0be691d..180889d 100644 --- a/config/rofi/colors-rofi-dark.rasi +++ b/config/rofi/colors-rofi-dark.rasi @@ -21,6 +21,7 @@ selected-urgent-foreground: @background2; text-color: @foreground; + border-color: @foreground; background-color: #00000000; background: #191919; diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc index 17067d0..751e118 100644 --- a/config/sxhkd/sxhkdrc +++ b/config/sxhkd/sxhkdrc @@ -17,6 +17,14 @@ super + ctrl + alt + f {XF86AudioMute} amixer -D pulse set Master 1+ toggle +{_, super} + XF86MonBrightnessDown + xbacklight - {10,1} +{_, super} + XF86MonBrightnessUp + xbacklight + {10,1} + + + + super + r rofi -show drun -show-icons diff --git a/deploy.sh b/deploy.sh index d7072b1..1d80f9d 100755 --- a/deploy.sh +++ b/deploy.sh @@ -81,6 +81,10 @@ load () { cp -r icons/* $HOME/.local/share/icons/ cp .local/share/kaomoji ~/.local/share/ + git clone https://github.com/simmel/urxvt-resize-font /tmp/urxvt-resize-font + mkdir -p ~/.urxvt/ext/ + cp /tmp/urxvt-resize-font/resize-font ~/.urxvt/ext/ + echo "Copied configurations!" else diff --git a/mkshrc b/mkshrc index c7ddf96..641c376 100644 --- a/mkshrc +++ b/mkshrc @@ -50,8 +50,6 @@ function parse_git_dirty { [ ! "${bits}" == "" ] && echo " ${bits}" || echo "" } -#set -o vi - bind '^L=clear-screen' export PS1=$(echo -e "\e[0;97m\${PWD/#\$HOME/\~}\e[0;37m\`parse_git_branch\` > \e[0;0m") diff --git a/profile b/profile index f1a814d..2fa45f7 100644 --- a/profile +++ b/profile @@ -5,10 +5,11 @@ [ -d "$HOME/.local/bin" ] && PATH="$HOME/.local/bin:$PATH" [ -d "$HOME/.scripts" ] && PATH="$HOME/.scripts:$PATH" +export XDG_RUNTIME_DIR=/tmp/$USER-$(uuidgen) alias editor=vim export TERMINAL="urxvt" -export BROWSER="/usr/bin/firefox" +export BROWSER="/usr/bin/chromium-browser" export FILE_MANAGER="/usr/bin/thunar" export EMAIL_CLIENT="/usr/bin/thunderbird" export EDITOR="/usr/bin/vim" diff --git a/scripts/battery_level b/scripts/battery_level new file mode 100755 index 0000000..7bc27d1 --- /dev/null +++ b/scripts/battery_level @@ -0,0 +1,4 @@ +#!/bin/sh +full=$(cat /sys/class/power_supply/BAT0/charge_now) +now=$(cat /sys/class/power_supply/BAT0/charge_full) +echo $full / $now \* 100 | bc -l diff --git a/scripts/fzf_menu.sh b/scripts/fzf_menu.sh index 8f6238f..3aecaf7 100755 --- a/scripts/fzf_menu.sh +++ b/scripts/fzf_menu.sh @@ -1,3 +1,3 @@ #!/bin/sh -file=$(fzf $@) +file="$(fzf $@)" xdg-open $file & diff --git a/scripts/tablet b/scripts/tablet index 8190919..f283635 100755 --- a/scripts/tablet +++ b/scripts/tablet @@ -20,21 +20,19 @@ tablet_ratio = (lambda s: float(s[0]) / float(s[1]))(sys.argv[4].split(":")) if screens = [ (0, 0, 1920, 1080), - (0, 1080, 1920, 1080), - (1920, 1080, 2560, 1440), ] #TODO find this with xrandr -target = screens[2] +target = screens[0] #Physical offset of the selected screen offsetx = target[0] offsety = target[1] #Size of the full screen areas -sh = 1080+ 1440 -sw = 1920 + 2560 +sh = 1080 +sw = 1920 #TODO calculate using list of screens #Aspect ratio of the tablet, to avoid weird scaling problems diff --git a/sh_aliases b/sh_aliases index f8a70ed..52c54b0 100644 --- a/sh_aliases +++ b/sh_aliases @@ -16,7 +16,7 @@ alias settabletscale="tablet 18 155 2 4:3" alias gosumemory-default="sudo /home/david/.local/share/gosumemory/gosumemory -path /home/david/.local/share/osu-wine/OSU/Songs" -alias yta="yt-dlp --no-mtime --add-metadata --no-check-certificate -x -f bestaudio/best" +alias yta="yt-dlp --no-mtime --add-metadata --no-check-certificate --embed-thumbnail -x -f bestaudio/best" alias suspend="i3lock-fancy -p -t ''; systemctl suspend"