mirror of
https://github.com/pjones/plasma-manager.git
synced 2024-09-11 15:56:02 +03:00
Change cursor.cursorTheme to cursor.theme (#204)
This commit is contained in:
parent
bcf6bf6cd9
commit
d48204d2be
@ -11,7 +11,10 @@
|
||||
workspace = {
|
||||
clickItemTo = "open"; # If you liked the click-to-open default from plasma 5
|
||||
lookAndFeel = "org.kde.breezedark.desktop";
|
||||
cursorTheme = "Bibata-Modern-Ice";
|
||||
cursor = {
|
||||
theme = "Bibata-Modern-Ice";
|
||||
size = 32;
|
||||
};
|
||||
iconTheme = "Papirus-Dark";
|
||||
wallpaper = "${pkgs.kdePackages.plasma-workspace-wallpapers}/share/wallpapers/Patak/contents/images/1080x1920.png";
|
||||
};
|
||||
|
@ -14,7 +14,7 @@
|
||||
workspace = {
|
||||
clickItemTo = "select";
|
||||
lookAndFeel = "org.kde.breezedark.desktop";
|
||||
cursorTheme = "Bibata-Modern-Ice";
|
||||
cursor.theme = "Bibata-Modern-Ice";
|
||||
iconTheme = "Papirus-Dark";
|
||||
wallpaper = "${pkgs.kdePackages.plasma-workspace-wallpapers}/share/wallpapers/Patak/contents/images/1080x1920.png";
|
||||
};
|
||||
|
@ -34,7 +34,7 @@ let
|
||||
|
||||
cursorType = with lib.types; submodule {
|
||||
options = {
|
||||
cursorTheme = lib.mkOption {
|
||||
theme = lib.mkOption {
|
||||
type = nullOr str;
|
||||
default = null;
|
||||
example = "Breeze_Snow";
|
||||
@ -51,13 +51,13 @@ let
|
||||
|
||||
anyThemeSet = (cfg.workspace.theme != null ||
|
||||
cfg.workspace.colorScheme != null ||
|
||||
(cfg.workspace.cursor != null && cfg.workspace.cursor.cursorTheme != null) ||
|
||||
(cfg.workspace.cursor != null && cfg.workspace.cursor.theme != null) ||
|
||||
cfg.workspace.lookAndFeel != null ||
|
||||
cfg.workspace.iconTheme != null);
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(lib.mkRenamedOptionModule [ "programs" "plasma" "workspace" "cursorTheme" ] [ "programs" "plasma" "workspace" "cursor" "cursorTheme" ])
|
||||
(lib.mkRenamedOptionModule [ "programs" "plasma" "workspace" "cursorTheme" ] [ "programs" "plasma" "workspace" "cursor" "theme" ])
|
||||
];
|
||||
|
||||
options.programs.plasma.workspace = {
|
||||
@ -99,7 +99,7 @@ in
|
||||
cursor = lib.mkOption {
|
||||
type = lib.types.nullOr cursorType;
|
||||
default = null;
|
||||
example = { cursorTheme = "Breeze_Snow"; size = 24; };
|
||||
example = { theme = "Breeze_Snow"; size = 24; };
|
||||
description = ''
|
||||
Allows to configure the cursor in plasma. Both the theme and size are configurable.
|
||||
'';
|
||||
@ -188,7 +188,7 @@ in
|
||||
(lib.mkMerge
|
||||
[
|
||||
{
|
||||
kcminputrc.Mouse.cursorTheme.persistent = lib.mkDefault (cfg.workspace.cursor != null && cfg.workspace.cursor.cursorTheme != null);
|
||||
kcminputrc.Mouse.cursorTheme.persistent = lib.mkDefault (cfg.workspace.cursor != null && cfg.workspace.cursor.theme != null);
|
||||
kdeglobals.General.ColorScheme.persistent = lib.mkDefault (cfg.workspace.colorScheme != null);
|
||||
kdeglobals.Icons.Theme.persistent = lib.mkDefault (cfg.workspace.iconTheme != null);
|
||||
kdeglobals.KDE.LookAndFeelPackage.persistent = lib.mkDefault (cfg.workspace.lookAndFeel != null);
|
||||
@ -207,8 +207,8 @@ in
|
||||
text = ''
|
||||
${if cfg.workspace.lookAndFeel != null then "plasma-apply-lookandfeel -a ${cfg.workspace.lookAndFeel}" else ""}
|
||||
${if cfg.workspace.theme != null then "plasma-apply-desktoptheme ${cfg.workspace.theme}" else ""}
|
||||
${if (cfg.workspace.cursor != null && cfg.workspace.cursor.cursorTheme != null) then
|
||||
"plasma-apply-cursortheme ${cfg.workspace.cursor.cursorTheme}" +
|
||||
${if (cfg.workspace.cursor != null && cfg.workspace.cursor.theme != null) then
|
||||
"plasma-apply-cursortheme ${cfg.workspace.cursor.theme}" +
|
||||
(if cfg.workspace.cursor.size != null then " --size ${builtins.toString cfg.workspace.cursor.size}" else "")
|
||||
else ""}
|
||||
${if cfg.workspace.colorScheme != null then "plasma-apply-colorscheme ${cfg.workspace.colorScheme}" else ""}
|
||||
|
Loading…
Reference in New Issue
Block a user