merge: main

2023-03-30 00:20:57 +02:00 · 2023-03-30 00:20:57 +02:00 · ebd3949c39
commit ebd3949c39
parent 832c0093d7 8dbdad9514
2 changed files with 7 additions and 6 deletions
--- a/.config/wallpapers/monerochan.png
+++ b/.config/wallpapers/monerochan.png
--- a/.xinitrc
+++ b/.xinitrc
@ -4,18 +4,19 @@
 numlockx

 # display
+<<<<<<< HEAD
 xrandr \
    --output HDMI1 --auto --primary
-feh --bg-tile "$XDG_CONFIG_HOME/wallpapers/landscape.png" --no-fehbg
+feh --bg-fill "$XDG_CONFIG_HOME/wallpapers/monerochan.png" --no-fehbg

 # startup
-/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1      & # arch
+/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1       & # arch
 #/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 & # debian
 #/usr/libexec/polkit-gnome-authentication-agent-1               & # fedora
-picom                                                          &
-redshift                                                       &
-dunst                                                          &
-sbar                                                           &
+picom                                                           &
+redshift                                                        &
+dunst                                                           &
+sbar                                                            &

 xset dpms 300 # lock 5m
 xss-lock -- lock &