diff --git a/roles/kde/look-and-feel/xyz.toast003.customtheme.desktop/contents/defaults b/roles/kde/look-and-feel/xyz.toast003.customtheme.desktop/contents/defaults deleted file mode 100644 index 764fa66..0000000 --- a/roles/kde/look-and-feel/xyz.toast003.customtheme.desktop/contents/defaults +++ /dev/null @@ -1,29 +0,0 @@ -[kdeglobals][KDE] -widgetStyle=Breeze - -[kdeglobals][General] -ColorScheme=BreezeDarkTint - -[kdeglobals][Icons] -Theme=breeze-dark - -[plasmarc][Theme] -name=default - -[Wallpaper] -Image=MilkyWay - -[kcminputrc][Mouse] -cursorTheme=breeze_cursors - -[kwinrc][WindowSwitcher] -LayoutName=org.kde.breeze.desktop - -[kwinrc][DesktopSwitcher] -LayoutName=org.kde.breeze.desktop - -[kwinrc][org.kde.kdecoration2] -library=org.kde.breeze - -[KSplash] -Theme=org.kde.Breeze diff --git a/roles/kde/look-and-feel/xyz.toast003.customtheme.desktop/contents/layouts/org.kde.plasma.desktop-layout.js b/roles/kde/look-and-feel/xyz.toast003.customtheme.desktop/contents/layouts/org.kde.plasma.desktop-layout.js deleted file mode 100644 index 09fdfac..0000000 --- a/roles/kde/look-and-feel/xyz.toast003.customtheme.desktop/contents/layouts/org.kde.plasma.desktop-layout.js +++ /dev/null @@ -1,6 +0,0 @@ -loadTemplate("org.kde.plasma.desktop.defaultPanel") - -var desktopsArray = desktopsForActivity(currentActivity()); -for( var j = 0; j < desktopsArray.length; j++) { - desktopsArray[j].wallpaperPlugin = 'org.kde.image'; -} diff --git a/roles/kde/look-and-feel/xyz.toast003.customtheme.desktop/contents/plasmoidsetupscripts/org.kde.plasma.digitalclock.js b/roles/kde/look-and-feel/xyz.toast003.customtheme.desktop/contents/plasmoidsetupscripts/org.kde.plasma.digitalclock.js deleted file mode 100644 index f2d9552..0000000 --- a/roles/kde/look-and-feel/xyz.toast003.customtheme.desktop/contents/plasmoidsetupscripts/org.kde.plasma.digitalclock.js +++ /dev/null @@ -1,3 +0,0 @@ -applet.currentConfigGroup = ["Appearance"] -applet.writeConfig("showSeconds", "true") -applet.reloadConfig() diff --git a/roles/kde/look-and-feel/xyz.toast003.customtheme.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kickoff.js b/roles/kde/look-and-feel/xyz.toast003.customtheme.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kickoff.js deleted file mode 100644 index 5d17cfc..0000000 --- a/roles/kde/look-and-feel/xyz.toast003.customtheme.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kickoff.js +++ /dev/null @@ -1,3 +0,0 @@ -applet.currentConfigGroup = ["General"] -applet.writeConfig("icon", "nix-snowflake-white") -applet.reloadConfig() diff --git a/roles/kde/look-and-feel/xyz.toast003.customtheme.desktop/contents/previews/fullscreenpreview.jpg b/roles/kde/look-and-feel/xyz.toast003.customtheme.desktop/contents/previews/fullscreenpreview.jpg deleted file mode 100644 index 44aba5d..0000000 Binary files a/roles/kde/look-and-feel/xyz.toast003.customtheme.desktop/contents/previews/fullscreenpreview.jpg and /dev/null differ diff --git a/roles/kde/look-and-feel/xyz.toast003.customtheme.desktop/contents/previews/preview.png b/roles/kde/look-and-feel/xyz.toast003.customtheme.desktop/contents/previews/preview.png deleted file mode 100644 index ba7bbdd..0000000 Binary files a/roles/kde/look-and-feel/xyz.toast003.customtheme.desktop/contents/previews/preview.png and /dev/null differ diff --git a/roles/kde/look-and-feel/xyz.toast003.customtheme.desktop/metadata.json b/roles/kde/look-and-feel/xyz.toast003.customtheme.desktop/metadata.json deleted file mode 100644 index 820e77a..0000000 --- a/roles/kde/look-and-feel/xyz.toast003.customtheme.desktop/metadata.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "KPlugin": { - "Authors": [ - { - "Name": "Toast" - } - ], - "Category": "", - "Description": "Custom theme based on Breeze Dark", - "Id": "xyz.toast003.customtheme.desktop", - "License": "GPL", - "Name": "Toast's theme", - "ServiceTypes": [ - "Plasma/LookAndFeel" - ], - "Version": "1.0" - }, - "X-Plasma-MainScript": "defaults" -} diff --git a/roles/kde/plasma.nix b/roles/kde/plasma.nix index 0140e0f..1b35760 100644 --- a/roles/kde/plasma.nix +++ b/roles/kde/plasma.nix @@ -2,14 +2,6 @@ let # Set up the default kde options - kdeglobals = lib.generators.toINI {} { - KDE.LookAndFeelPackage = "org.kde.breezedarktint.desktop"; - KDE.SingleClick = false; - General = { - accentColorFromWallpaper = true; - AccentColor = "172,53,164" ; }; - }; - balooExcludedDirs = lib.strings.intersperse "," [ "$HOME/.cache/" "$HOME/.config/" @@ -37,18 +29,6 @@ let runHook postInstall ''; }; - lookAndFeel = pkgs.stdenv.mkDerivation { - name = "toast-look-and-feel"; - src = ./look-and-feel; - installPhase = '' - runHook preInstall - - mkdir -p $out/share/plasma/look-and-feel/ - cp -r xyz.toast003.customtheme.desktop $out/share/plasma/look-and-feel/ - - runHook postInstall - ''; - }; # /etc/xdg is not read by plasma, so to change the default settings you need to put them in a package plasmaDefaults = pkgs.stdenv.mkDerivation { @@ -59,7 +39,6 @@ let set -x mkdir -p $out/etc/xdg - echo "${kdeglobals}" > $out/etc/xdg/kdeglobals echo '${baloofilerc}' > $out/etc/xdg/baloofilerc runHook postInstall @@ -82,7 +61,7 @@ in Install the patched Breeze color schemes and look and feel packages, as well as the plasma default configs */ - environment.systemPackages = [ breezeTint lookAndFeel plasmaDefaults ]; + environment.systemPackages = [ breezeTint plasmaDefaults ]; # Plasma configs should be on all users home-manager.sharedModules = [ @@ -109,7 +88,10 @@ in }; programs.plasma = { enable = true; - workspace.clickItemTo = "select"; + workspace = { + clickItemTo = "select"; + cursorTheme = "Breeze_Snow"; + }; shortcuts = { "kwin" = { "Switch One Desktop to the Left" = [ "Meta+Ctrl+Left" ];