Skip to content

Commit 11d560b

Browse files
committed
theme: adjust for plasma 6.5 dark/light mode handling
1 parent 02a63c0 commit 11d560b

File tree

8 files changed

+96
-35
lines changed

8 files changed

+96
-35
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
[kdeglobals][KDE]
2+
widgetStyle=Breeze
3+
4+
[kdeglobals][General]
5+
ColorScheme=SomasisLight
6+
7+
[kdeglobals][Icons]
8+
Theme=Papirus
9+
10+
[plasmarc][Theme]
11+
name=breeze-dark
12+
13+
[kcminputrc][Mouse]
14+
cursorTheme=Hackneyed (scalable)
15+
16+
[kwinrc][org.kde.kdecoration2]
17+
ButtonsOnLeft=M
18+
ButtonsOnRight=SBFAIX
19+
library=org.kde.breeze
20+
theme=Breeze
21+
22+
[KSplash]
23+
Theme=none
548 KB
Loading
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"KPackageStructure": "Plasma/LookAndFeel",
3+
"KPlugin": {
4+
"Authors": [
5+
{
6+
"Email": "kylie@somas.is",
7+
"Name": "somasis"
8+
}
9+
],
10+
"Category": "",
11+
"ServiceTypes": ["Plasma/LookAndFeel"],
12+
"Description": "somasis",
13+
"Id": "somasis.desktop",
14+
"License": "Public domain",
15+
"Name": "somasis",
16+
"Website": "https://somas.is"
17+
}
18+
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
[kdeglobals][KDE]
2+
widgetStyle=Breeze
3+
4+
[kdeglobals][General]
5+
ColorScheme=SomasisDark
6+
7+
[kdeglobals][Icons]
8+
Theme=Papirus-Dark
9+
10+
[plasmarc][Theme]
11+
name=breeze-dark
12+
13+
[kcminputrc][Mouse]
14+
cursorTheme=Hackneyed (scalable)
15+
16+
[kwinrc][org.kde.kdecoration2]
17+
ButtonsOnLeft=M
18+
ButtonsOnRight=SBFAIX
19+
library=org.kde.breeze
20+
theme=Breeze
21+
22+
[KSplash]
23+
Theme=none
559 KB
Loading
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"KPackageStructure": "Plasma/LookAndFeel",
3+
"KPlugin": {
4+
"Authors": [
5+
{
6+
"Email": "kylie@somas.is",
7+
"Name": "somasis"
8+
}
9+
],
10+
"Category": "",
11+
"ServiceTypes": ["Plasma/LookAndFeel"],
12+
"Description": "somasis (dark)",
13+
"Id": "somasisdark.desktop",
14+
"License": "Public domain",
15+
"Name": "somasis (dark)",
16+
"Website": "https://somas.is"
17+
}
18+
}

users/somasis/theme/default.nix

Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2+
self,
23
config,
3-
lib,
44
...
55
}:
66
let
@@ -16,44 +16,25 @@ in
1616
systemd.user.sessionVariables._JAVA_OPTIONS = "-Dawt.useSystemAAFontSettings=on";
1717

1818
programs.plasma = {
19-
workspace = {
20-
lookAndFeel = "org.kde.breezetwilight.desktop";
21-
theme = "breeze-dark";
22-
colorScheme = "SomasisLight";
23-
};
19+
# See `./share/plasma/look-and-feel/somasis.desktop`
20+
workspace.lookAndFeel = "somasis.desktop";
2421

25-
configFile.kdeglobals.General.AccentColor = config.lib.somasis.colors.kde config.theme.colors.accent;
22+
configFile.kdeglobals.General.AccentColor = colors.kde config.theme.colors.accent;
23+
};
24+
25+
xdg.dataFile = {
26+
"plasma/look-and-feel/somasisdark.desktop".source =
27+
"${self}/share/plasma/look-and-feel/somasisdark.desktop";
28+
"plasma/look-and-feel/somasis.desktop".source =
29+
"${self}/share/plasma/look-and-feel/somasis.desktop";
2630
};
2731

2832
services.darkman = {
2933
enable = true;
30-
31-
lightModeScripts = {
32-
kde-color-scheme = ''
33-
plasma-apply-colorscheme SomasisLight
34-
plasma-apply-colorscheme -a ${lib.escapeShellArg (colors.hex config.theme.colors.accent)}
35-
'';
36-
kde-gtk-theme = ''
37-
dbus-send --session --dest=org.kde.GtkConfig --type=method_call /GtkConfig org.kde.GtkConfig.setGtkTheme "string:Breeze-gtk"
38-
'';
39-
};
40-
41-
darkModeScripts = {
42-
kde-color-scheme = ''
43-
plasma-apply-colorscheme SomasisDark
44-
plasma-apply-colorscheme -a ${lib.escapeShellArg (colors.hex config.theme.colors.brightAccent)}
45-
'';
46-
kde-gtk-theme = ''
47-
dbus-send --session --dest=org.kde.GtkConfig --type=method_call /GtkConfig org.kde.GtkConfig.setGtkTheme "string:Breeze-dark-gtk"
48-
'';
49-
};
50-
51-
settings = {
52-
usegeoclue = true;
53-
};
34+
settings.usegeoclue = true;
5435
};
5536

56-
cache.directories = [
57-
(config.lib.somasis.xdgCacheDir "darkman")
37+
cache.directories = with config.lib.somasis; [
38+
(xdgCacheDir "darkman")
5839
];
5940
}

users/somasis/theme/icons.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
{
2-
config,
3-
lib,
42
pkgs,
53
...
64
}:

0 commit comments

Comments
 (0)