diff --git a/dwm/dwm/drw.o b/dwm/dwm/drw.o index 18d23e9..249df4c 100644 Binary files a/dwm/dwm/drw.o and b/dwm/dwm/drw.o differ diff --git a/dwm/dwm/dwm b/dwm/dwm/dwm index e5992c1..a0f081f 100755 Binary files a/dwm/dwm/dwm and b/dwm/dwm/dwm differ diff --git a/dwm/dwm/dwm.o b/dwm/dwm/dwm.o index 7ef06b1..074a893 100644 Binary files a/dwm/dwm/dwm.o and b/dwm/dwm/dwm.o differ diff --git a/dwm/dwm/util.o b/dwm/dwm/util.o index 804cda6..26ab857 100644 Binary files a/dwm/dwm/util.o and b/dwm/dwm/util.o differ diff --git a/dwm/st/st b/dwm/st/st index 2a9e424..9d1f48f 100755 Binary files a/dwm/st/st and b/dwm/st/st differ diff --git a/dwm/st/st.o b/dwm/st/st.o index e600250..ea2ad5e 100644 Binary files a/dwm/st/st.o and b/dwm/st/st.o differ diff --git a/dwm/st/x.o b/dwm/st/x.o index 7130193..d51d775 100644 Binary files a/dwm/st/x.o and b/dwm/st/x.o differ diff --git a/dwm/startdwm.sh b/dwm/startdwm.sh index bf6afc8..c4e3d80 100755 --- a/dwm/startdwm.sh +++ b/dwm/startdwm.sh @@ -1,15 +1,15 @@ #!/bin/sh -export GTK_THEME=Adwaita:dark +#export GTK_THEME=Adwaita:dark setxkbmap "us,ru" -option 'grp:win_space_toggle' -~/dotfiles/dwm/background.sh & +#~/dotfiles/dwm/background.sh & # dwmbar & # ~/dotfiles/dwm/bin/picom -~/dotfiles/dwm/bin/startslstatus & -dunst & -~/dotfiles/bin/dpmsdisablexorg +#~/dotfiles/dwm/bin/startslstatus & +#dunst & +#~/dotfiles/bin/dpmsdisablexorg -xrdb -merge ~/dotfiles/dwm/Xresources +#xrdb -merge ~/dotfiles/dwm/Xresources while true; do dwm 2> ~/.dwm.log diff --git a/gitconfig b/gitconfig index f5d329b..33813a5 100644 --- a/gitconfig +++ b/gitconfig @@ -13,3 +13,12 @@ s = status ps = push pl = pull +[core] + pager = delta +[interactive] + diffFilter = delta --color-only +[delta] + nevigate = true + dark = true +[merge] + conflictstyle = zdiff3 diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf index 5ceb80f..e705594 100644 --- a/hypr/hyprlock.conf +++ b/hypr/hyprlock.conf @@ -2,7 +2,7 @@ #---- backgroung configuration ---------------------------------------------------------------------------------------------------------------------- background { monitor = # show on all monitors - path = /home/tola/Pictures/wallpaper/river_to_castle_theme_blue.png + path = /home/tola/Pictures/wallpaper/highlands-grid.png color = rgba(25, 20, 20, 1.0) # color blur_passes = 4 # 0 disables blurring blur_size = 2 # blur size