diff options
Diffstat (limited to '')
| -rw-r--r-- | .config/x11/xinitrc | 46 | ||||
| -rw-r--r-- | .config/x11/xresources | 4 |
2 files changed, 14 insertions, 36 deletions
diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 0d3a577..81ab0e4 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -3,17 +3,13 @@ case $(hostname -s) in mother) icon=" " - mpd="mpd" - xscr="xscreensaver --no-splash" - sleep="sleep 1" + sleep="sleep 0.1" ping="ping -c1 -w1 9.9.9.9 >/dev/null 2>&1" host="mother" doas mkdir /var/run/jozan && doas chown -v jozan: /var/run/jozan ;; po-rbo) icon=" " - mpd="mpd" - xscr="xscreensaver" sleep="sleep 0.1" ping="ping -c1 -w1 9.9.9.9 >/dev/null 2>&1" host="po-rbo" @@ -21,8 +17,6 @@ case $(hostname -s) in ;; mars) icon=" " - mpd="musicpd" - xscr="xscreensaver --no-splash" sleep="gsleep 1" ping="ping -c1 -t1 9.9.9.9 >/dev/null 2>&1" host="mars" @@ -35,41 +29,31 @@ esac $ping && git --git-dir="$HOME"/docs/dotfiles-bsd --work-tree="$HOME" pull startif() { - pgrep "$(basename "$1")" >/dev/null || "$@" >/dev/null 2>&1 & + pidof "$(basename "$1")" >/dev/null || $@ >/dev/null 2>&1 & } dunst_shit() { sleep 1 - [ $host = "po-rbo" ] && startif /home/r_bousset/.nix-profile/bin/dunst || startif dunst + startif dunst sleep 2 - startif mpd-notification startif lowbat for pid in $(ps aux | grep local/bin/kb | awk '{print $2}'); do kill -9 $pid done - [ $host = "mother" ] && "$HOME"/.local/bin/setwp "$HOME"/pics/wp.png || "$HOME"/.local/bin/setwp "$HOME"/pics/wp/129.jpg + [ $host = "mother" ] && "$HOME"/.local/bin/setwp "$HOME"/pics/wp.png || "$HOME"/.local/bin/setwp "$HOME"/pics/wp/desert "$HOME"/.local/bin/kb & } start_apps() { - [ $host = "po-rbo" ] && /home/r_bousset/.local/bin/pipe CM_SELECTIONS=clipboard startif clipmenud startif copyq startif nextcloud - QT_SCALE_FACTOR=1.35 startif rclone-browser - startif nixGL teams-for-linux - startif thunderbird - startif firefox + startif ckb-next --background + # [ $host = "po-rbo" ] && QT_SCALE_FACTOR=1.35 startif rclone-browser } export LANG='en_US.UTF-8' -[ $host = "mother" ] && xrandr --output HDMI-0 --primary --mode 1920x1080 --pos 1440x0 --rotate normal \ - --output DP-0 --mode 1680x1050 --pos 3360x0 --rotate normal \ - --output DP-1 --off \ - --output DP-2 --off \ - --output DP-3 --off \ - --output DP-4 --mode 1440x900 --pos 0x0 --rotate normal \ - --output DP-5 --off +[ $host = "mother" ] && "$HOME"/.local/bin/scr2 [ $host = "po-rbo" ] && xrandr \ --output eDP-1 --mode 1920x1200 --pos 0x0 --rotate normal \ --output HDMI-1 --primary --mode 2560x1440 --pos 1920x0 --rotate normal \ @@ -78,14 +62,9 @@ export LANG='en_US.UTF-8' --output VIRTUAL-1 --off dunst_shit -startif picom -pgrep $mpd >/dev/null || $mpd >/dev/null 2>&1 +[ $host = "po-rbo" ] && startif picom xset s off xset -dpms -startif $xscr -# doas rc-service wireguard start && -# notify-send -u normal 'wireguard' 'WireGuard started' -# $sleep pkill wireplumber pkill pipewire-pulse pkill pipewire @@ -94,13 +73,12 @@ $sleep startif pipewire-pulse $sleep startif wireplumber -$sleep -startif nm-applet -$sleep -startif blueman-applet +startif picom +[ $host = "po-rbo" ] && startif nm-applet +[ $host = "po-rbo" ] && startif blueman-applet cd "$HOME" xrdb "$HOME"/.config/x11/xresources start_apps & -notify-send -u normal 'Welcome' "$icon Welcome back, partner!" +notify-send -u normal 'welcome' "$icon welcome back, partner!" [ $host = "po-rbo" ] && exec dbus-run-session dwm diff --git a/.config/x11/xresources b/.config/x11/xresources index 6db99f1..ef2cae9 100644 --- a/.config/x11/xresources +++ b/.config/x11/xresources @@ -5,10 +5,10 @@ Xft.rgba: rgb Xft.autohint: false Xft.hintstyle: hintslight Xft.lcdfilter: lcddefault -Xcursor.theme: Adwaita +Xcursor.theme: "Simp1e-Gruvbox-Dark" Xcursor.size: 18 Nsxiv.window.background: #1d2021 Nsxiv.window.foreground: #ebdbb2 -Nsxiv.bar.font: UbuntuMono Nerd Font-11 +Nsxiv.bar.font: BlexMono Nerd Font-11 Vncviewer.grabKeyboard: true Vncviewer.FullScreen: 1 |