From 262016d409368a56a5f65c2f9a4c7f3755ddf360 Mon Sep 17 00:00:00 2001
From: Snoweuph <snow+git@euph.email>
Date: Sat, 23 Nov 2024 17:09:49 +0100
Subject: [PATCH] Update Git Graph Models

---
 .config/.gitignore                     |  1 +
 .config/git-graph/models/git-flow.toml | 77 ++++++++++++++++++++++++++
 .config/git-graph/models/none.toml     | 24 ++++++++
 .config/git-graph/models/simple.toml   | 43 ++++++++++++++
 .config/git-graph/models/trunk.toml    | 33 +++++++++++
 .config/kglobalshortcutsrc             |  4 +-
 .gitconfig                             |  2 +-
 7 files changed, 181 insertions(+), 3 deletions(-)
 create mode 100644 .config/git-graph/models/git-flow.toml
 create mode 100644 .config/git-graph/models/none.toml
 create mode 100644 .config/git-graph/models/simple.toml
 create mode 100644 .config/git-graph/models/trunk.toml

diff --git a/.config/.gitignore b/.config/.gitignore
index 7429ace..d06b75a 100644
--- a/.config/.gitignore
+++ b/.config/.gitignore
@@ -18,6 +18,7 @@
 
 # git
 !/git/
+!/git-graph/
 
 # KDE
 !kglobalshortcutsrc
diff --git a/.config/git-graph/models/git-flow.toml b/.config/git-graph/models/git-flow.toml
new file mode 100644
index 0000000..3f45f65
--- /dev/null
+++ b/.config/git-graph/models/git-flow.toml
@@ -0,0 +1,77 @@
+persistence = [
+    '^(master|main)$',
+    '^(develop|dev)$',
+    '^feature.*$',
+    '^release.*$',
+    '^hotfix.*$',
+    '^bugfix.*$',
+]
+order = [
+    '^(master|main)$',
+    '^(hotfix|release).*$',
+    '^(develop|dev)$',
+]
+
+[terminal_colors]
+matches = [
+    [
+    '^(master|main)$',
+    ['bright_blue'],
+],
+    [
+    '^(develop|dev)$',
+    ['bright_yellow'],
+],
+    [
+    '^(feature|fork/).*$',
+    [
+    'bright_magenta',
+    'bright_cyan',
+],
+],
+    [
+    '^release.*$',
+    ['bright_green'],
+],
+    [
+    '^(bugfix|hotfix).*$',
+    ['bright_red'],
+],
+    [
+    '^tags/.*$',
+    ['bright_green'],
+],
+]
+unknown = ['white']
+
+[svg_colors]
+matches = [
+    [
+    '^(master|main)$',
+    ['blue'],
+],
+    [
+    '^(develop|dev)$',
+    ['orange'],
+],
+    [
+    '^(feature|fork/).*$',
+    [
+    'purple',
+    'turquoise',
+],
+],
+    [
+    '^release.*$',
+    ['green'],
+],
+    [
+    '^(bugfix|hotfix).*$',
+    ['red'],
+],
+    [
+    '^tags/.*$',
+    ['green'],
+],
+]
+unknown = ['gray']
diff --git a/.config/git-graph/models/none.toml b/.config/git-graph/models/none.toml
new file mode 100644
index 0000000..7bf5c01
--- /dev/null
+++ b/.config/git-graph/models/none.toml
@@ -0,0 +1,24 @@
+persistence = []
+order = []
+
+[terminal_colors]
+matches = []
+unknown = [
+    'bright_blue',
+    'bright_yellow',
+    'bright_green',
+    'bright_red',
+    'bright_magenta',
+    'bright_cyan',
+]
+
+[svg_colors]
+matches = []
+unknown = [
+    'blue',
+    'orange',
+    'green',
+    'red',
+    'purple',
+    'turquoise',
+]
diff --git a/.config/git-graph/models/simple.toml b/.config/git-graph/models/simple.toml
new file mode 100644
index 0000000..e7db8ad
--- /dev/null
+++ b/.config/git-graph/models/simple.toml
@@ -0,0 +1,43 @@
+persistence = ['^(master|main)$']
+order = [
+    '^tags/.*$',
+    '^(master|main)$',
+]
+
+[terminal_colors]
+matches = [
+    [
+    '^(master|main)$',
+    ['bright_blue'],
+],
+    [
+    '^tags/.*$',
+    ['bright_green'],
+],
+]
+unknown = [
+    'bright_yellow',
+    'bright_green',
+    'bright_red',
+    'bright_magenta',
+    'bright_cyan',
+]
+
+[svg_colors]
+matches = [
+    [
+    '^(master|main)$',
+    ['blue'],
+],
+    [
+    '^tags/.*$',
+    ['green'],
+],
+]
+unknown = [
+    'orange',
+    'green',
+    'red',
+    'purple',
+    'turquoise',
+]
diff --git a/.config/git-graph/models/trunk.toml b/.config/git-graph/models/trunk.toml
new file mode 100644
index 0000000..fa944d1
--- /dev/null
+++ b/.config/git-graph/models/trunk.toml
@@ -0,0 +1,33 @@
+persistence = [
+    '^(trunk)$',
+    '^story.*$',
+]
+order = [
+    '^trunk$',
+]
+
+[terminal_colors]
+matches = [
+    [
+    	'^trunk$',
+    	['bright_blue'],
+	],
+]
+unknown = [
+            'bright_yellow',
+            'bright_green',
+            'bright_red',
+            'bright_magenta',
+            'bright_cyan',
+]
+
+[svg_colors]
+matches = []
+unknown = [
+    'blue',
+    'orange',
+    'green',
+    'red',
+    'purple',
+    'turquoise',
+]
diff --git a/.config/kglobalshortcutsrc b/.config/kglobalshortcutsrc
index e657d4d..1561850 100644
--- a/.config/kglobalshortcutsrc
+++ b/.config/kglobalshortcutsrc
@@ -35,7 +35,7 @@ mute=Volume Mute,Volume Mute,Mute
 [ksmserver]
 Halt Without Confirmation=none,,Shut Down Without Confirmation
 Lock Session=Screensaver,Meta+L\tScreensaver,Lock Session
-Log Out=Ctrl+Alt+Del,Ctrl+Alt+Del,Show Logout Prompt
+Log Out=Ctrl+Alt+Del,Ctrl+Alt+Del,Show Logout Screen
 Log Out Without Confirmation=none,,Log Out Without Confirmation
 LogOut=none,,Log Out
 Reboot=none,,Reboot
@@ -299,7 +299,7 @@ PowerOff=Power Off,Power Off,Power Off
 Sleep=Sleep,Sleep,Suspend
 Toggle Keyboard Backlight=Keyboard Light On/Off,Keyboard Light On/Off,Toggle Keyboard Backlight
 Turn Off Screen=none,none,Turn Off Screen
-_k_friendly_name=KDE Power Management System
+_k_friendly_name=Power Management
 powerProfile=Battery\tMeta+B,Battery\tMeta+B,Switch Power Profile
 
 [plasmashell]
diff --git a/.gitconfig b/.gitconfig
index 7f06dbf..75df9b0 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -24,7 +24,7 @@
 	prunetags = true
 
 [alias]
-	adog ="!git-graph --model none --color=always | LESS='-R' less"
+    adog ="!git-graph --model=trunk --color=always | LESS='-R' less"
     fl = push --force-with-lease
     prune-branches = "!git fetch -p && git branch -vv | grep ': gone]' | awk '{print $1}' | xargs -r git branch -d"
     show-last-commit = diff HEAD^