diff --git a/common/environment.nix b/common/environment.nix index 433a2a9..122e2f5 100644 --- a/common/environment.nix +++ b/common/environment.nix @@ -16,6 +16,7 @@ # used for nix config colmena agenix + rc2nix ]; environment.wordlist.enable = true; diff --git a/flake.lock b/flake.lock index afd4ee1..3ecf0fb 100644 --- a/flake.lock +++ b/flake.lock @@ -112,13 +112,37 @@ "type": "github" } }, + "plasma-manager": { + "inputs": { + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1725914634, + "narHash": "sha256-U74hu15xSb6JNySMOwyJrsh4uk1DVa182bdHLeHdYMc=", + "owner": "nix-community", + "repo": "plasma-manager", + "rev": "60becd0e994e25b372c8d0500fc944396f6c1085", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "plasma-manager", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", "birdsong": "birdsong", "home-manager": "home-manager_2", "nixpkgs": "nixpkgs", - "nur": "nur" + "nur": "nur", + "plasma-manager": "plasma-manager" } }, "systems": { diff --git a/flake.nix b/flake.nix index 3e5ffdb..a5348a3 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,12 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + plasma-manager = { + url = "github:nix-community/plasma-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home-manager"; + }; + nur.url = "github:nix-community/NUR"; agenix = { @@ -20,7 +26,7 @@ birdsong.url = "git+https://git.qenya.tel/qenya/birdsong?ref=main"; }; - outputs = inputs@{ self, nixpkgs, home-manager, nur, agenix, birdsong, ... }: { + outputs = inputs@{ self, nixpkgs, home-manager, plasma-manager, nur, agenix, birdsong, ... }: { colmena = { meta = { nixpkgs = import nixpkgs { system = "x86_64-linux"; }; @@ -38,12 +44,14 @@ nixpkgs.config.packageOverrides = pkgs: { agenix = inputs.agenix.packages.${config.nixpkgs.hostPlatform.system}.default; + rc2nix = inputs.plasma-manager.packages.${config.nixpkgs.hostPlatform.system}.rc2nix; }; nixpkgs.overlays = [ inputs.nur.overlay ]; home-manager = { useUserPackages = true; useGlobalPkgs = true; + sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ]; }; imports = [ diff --git a/home/qenya/default.nix b/home/qenya/default.nix index 4923dcb..14e552b 100644 --- a/home/qenya/default.nix +++ b/home/qenya/default.nix @@ -1,6 +1,7 @@ { imports = [ ./dconf + ./plasma ./cli.nix ./firefox.nix ./git.nix diff --git a/home/qenya/plasma/default.nix b/home/qenya/plasma/default.nix new file mode 100644 index 0000000..f35d05c --- /dev/null +++ b/home/qenya/plasma/default.nix @@ -0,0 +1,11 @@ +{ config, lib, pkgs, osConfig, ... }: + +let + isPlasma = osConfig.services.desktopManager.plasma6.enable || osConfig.services.xserver.desktopManager.plasma5.enable; +in +{ + programs.plasma.enable = isPlasma; + programs.plasma.overrideConfig = true; + + imports = [ ]; +}