updated gitconfig

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

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

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