resolve conflicts

diff --git a/dot-config/flavours/config.toml b/dot-config/flavours/config.toml
index 9957bde31cf1161ef16b02237b37a48c4f72cac2..a836a50bda347a3314e4fa9f4e4cda02404bed94 100644 (file)
--- 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 fe131e01788f5d2520de61291493b8838f47533d..bc20b19a6179e95572dd73ea56c0fe72e71e3b9c 100644 (file)
--- 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 ba85960c7928eb4fec0ed32d389eff130f42aa38..8784ea17150d31313bfd558c948b8a496d0408a4 100644 (file)
--- 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