From f539c44594508a1525183ebad24b372560f950db Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Thu, 10 Mar 2022 20:23:51 +0100 Subject: [PATCH] dunst,task,zathura: Fix styler uncommitted changes Prepared dunst config for using the newly introduced (v1.8.0) drop-in configuration files. This allows spreading out dunst configuration over arbitrary files in the `dunstrc.d/` folder in the usual configuration folder. Will be perfect for less intrusive `styler` changes. Added icons to be displayed on dunst notifications if there are any. Also prepared zathura configuration in a similar way, with the configuration file containing an include directive for a colorscheme file. Lastly, moved taskwarrior theme options into their own file and included them with an include directive. Here, the file itself needs to be committed as well since taskwarrior will complain about missing file being included otherwise. However, we simply ignore the file in git after force-including it and no changes will be tracked. This means that from now on, styler theme changes should not show up as uncommitted changes in the repository anymore for currently active programs. Fixes #6. --- dunst/.config/dunst/dunstrc | 23 ++--------------------- taskwarrior/.config/task/colorscheme | 19 +++++++++++++++++++ taskwarrior/.config/task/taskrc | 18 +++--------------- zathura/.config/zathura/zathurarc | 4 ++-- 4 files changed, 26 insertions(+), 38 deletions(-) create mode 100644 taskwarrior/.config/task/colorscheme diff --git a/dunst/.config/dunst/dunstrc b/dunst/.config/dunst/dunstrc index 447448f..fac271d 100644 --- a/dunst/.config/dunst/dunstrc +++ b/dunst/.config/dunst/dunstrc @@ -160,10 +160,10 @@ ### Icons ### # Align icons left/right/off - icon_position = off + icon_position = left # Scale larger icons down to this size, set to 0 to disable - max_icon_size = 32 + max_icon_size = 128 # Paths to default icons. icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/ @@ -415,22 +415,3 @@ # set_stack_tag = "volume" # # vim: ft=cfg -# Base16 bespin - dunst color config -frame_color = "#8a8986" -separator_color = "#8a8986" - -[base16_low] - msg_urgency = low - background = "#36312e" - foreground = "#666666" - -[base16_normal] - msg_urgency = normal - background = "#5e5d5c" - foreground = "#8a8986" - -[base16_critical] - msg_urgency = critical - background = "#cf6a4c" - foreground = "#9d9b97" -# Base16End bespin - dunst color config diff --git a/taskwarrior/.config/task/colorscheme b/taskwarrior/.config/task/colorscheme new file mode 100644 index 0000000..634e976 --- /dev/null +++ b/taskwarrior/.config/task/colorscheme @@ -0,0 +1,19 @@ +# Themes are in this file so it can be ignored by +# git and theme changes don't show up as committable +# edits. + +# Color theme (uncomment one to use) +#include /usr/share/doc/task/rc/light-16.theme +#include /usr/share/doc/task/rc/light-256.theme +#include /usr/share/doc/task/rc/dark-16.theme +#include /usr/share/doc/task/rc/dark-256.theme +#include /usr/share/doc/task/rc/dark-red-256.theme +#include /usr/share/doc/task/rc/dark-green-256.theme +#include /usr/share/doc/task/rc/dark-blue-256.theme +#include /usr/share/doc/task/rc/dark-violets-256.theme +#include /usr/share/doc/task/rc/dark-yellow-green.theme +#include /usr/share/doc/task/rc/dark-gray-256.theme +#include /usr/share/doc/task/rc/dark-gray-blue-256.theme +include /usr/share/doc/task/rc/solarized-dark-256.theme +#include /usr/share/doc/task/rc/solarized-light-256.theme +#include /usr/share/doc/task/rc/no-color.theme diff --git a/taskwarrior/.config/task/taskrc b/taskwarrior/.config/task/taskrc index 0b5148e..1077e86 100644 --- a/taskwarrior/.config/task/taskrc +++ b/taskwarrior/.config/task/taskrc @@ -62,21 +62,9 @@ urgency.user.tag.next.coefficient=5.0 # Holidays for calendar include /usr/share/doc/task/rc/holidays.de-DE.rc -# Color theme (uncomment one to use) -include /usr/share/doc/task/rc/light-16.theme -#include /usr/share/doc/task/rc/light-256.theme -#include /usr/share/doc/task/rc/dark-16.theme -#include /usr/share/doc/task/rc/dark-256.theme -#include /usr/share/doc/task/rc/dark-red-256.theme -#include /usr/share/doc/task/rc/dark-green-256.theme -#include /usr/share/doc/task/rc/dark-blue-256.theme -#include /usr/share/doc/task/rc/dark-violets-256.theme -#include /usr/share/doc/task/rc/dark-yellow-green.theme -#include /usr/share/doc/task/rc/dark-gray-256.theme -#include /usr/share/doc/task/rc/dark-gray-blue-256.theme -#include /usr/share/doc/task/rc/solarized-dark-256.theme -#include /usr/share/doc/task/rc/solarized-light-256.theme -#include /usr/share/doc/task/rc/no-color.theme + +# Themes are in additional file +include colorscheme # Taskserver sync settings include task-sync.rc diff --git a/zathura/.config/zathura/zathurarc b/zathura/.config/zathura/zathurarc index a7183e5..45fc1c7 100644 --- a/zathura/.config/zathura/zathurarc +++ b/zathura/.config/zathura/zathurarc @@ -1,8 +1,8 @@ - - set recolor "true" set selection-clipboard "clipboard" map r reload map R rotate map p print + +include colorscheme