mirror of
https://github.com/pjones/plasma-manager.git
synced 2024-09-11 15:56:02 +03:00
Add UI colorscheme options for kate and konsole (#186)
This commit is contained in:
blitter
GitHub
parent
123af32615
commit
aaaeedd10e
@ -112,32 +112,8 @@ in
|
||||
}
|
||||
];
|
||||
|
||||
config.programs.plasma.configFile."katerc" = lib.mkIf cfg.enable {
|
||||
"KTextEditor Document" = {
|
||||
"Auto Detect Indent" = cfg.editor.indent.autodetect;
|
||||
"Indentation Width" = cfg.editor.indent.width;
|
||||
"Tab Handling" = (tabHandlingMode cfg.editor.indent);
|
||||
"Tab Width" = cfg.editor.tabWidth;
|
||||
"Keep Extra Spaces" = cfg.editor.indent.keepExtraSpaces;
|
||||
"ReplaceTabsDyn" = cfg.editor.indent.replaceWithSpaces;
|
||||
};
|
||||
|
||||
"KTextEditor Renderer" = {
|
||||
"Show Indentation Lines" = cfg.editor.indent.showLines;
|
||||
|
||||
|
||||
# COLORTHEME (cannot define this below)
|
||||
# Do pick the theme if the user chose one,
|
||||
# Do not touch the theme settings otherwise
|
||||
"Auto Color Theme Selection" = lib.mkIf (cfg.editor.theme.name != "") false;
|
||||
"Color Theme" = lib.mkIf (cfg.editor.theme.name != "") cfg.editor.theme.name;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
# ==================================
|
||||
# COLORTHEME
|
||||
|
||||
options.programs.kate.editor.theme = {
|
||||
src = lib.mkOption {
|
||||
description = ''
|
||||
@ -193,7 +169,6 @@ in
|
||||
|
||||
# ==================================
|
||||
# LSP Servers
|
||||
|
||||
options.programs.kate.lsp.customServers = lib.mkOption {
|
||||
default = { };
|
||||
type = lib.types.attrs;
|
||||
@ -207,4 +182,41 @@ in
|
||||
config.xdg.configFile."kate/lspclient/settings.json" = {
|
||||
text = builtins.toJSON { servers = cfg.lsp.customServers; };
|
||||
};
|
||||
|
||||
# ==================================
|
||||
# UI
|
||||
options.programs.kate.ui.colorScheme = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = null;
|
||||
|
||||
example = "Krita dark orange";
|
||||
description = ''
|
||||
The colour scheme of the UI. Leave this setting at `null` in order to
|
||||
not override the systems default scheme for for this application.
|
||||
'';
|
||||
};
|
||||
|
||||
# ==================================
|
||||
# WRITING THE KATERC
|
||||
config.programs.plasma.configFile."katerc" = lib.mkIf cfg.enable {
|
||||
"KTextEditor Document" = {
|
||||
"Auto Detect Indent" = cfg.editor.indent.autodetect;
|
||||
"Indentation Width" = cfg.editor.indent.width;
|
||||
"Tab Handling" = (tabHandlingMode cfg.editor.indent);
|
||||
"Tab Width" = cfg.editor.tabWidth;
|
||||
"Keep Extra Spaces" = cfg.editor.indent.keepExtraSpaces;
|
||||
"ReplaceTabsDyn" = cfg.editor.indent.replaceWithSpaces;
|
||||
};
|
||||
|
||||
"KTextEditor Renderer" = {
|
||||
"Show Indentation Lines" = cfg.editor.indent.showLines;
|
||||
|
||||
# Do pick the theme if the user chose one,
|
||||
# Do not touch the theme settings otherwise
|
||||
"Auto Color Theme Selection" = lib.mkIf (cfg.editor.theme.name != "") false;
|
||||
"Color Theme" = lib.mkIf (cfg.editor.theme.name != "") cfg.editor.theme.name;
|
||||
};
|
||||
|
||||
"UiSettings"."ColorScheme".value = lib.mkIf (cfg.ui.colorScheme != null) cfg.ui.colorScheme;
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@ let
|
||||
# https://ryantm.github.io/nixpkgs/functions/library/attrsets/#function-library-lib.attrsets.mapAttrs-prime
|
||||
createColorSchemes = lib.attrsets.mapAttrs' (name: value: lib.attrsets.nameValuePair
|
||||
("konsole/${name}.colorscheme")
|
||||
( { enable = true; source = value; })
|
||||
({ enable = true; source = value; })
|
||||
);
|
||||
|
||||
cfg = config.programs.konsole;
|
||||
@ -103,13 +103,23 @@ in
|
||||
|
||||
customColorSchemes = lib.mkOption {
|
||||
type = with lib.types; attrsOf path;
|
||||
default = {};
|
||||
default = { };
|
||||
description = ''
|
||||
Custom color schemes to be added to the installation. The key is their name.
|
||||
Choose them in any profile with `profiles.<profile>.colorScheme = <name>`;
|
||||
'';
|
||||
};
|
||||
|
||||
ui.colorScheme = lib.mkOption {
|
||||
type = with lib.types; nullOr str;
|
||||
default = null;
|
||||
example = "Krita dark orange";
|
||||
description = ''
|
||||
The colour scheme of the UI. Leave this setting at `null` in order to
|
||||
not override the systems default scheme for for this application.
|
||||
'';
|
||||
};
|
||||
|
||||
extraConfig = lib.mkOption {
|
||||
type = with lib.types; nullOr (attrsOf (attrsOf (basicSettingsType)));
|
||||
default = null;
|
||||
@ -132,50 +142,58 @@ in
|
||||
(lib.mapAttrs (keyName: keyAttrs: { value = keyAttrs; }) groupAttrs))
|
||||
cfg.extraConfig)
|
||||
)
|
||||
{
|
||||
"UiSettings"."ColorScheme" = lib.mkIf (cfg.ui.colorScheme != null) {
|
||||
value = cfg.ui.colorScheme;
|
||||
# The key needs to be immutable to work properly when using overrideConfig.
|
||||
# See discussion at: https://github.com/pjones/plasma-manager/pull/186
|
||||
immutable = lib.mkIf config.programs.plasma.overrideConfig (lib.mkDefault true);
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
xdg.dataFile = lib.mkMerge [
|
||||
(lib.mkIf (cfg.profiles != { })
|
||||
(
|
||||
lib.mkMerge ([
|
||||
(
|
||||
lib.mkMerge (
|
||||
lib.mapAttrsToList
|
||||
(
|
||||
attrName: profile:
|
||||
let
|
||||
# Use the name from the name option if it's set
|
||||
profileName = if builtins.isString profile.name then profile.name else attrName;
|
||||
fontString = lib.mkIf (profile.font.name != null) "${profile.font.name},${builtins.toString profile.font.size}";
|
||||
in
|
||||
{
|
||||
"konsole/${profileName}.profile".text = lib.generators.toINI { }
|
||||
(lib.recursiveUpdate
|
||||
{
|
||||
"General" = (
|
||||
{
|
||||
"Name" = profileName;
|
||||
# Konsole generated profiles seem to always have this
|
||||
"Parent" = "FALLBACK/";
|
||||
} //
|
||||
(lib.optionalAttrs (profile.command != null) { "Command" = profile.command; })
|
||||
);
|
||||
"Appearance" = (
|
||||
{
|
||||
# If the font size is not set we leave a comma a the end after the name
|
||||
# We should fix this probs but konsole doesn't seem to care ¯\_(ツ)_/¯
|
||||
"Font" = fontString.content;
|
||||
} //
|
||||
(lib.optionalAttrs (profile.colorScheme != null) { "ColorScheme" = profile.colorScheme; })
|
||||
);
|
||||
}
|
||||
profile.extraConfig
|
||||
);
|
||||
}
|
||||
)
|
||||
cfg.profiles
|
||||
(
|
||||
lib.mkMerge (
|
||||
lib.mapAttrsToList
|
||||
(
|
||||
attrName: profile:
|
||||
let
|
||||
# Use the name from the name option if it's set
|
||||
profileName = if builtins.isString profile.name then profile.name else attrName;
|
||||
fontString = lib.mkIf (profile.font.name != null) "${profile.font.name},${builtins.toString profile.font.size}";
|
||||
in
|
||||
{
|
||||
"konsole/${profileName}.profile".text = lib.generators.toINI { }
|
||||
(lib.recursiveUpdate
|
||||
{
|
||||
"General" = (
|
||||
{
|
||||
"Name" = profileName;
|
||||
# Konsole generated profiles seem to always have this
|
||||
"Parent" = "FALLBACK/";
|
||||
} //
|
||||
(lib.optionalAttrs (profile.command != null) { "Command" = profile.command; })
|
||||
);
|
||||
"Appearance" = (
|
||||
{
|
||||
# If the font size is not set we leave a comma a the end after the name
|
||||
# We should fix this probs but konsole doesn't seem to care ¯\_(ツ)_/¯
|
||||
"Font" = fontString.content;
|
||||
} //
|
||||
(lib.optionalAttrs (profile.colorScheme != null) { "ColorScheme" = profile.colorScheme; })
|
||||
);
|
||||
}
|
||||
profile.extraConfig
|
||||
);
|
||||
}
|
||||
)
|
||||
cfg.profiles
|
||||
)
|
||||
)
|
||||
)
|
||||
])
|
||||
)
|
||||
)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user