From ccca5723d042cd0eef0991fb9639d4a751fd450d Mon Sep 17 00:00:00 2001
From: Andre Ramnitz <tux.rising@gmail.com>
Date: Fri, 14 Feb 2025 23:20:04 +0100
Subject: [PATCH] resolve conflicts

---
 dot-config/flavours/config.toml | 7 +++++++
 dot-config/foot/foot.ini        | 6 ++----
 dot-config/kglobalshortcutsrc   | 4 ++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/dot-config/flavours/config.toml b/dot-config/flavours/config.toml
index 9957bde3..a836a50b 100644
--- a/dot-config/flavours/config.toml
+++ b/dot-config/flavours/config.toml
@@ -51,6 +51,13 @@ file = "~/.local/share/color-schemes/base16.colors"
 rewrite = true
 hook = "plasma-apply-colorscheme Oxygen && plasma-apply-colorscheme base16"
 
+[[item]]
+template = "konsole"
+subtemplate = "default"
+file = "~/.local/share/konsole/base16.colorscheme"
+rewrite = true
+# hook = "plasma-apply-colorscheme Oxygen && plasma-apply-colorscheme base16"
+
 [[item]]
 template = "kakoune"
 subtemplate = "dabruin-alpha"
diff --git a/dot-config/foot/foot.ini b/dot-config/foot/foot.ini
index fe131e01..bc20b19a 100644
--- a/dot-config/foot/foot.ini
+++ b/dot-config/foot/foot.ini
@@ -15,10 +15,8 @@ shell=/bin/fish
 # font-italic=<italic variant of regular font>
 # font-bold-italic=<bold+italic variant of regular font>
 # font-size-adjustment=0.5
-font=IosevkaTerm Nerd Font Mono:size=12:weight=Normal
-font-bold=IosevkaTerm Nerd Font Mono:size=12:weight=Bold
-# font-italic=IosevkaTerm NFM:size=12:style=italic:weight=200
-# font-bold-italic=IosevkaTerm NFM:size=12:slant=italic:weight=500
+font=IosevkaTerm Nerd Font Mono:size=12
+# font-bold=IosevkaTerm Nerd Font Mono:size=12:weight=Bold
 # line-height=<font metrics>
 # letter-spacing=0
 # horizontal-letter-offset=0
diff --git a/dot-config/kglobalshortcutsrc b/dot-config/kglobalshortcutsrc
index ba85960c..8784ea17 100644
--- a/dot-config/kglobalshortcutsrc
+++ b/dot-config/kglobalshortcutsrc
@@ -357,3 +357,7 @@ Toggle screen map selection=Meta+Ctrl+M,Meta+Ctrl+M,Zwischen allen Bildschirmen
 Toggle stylus mode=none,Meta+Ctrl+S,Funktionsweise des Stift-Werkzeugs zwischen relativ/absolut umschalten
 Toggle touch tool=Meta+Ctrl+T,Meta+Ctrl+T,Touch-Werkzeug aktivieren/deaktivieren
 _k_friendly_name=Wacom-Tablett
+
+[yakuake]
+_k_friendly_name=Yakuake
+toggle-window-state=F12,F12,Yakuake einfahren/ausfahren
-- 
2.51.2