From 03491fdd3d63b97f74b60aab3bab34817061cb9d Mon Sep 17 00:00:00 2001 From: TolaMironcenko Date: Mon, 24 Feb 2025 15:14:58 +0700 Subject: [PATCH] added git log with graph --- gitconfig | 3 +++ hypr/hyprlock.conf | 2 +- hypr/monitors.conf | 1 + shell/source.sh | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gitconfig b/gitconfig index 33813a5..adc08fd 100644 --- a/gitconfig +++ b/gitconfig @@ -13,6 +13,9 @@ s = status ps = push pl = pull + lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(auto)%d%C(reset)' --all + lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(auto)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' + lg = lg2 [core] pager = delta [interactive] diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf index a9f1981..62cd4f0 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/aesthetic_deer.png + path = /home/tola/Pictures/wallpaper/chad_a53fb74bb09b44f5a15cdf00f554ea81.png color = rgba(25, 20, 20, 1.0) # color blur_passes = 4 # 0 disables blurring blur_size = 2 # blur size diff --git a/hypr/monitors.conf b/hypr/monitors.conf index 9a767d3..c87e6f3 100644 --- a/hypr/monitors.conf +++ b/hypr/monitors.conf @@ -2,5 +2,6 @@ monitor=,preferred,auto,auto # for all monitor to autodetect monitor=DVI-I-1,1920x1200,0x0,1 # for lisa's home viewsonic monitor monitor=HEADLESS-2,2048x1538,0x0,2 # for headless virtual monitor +monitor=vnc,1280x720,0x0,1 #------------------------------------------------------------------------------ diff --git a/shell/source.sh b/shell/source.sh index ca21bed..71a30ea 100644 --- a/shell/source.sh +++ b/shell/source.sh @@ -63,6 +63,8 @@ alias gf='git fetch' # fetch from remote repos alias ghh='git help' # help alias glgg='git log --graph' # log with graph alias glg='git log --stat' # log with stat +alias glg1='git lg1' # log with graph +alias glg2='git lg2' # log with graph alias gm='git merge' # merge branches alias gl='git pull' # pull from upstream repository alias gpr='git pull --rebase' # pull from upstream repository and rebase local changes