plasma-manager added

devices/ellaca/options.nix

@@ -6,11 +6,11 @@
 
   withNiri = true;
   withGnome = false;
-  withPlasma = false;
+  withPlasma = true;
 
   withVM = false;
   withContainers = true;
-  withGames = false;
+  withGames = true;
 
   hwmonPath = "/sys/class/hwmon/hwmon1/temp1_input";
 }

flake.lock

@@ -258,14 +258,15 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-stable": "nixpkgs-stable"
+        "nixpkgs-stable": "nixpkgs-stable",
+        "xwayland-satellite": "xwayland-satellite"
       },
       "locked": {
-        "lastModified": 1719699734,
+        "lastModified": 1719731831,
-        "narHash": "sha256-qINqbxYc1pv357bfI9LcqmwjayeBh/Dd6wZiFaDAnQs=",
+        "narHash": "sha256-MhSu7dk8jAGa8E53m+bZ9RsqW0TQxDox1QwhvVR86Cw=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "38186d3da0497d14404980289c5515d828b78edc",
+        "rev": "44aa44306a6fa08809892306c2909feb4743b3a4",
         "type": "github"
       },
       "original": {
@@ -277,16 +278,16 @@
     "niri-stable": {
       "flake": false,
       "locked": {
-        "lastModified": 1716030039,
+        "lastModified": 1719642458,
-        "narHash": "sha256-MJh0CR2YHJE0GNnxaTcElNMuZUEI0pe9fvC0mfy4484=",
+        "narHash": "sha256-EdlOGL9RdO77HnZxv2UpPwrJdFH8qPrPSRtkBBV167s=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "d96a66ddff1a6b88dbe3e23b049f7075533b216f",
+        "rev": "e7c201abba6fedaa57001639810af3b6bd9b852e",
         "type": "github"
       },
       "original": {
         "owner": "YaLTeR",
-        "ref": "v0.1.6",
+        "ref": "v0.1.7",
         "repo": "niri",
         "type": "github"
       }
@@ -399,11 +400,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1719706074,
+        "lastModified": 1719739294,
-        "narHash": "sha256-lTV3rJHSs20AVIL20SpiAWs+YbbKIwgmWINpFbL4ZAU=",
+        "narHash": "sha256-yxEGIy5JvRNOA129CkXcpHFlsQJA3akM/RdOQDZQvgY=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "c64950a01a4f2d115c06264842083db84d865bb9",
+        "rev": "d10ef14183603348e86cded6dc123337da095b01",
         "type": "github"
       },
       "original": {
@@ -412,6 +413,29 @@
         "type": "github"
       }
     },
+    "plasma-manager": {
+      "inputs": {
+        "home-manager": [
+          "home-manager"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1719701594,
+        "narHash": "sha256-p3pXBV1HYL9M5Jik1bE/lCnnU+b2ziNZi9GhfdAXPEs=",
+        "owner": "nix-community",
+        "repo": "plasma-manager",
+        "rev": "121424d140989e213a6bed3a681948e1f7763d1a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "plasma-manager",
+        "type": "github"
+      }
+    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": [
@@ -451,7 +475,8 @@
         "home-manager": "home-manager",
         "niri": "niri",
         "nixpkgs": "nixpkgs_3",
-        "nur": "nur"
+        "nur": "nur",
+        "plasma-manager": "plasma-manager"
       }
     },
     "systems": {
@@ -498,6 +523,22 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "xwayland-satellite": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1719729931,
+        "narHash": "sha256-eZqSOrr16sik9TwJsesZ/g2J8FstPtDvT4dZRVCEGQc=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "d8a9c28fa7b0539569b8ef36af2c34bc9174db6d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -6,7 +6,9 @@
 
     home-manager = {
       url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+      };
     };
 
     nur = {
@@ -15,7 +17,17 @@
 
     niri = {
       url = "github:sodiboo/niri-flake";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
+
+    plasma-manager = {
+      url = "github:nix-community/plasma-manager";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        home-manager.follows = "home-manager";
+      };
     };
   };
 

modules/home/default.nix

@@ -1,18 +1,30 @@
-{ config, ... }: {
+{ inputs, config, lib, ... }: let
+  modules = lib.lists.flatten [
+    (if config.withNiri then [
+      ./niri-setup
+      ./themes
+    ] else [])
+    (if config.withGnome then [
+      ./themes
+    ] else [])
+    (if config.withPlasma then [
+      ./plasma
+      ./themes
+    ] else [])
+    (if config.full then [
+      ./programs
+    ] else [])
+  ];
+in {
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
+    sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ];
+
     users.twoneis = {
       imports = [
         ./utils
-      ] ++ (if config.withNiri then [
+      ] ++ modules;
-        ./niri-setup
-        ./themes
-      ] else []) ++ (if config.withGnome then [
-        ./themes
-      ] else []) ++ (if config.full then [
-        ./programs
-      ] else []);
 
       home = {
         username = "twoneis";

modules/home/plasma/default.nix

@@ -0,0 +1,5 @@
+{ ... }: {
+  programs.plasma = {
+    enable = true;
+  };
+}

modules/plasma/default.nix

@@ -1,17 +0,0 @@
-{ pkgs, lib, config, ... }: lib.mkIf (config.withPlasma) {
-  services = {
-    desktopManager.plasma6 = {
-      enable = true;
-    };
-  };
-
-  environment = {
-    plasma6.excludePackages = with pkgs.kdePackages; [
-      plasma-browser-integration
-      konsole
-      oxygen
-    ];
-  };
-
-  programs.dconf.enable = true;
-}