From c816f4babf08aee9155e435a5ac8b5df35d1b8e1 Mon Sep 17 00:00:00 2001
From: Julian Sutter <jsutter@symbiotip.com>
Date: Thu, 16 Feb 2023 19:28:25 -0800
Subject: [PATCH] Plamsa

---
 flake.lock         | 12 ++++++------
 flake.nix          |  2 +-
 modules/gnome.nix  |  1 +
 modules/plasma.nix | 21 +++++++++++++++++++++
 users/jsutter.nix  | 24 ++++++++++++------------
 5 files changed, 41 insertions(+), 19 deletions(-)
 create mode 100644 modules/plasma.nix

diff --git a/flake.lock b/flake.lock
index ed9b7e6..a81dbd7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1675935446,
-        "narHash": "sha256-WajulTn7QdwC7QuXRBavrANuIXE5z+08EdxdRw1qsNs=",
+        "lastModified": 1676367705,
+        "narHash": "sha256-un5UbRat9TwruyImtwUGcKF823rCEp4fQxnsaLFL7CM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2dce7f1a55e785a22d61668516df62899278c9e4",
+        "rev": "da72e6fc6b7dc0c3f94edbd310aae7cd95c678b5",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1676110339,
-        "narHash": "sha256-kOS/L8OOL2odpCOM11IevfHxcUeE0vnZUQ74EOiwXcs=",
+        "lastModified": 1676481215,
+        "narHash": "sha256-afma/1RU0EePRyrBPcjBdOt+dV8z1bJH9dtpTN/WXmY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e5530aba13caff5a4f41713f1265b754dc2abfd8",
+        "rev": "28319deb5ab05458d9cd5c7d99e1a24ec2e8fc4b",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 811f68c..2b0e885 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,7 +18,7 @@
         ./systems/common.nix
         ./systems/framework.nix
         ./users/jsutter.nix
-        ./modules/gnome.nix
+        ./modules/plasma.nix
         ./modules/nushell
         ];
       };
diff --git a/modules/gnome.nix b/modules/gnome.nix
index 024c6e2..cc50741 100644
--- a/modules/gnome.nix
+++ b/modules/gnome.nix
@@ -100,6 +100,7 @@ home-manager.users.jsutter = {
     gnomeExtensions.user-themes
     gnomeExtensions.tray-icons-reloaded
     gnomeExtensions.dash-to-panel
+    gnomeExtensions.cpufreq
   ];
   home.sessionVariables.GTK_THEME = "palenight";
   home.file."firefox-gnome-theme" = {
diff --git a/modules/plasma.nix b/modules/plasma.nix
new file mode 100644
index 0000000..95bdc6b
--- /dev/null
+++ b/modules/plasma.nix
@@ -0,0 +1,21 @@
+{ config, pkgs, home-manager, ... }:
+
+{
+  services.xserver.enable = true;
+  services.xserver.displayManager.sddm.enable = true;
+  services.xserver.desktopManager.plasma5.enable = true;
+
+  services.xserver.desktopManager.plasma5.excludePackages = with pkgs.libsForQt5; [
+    elisa
+    gwenview
+    okular
+    oxygen
+    khelpcenter
+    konsole
+    plasma-browser-integration
+    print-manager
+  ];
+
+  programs.dconf.enable = true;
+  
+}
\ No newline at end of file
diff --git a/users/jsutter.nix b/users/jsutter.nix
index 1faf4ee..b46b5ee 100644
--- a/users/jsutter.nix
+++ b/users/jsutter.nix
@@ -105,17 +105,6 @@ in
             };
           };
         };     
-        extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-          ublock-origin
-          privacy-badger
-          bitwarden
-          clearurls
-          decentraleyes
-          ghostery
-          privacy-redirect
-          privacy-badger
-          disconnect
-        ];
         profiles = {
           jsutter = {
             id = 0;
@@ -129,7 +118,18 @@ in
               user_pref("media.ffmpeg.vaapi.enabled", true);
               user_pref("media.rdd-vpx.enabled", true);
             '';
-        userChrome = ''
+            extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+              ublock-origin
+              privacy-badger
+              bitwarden
+              clearurls
+              decentraleyes
+              ghostery
+              privacy-redirect
+              privacy-badger
+              disconnect
+            ]; 
+       userChrome = ''
           @import "firefox-gnome-theme/userChrome.css";
           @import "firefox-gnome-theme/theme/colors/dark.css"; 
           '';