diff --git a/plasma/NixOS-1.0.1.knsv b/plasma/NixOS-1.0.1.knsv deleted file mode 100644 index 2dec66d..0000000 Binary files a/plasma/NixOS-1.0.1.knsv and /dev/null differ diff --git a/plasma/autostart.nix b/plasma/autostart.nix index eabc25a..ab84d94 100644 --- a/plasma/autostart.nix +++ b/plasma/autostart.nix @@ -2,21 +2,7 @@ { #To show logs of services run: journalctl --user-unit={service-name} --user - - systemd.user.services.set-wallpaper = { - enable = true; - description = "Set KDE Plasma wallpaper"; - #after = [ "plasma-desktop.service" ]; - wantedBy = [ "graphical-session.target" ]; - serviceConfig = { - ExecStart = [ "/run/current-system/sw/bin/plasma-apply-wallpaperimage /home/${username}/${project}/other/wallpaper3.png" ]; - - Type = "oneshot"; - Restart = "on-failure"; - RestartSec = "5s"; - }; - }; - + systemd.user.services.autostart-yakuake = { enable = true; description = "Automatically start Yakuake"; @@ -32,23 +18,6 @@ }; }; - systemd.user.services.theme-set-reminder = { - enable = true; - description = "Remind the user to apply the custom Plasma Theme shipped with this install"; - after = [ "graphical-session.target" ]; - wantedBy = [ "graphical-session.target" ]; - serviceConfig = { -# ExecStart = [ "${pkgs.kdePackages.kdialog}/bin/kdialog --passivepopup \"Dont forget to apply custom system theme! (run kde-theme-apply in terminal)\"" ]; - ExecStart = [ "/etc/nixos/plasma/theme-popup.sh" ]; - - Type = "oneshot"; - Restart = "on-failure"; - RestartSec = "5s"; -# Environment = "PATH=/run/current-system/sw/bin:/etc/profiles/per-user/$USER/bin"; -# Environment = "DISPLAY=:0"; - }; - }; - systemd.user.services.autostart-trayscale = { enable = true; description = "Automatically start Trayscale"; diff --git a/plasma/home.nix b/plasma/home.nix index 32a1b65..96ab410 100644 --- a/plasma/home.nix +++ b/plasma/home.nix @@ -1,4 +1,4 @@ -{pkgs, inputs, username, ...}: +{pkgs, inputs, username, project, ...}: { imports = [ @@ -6,7 +6,7 @@ programs = { plasma = { - enable = false; + enable = true; overrideConfig = true; panels = [ @@ -19,10 +19,76 @@ widgets = [ "org.kde.plasma.kickoff" "org.kde.plasma.pager" + "org.kde.plasma.marginsseparator" + "org.kde.windowtitle" "org.kde.plasma.panelspacer" - "org.kde.plasma.systemmonitor.cpu" - "org.kde.plasma.systemtray" - "org.kde.plasma.digitalclock" + { + name = "org.kde.olib.thermalmonitor"; + config = { + General = { + sensors = "[{\"name\":\"Average CPU Temperature\",\"sensorId\":\"cpu/all/averageTemperature\"}]"; + }; + #ConfigDialog = { + # DialogHeight = 540; + # DialogWidth = 720; + #}; + }; + } + { + name = "org.kde.plasma.systemmonitor.cpu"; + config = { + Appearance = { + chartFace = "org.kde.ksysguard.linechart"; + title = "Total CPU Use"; + }; + SensorColors = { + "cpu/all/usage" = "43,82,120"; + }; + Sensors = { + highPrioritySensorIds = "[\"cpu/all/usage\"]"; + lowPrioritySensorIds = "[\"cpu/all/cpuCount\",\"cpu/all/coreCount\"]"; + totalSensors = "[\"cpu/all/usage\"]"; + }; + General = { + CurrentPreset = "org.kde.plasma.systemmonitor"; + }; + }; + } + "zayron.simple.separator" + { + systemTray.items = { + # Explicitly shown icons (always visible) + shown = [ + "Trayscale" + "org.kde.plasma.battery" + "org.kde.plasma.networkmanagement" + "org.kde.plasma.volume" + ]; + # Explicitly hidden icons (in the popup menu) + hidden = [ + "org.kde.plasma.brightness" + "toolbox" + "Yakuake" + "org.kde.plasma.notifications" + "Xwayland Video Bridge_pipewireToXProxy" + "zero-trust-client" + "org.kde.plasma.clipboard" + "org.kde.plasma.bluetooth" + "org.kde.plasma.clipboard" + "org.kde.plasma.printmanager" + "org.kde.plasma.weather" + ]; + }; + } + { + name = "org.kde.plasma.digitalclock"; + config = { + Appearance = { + fontWeight = 400; + use24hFormat = 2; + }; + }; + } ]; } { @@ -34,15 +100,16 @@ opacity = "translucent"; hiding = "dodgewindows"; widgets = [ + "org.kde.plasma.kickerdash" { name = "org.kde.plasma.icontasks"; config = { General = { launchers = [ # optional pinned apps - "kitty.desktop" - "firefox.desktop" - "org.kde.dolphin.desktop" + "applications:org.kde.dolphin.desktop" + "applications:systemsettings.desktop""applications:kitty.desktop" + "applications:firefox.desktop" ]; }; }; @@ -55,7 +122,7 @@ powerdevil = { # On AC power (plugged in): Minimal power saving AC = { - powerProfile = "performance"; + powerProfile = "powerSaving"; #turnOffDisplay.idleTimeout = 900; # 15 min idle autoSuspend = { action = "nothing"; @@ -66,7 +133,7 @@ # Normal battery: Balanced saving battery = { - powerProfile = "balanced"; + powerProfile = "powerSaving"; #turnOffDisplay.idleTimeout = 300; # 5 min autoSuspend = { action = "nothing"; @@ -83,7 +150,7 @@ action = "sleep"; idleTimeout = 300; # 5 min idle }; - whenLaptopLidClosed = "shutDown"; + whenLaptopLidClosed = "sleep"; dimDisplay = { idleTimeout = 60; }; @@ -106,7 +173,7 @@ theme = "Breeze_Light"; size = 24; }; - wallpaper = /home/${username}/NixOS/other/wallpaper2.png; + wallpaper = /home/${username}/${project}/other/wallpaper3.png; soundTheme = "freedesktop"; iconTheme = "Breeze-LaCapitaine-apps"; splashScreen = { @@ -449,7 +516,7 @@ kscreenlockerrc.Daemon.Timeout = 0; # kscreenlockerrc."Greeter/Wallpaper/org.kde.image/General".Image = "/usr/share/wallpapers/ScarletTree/"; # kscreenlockerrc."Greeter/Wallpaper/org.kde.image/General".PreviewImage = "/usr/share/wallpapers/ScarletTree/"; -# ksmserverrc.General.loginMode = "emptySession"; + ksmserverrc.General.loginMode = "emptySession"; # ksplashrc.KSplash.Theme = "a2n.kuro"; # kwalletrc.Wallet."First Use" = false; # kwinrc."Activities/LastVirtualDesktop"."0f8d8349-5b1b-4b77-bfa5-22829bfaf459" = "4a2f44cc-dfe7-45dc-8439-fe34a6866d37"; @@ -477,8 +544,8 @@ # kwinrc."Tiling/f18ce12b-2106-508f-9542-e4e6c6fbf75f".tiles = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; # kwinrc.Xwayland.Scale = 2; kwinrc."org.kde.kdecoration2".BorderSize = "Tiny"; -# kwinrc."org.kde.kdecoration2".BorderSizeAuto = false; -# kwinrc."org.kde.kdecoration2".ButtonsOnLeft = ""; + kwinrc."org.kde.kdecoration2".BorderSizeAuto = false; + kwinrc."org.kde.kdecoration2".ButtonsOnLeft = ""; # kwinrc."org.kde.kdecoration2".theme = "__aurorae__svg__Nordic"; # plasma-localerc.Formats.LANG = "en_US.UTF-8"; #plasmanotifyrc."Applications/dev.deedles.Trayscale".Seen = true; diff --git a/plasma/konsave.sh b/plasma/konsave.sh deleted file mode 100755 index 103a3ee..0000000 --- a/plasma/konsave.sh +++ /dev/null @@ -1,38 +0,0 @@ -source /home/cookiez/NixOS/other/colors.sh -FLAG_FILE="/home/cookiez/.flags/theme-flag" - -/run/current-system/sw/bin/konsave -i /home/cookiez/NixOS/plasma/NixOS-1.0.1.knsv -/run/current-system/sw/bin/konsave -i /home/cookiez/NixOS/plasma/NixOS-1.0.1.knsv -/run/current-system/sw/bin/konsave -a NixOS-1.0.1 - -progress_bar() { - local duration=$1 - local interval=0.25 - local total_intervals=$((duration / interval)) - local progress="" - local bar_length=10 - - for ((i=0; i "$FLAG_FILE" - -echo -e "Use ${RED}'sudo reboot -h 0'${NOCOLOR} to successfully apply the theme, if logging out manually ${YELLOW}doesn't${NOCOLOR} work!" -progress_bar 2.5 - -echo "" -echo -n "Do you want to reboot now? (Y/n): " -read -r answer -if [ -z "$answer" ] || [ "$answer" = "y" ] || [ "$answer" = "Y" ]; then - echo "Rebooting! ..." - sudo shutdown -r now -else - echo "Make sure to log out/reboot later!" -fi diff --git a/plasma/theme-popup.sh b/plasma/theme-popup.sh deleted file mode 100755 index 05f04f3..0000000 --- a/plasma/theme-popup.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -sleep 15 -FLAG_FILE="/home/cookiez/.flags/theme-flag" - - -if [ ! -f "$FLAG_FILE" ]; then - /run/current-system/sw/bin/kdialog --passivepopup "Dont forget to apply custom system theme! (run kde-theme-apply in terminal)" 60 -fi - -echo "Finished Popup Script!"