diff --git a/flake.lock b/flake.lock index 021e004..404c1a0 100644 --- a/flake.lock +++ b/flake.lock @@ -171,22 +171,6 @@ } }, "flake-compat_8": { - "flake": false, - "locked": { - "lastModified": 1746162366, - "narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=", - "owner": "nix-community", - "repo": "flake-compat", - "rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_9": { "flake": false, "locked": { "lastModified": 1696426674, @@ -696,7 +680,7 @@ }, "hooks_6": { "inputs": { - "flake-compat": "flake-compat_9", + "flake-compat": "flake-compat_8", "gitignore": "gitignore_7", "nixpkgs": [ "xenumenu", @@ -865,27 +849,6 @@ "type": "github" } }, - "nixos-cosmic": { - "inputs": { - "flake-compat": "flake-compat_8", - "nixpkgs": "nixpkgs_9", - "nixpkgs-stable": "nixpkgs-stable_2", - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1751591814, - "narHash": "sha256-A4lgvuj4v+Pr8MniXz1FBG0DXOygi8tTECR+j53FMhM=", - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "rev": "fef2d0c78c4e4d6c600a88795af193131ff51bdc", - "type": "github" - }, - "original": { - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1745391562, @@ -1038,22 +1001,6 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1751048012, - "narHash": "sha256-MYbotu4UjWpTsq01wglhN5xDRfZYLFtNk7SBY0BcjkU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a684c58d46ebbede49f280b653b9e56100aa3877", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_10": { "locked": { "lastModified": 1750365781, @@ -1184,11 +1131,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1751011381, - "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -1309,11 +1256,7 @@ "myphps": "myphps", "nini": "nini", "nix-index-database": "nix-index-database", - "nixos-cosmic": "nixos-cosmic", - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ], + "nixpkgs": "nixpkgs_9", "treefmt": "treefmt_5", "xenumenu": "xenumenu" } @@ -1339,27 +1282,6 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1751251399, - "narHash": "sha256-y+viCuy/eKKpkX1K2gDvXIJI/yzvy6zA3HObapz9XZ0=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "b22d5ee8c60ed1291521f2dde48784edd6bf695b", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index c605177..8940943 100644 --- a/flake.nix +++ b/flake.nix @@ -15,8 +15,6 @@ agenix.url = "github:ryantm/agenix"; hardware.url = "github:NixOS/nixos-hardware"; - nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; - nixpkgs.follows = "nixos-cosmic/nixpkgs"; nix-index-database = { url = "github:nix-community/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/profiles/desktop/cosmic.nix b/profiles/desktop/cosmic.nix deleted file mode 100644 index 4e7335b..0000000 --- a/profiles/desktop/cosmic.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - config, - lib, - inputs, - pkgs, - ... -}: -let - cfg = config.profiles.desktop; -in -{ - imports = [ - inputs.nixos-cosmic.nixosModules.default - ]; - - config = lib.mkIf cfg.enable { - - nix.settings = { - substituters = [ "https://cosmic.cachix.org" ]; - trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; - }; - - services = { - desktopManager.cosmic.enable = true; - displayManager.cosmic-greeter.enable = true; - }; - - environment.cosmic.excludePackages = [ - pkgs.cosmic-edit - pkgs.cosmic-player - ]; - - environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1; - }; -} diff --git a/profiles/desktop/plasma.nix b/profiles/desktop/plasma.nix new file mode 100644 index 0000000..6eb5595 --- /dev/null +++ b/profiles/desktop/plasma.nix @@ -0,0 +1,25 @@ +{ + config, + lib, + inputs, + ... +}: +let + cfg = config.profiles.desktop; +in +{ + imports = [ + inputs.nixos-cosmic.nixosModules.default + ]; + + config = lib.mkIf cfg.enable { + services = { + displayManager.sddm = { + enable = true; + wayland.enable = true; + }; + + desktopManager.plasma6.enable = true; + }; + }; +}