From dccfb1f6ba77bb64316ce4c50d9b10dce98db214 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Fri, 6 Jun 2025 18:21:11 -0500 Subject: [PATCH] desktop cosmic specialisation --- flake.lock | 131 ++++++++++++++---- flake.nix | 9 ++ hosts/desktop/configuration.nix | 2 +- .../cosmic/specialisation.nix | 4 +- 4 files changed, 116 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 28e02e2..1b88530 100755 --- a/flake.lock +++ b/flake.lock @@ -117,6 +117,29 @@ "type": "github" } }, + "desktop-cosmic": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "desktop-nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1749121763, + "narHash": "sha256-TVFiyMBs+3KEzZVwf/n1zedUWzPrMPzud/2Jiho8dcE=", + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "rev": "c89df80b72b4e1802fd91a35f4857868c953c1c0", + "type": "github" + }, + "original": { + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "type": "github" + } + }, "desktop-home-manager": { "inputs": { "nixpkgs": [ @@ -155,13 +178,13 @@ "desktop-lanzaboote": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "nixpkgs": [ "desktop-nixpkgs" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1737639419, @@ -256,7 +279,7 @@ "edit": { "inputs": { "nixpkgs": "nixpkgs_2", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay_3" }, "locked": { "lastModified": 1749050246, @@ -317,6 +340,22 @@ } }, "flake-compat": { + "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_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -332,7 +371,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1733328505, @@ -348,7 +387,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1746162366, @@ -364,7 +403,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1696426674, @@ -380,7 +419,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1696426674, @@ -778,7 +817,7 @@ "nas-authentik-nix": { "inputs": { "authentik-src": "authentik-src", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_2", "flake-utils": "flake-utils", "napalm": "napalm", @@ -806,12 +845,12 @@ }, "nas-cosmic": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "nixpkgs": [ "nas-nixpkgs-stable" ], - "nixpkgs-stable": "nixpkgs-stable_2", - "rust-overlay": "rust-overlay_3" + "nixpkgs-stable": "nixpkgs-stable_3", + "rust-overlay": "rust-overlay_4" }, "locked": { "lastModified": 1747308097, @@ -886,13 +925,13 @@ "nas-lanzaboote": { "inputs": { "crane": "crane_2", - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_5", "flake-parts": "flake-parts_3", "nixpkgs": [ "nas-nixpkgs" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix_2", - "rust-overlay": "rust-overlay_4" + "rust-overlay": "rust-overlay_5" }, "locked": { "lastModified": 1737639419, @@ -1207,6 +1246,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1748995628, + "narHash": "sha256-bFufQGSAEYQgjtc4wMrobS5HWN0hDP+ZX+zthYcml9U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8eb3b6a2366a7095939cd22f0dc0e9991313294b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1730741070, "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", @@ -1222,7 +1277,7 @@ "type": "github" } }, - "nixpkgs-stable_2": { + "nixpkgs-stable_3": { "locked": { "lastModified": 1747209494, "narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=", @@ -1238,7 +1293,7 @@ "type": "github" } }, - "nixpkgs-stable_3": { + "nixpkgs-stable_4": { "locked": { "lastModified": 1730741070, "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", @@ -1254,7 +1309,7 @@ "type": "github" } }, - "nixpkgs-stable_4": { + "nixpkgs-stable_5": { "locked": { "lastModified": 1748421225, "narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=", @@ -1270,7 +1325,7 @@ "type": "github" } }, - "nixpkgs-stable_5": { + "nixpkgs-stable_6": { "locked": { "lastModified": 1730741070, "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", @@ -1657,7 +1712,7 @@ "desktop-lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1731363552, @@ -1684,7 +1739,7 @@ "nas-lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { "lastModified": 1731363552, @@ -1711,7 +1766,7 @@ "steamdeck-lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_5" + "nixpkgs-stable": "nixpkgs-stable_6" }, "locked": { "lastModified": 1731363552, @@ -1780,6 +1835,7 @@ "root": { "inputs": { "desktop-chaotic": "desktop-chaotic", + "desktop-cosmic": "desktop-cosmic", "desktop-home-manager": "desktop-home-manager", "desktop-impermanence": "desktop-impermanence", "desktop-lanzaboote": "desktop-lanzaboote", @@ -1802,7 +1858,7 @@ "nas-sops-nix": "nas-sops-nix", "nix-darwin": "nix-darwin", "nixos-raspberrypi": "nixos-raspberrypi", - "nixpkgs-stable": "nixpkgs-stable_4", + "nixpkgs-stable": "nixpkgs-stable_5", "nixpkgs-unstable": "nixpkgs-unstable", "pi4-argon40-nix": "pi4-argon40-nix", "pi4-disko": "pi4-disko", @@ -1864,6 +1920,27 @@ } }, "rust-overlay": { + "inputs": { + "nixpkgs": [ + "desktop-cosmic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1749091064, + "narHash": "sha256-TGtYjzRX0sueFhwYsnNNFF5TTKnpnloznpIghLzxeXo=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "12419593ce78f2e8e1e89a373c6515885e218acb", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { "inputs": { "nixpkgs": [ "desktop-lanzaboote", @@ -1884,7 +1961,7 @@ "type": "github" } }, - "rust-overlay_2": { + "rust-overlay_3": { "inputs": { "nixpkgs": [ "edit", @@ -1905,7 +1982,7 @@ "type": "github" } }, - "rust-overlay_3": { + "rust-overlay_4": { "inputs": { "nixpkgs": [ "nas-cosmic", @@ -1926,7 +2003,7 @@ "type": "github" } }, - "rust-overlay_4": { + "rust-overlay_5": { "inputs": { "nixpkgs": [ "nas-lanzaboote", @@ -1947,7 +2024,7 @@ "type": "github" } }, - "rust-overlay_5": { + "rust-overlay_6": { "inputs": { "nixpkgs": [ "steamdeck-lanzaboote", @@ -2071,13 +2148,13 @@ "steamdeck-lanzaboote": { "inputs": { "crane": "crane_3", - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "flake-parts": "flake-parts_4", "nixpkgs": [ "steamdeck-nixpkgs" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix_3", - "rust-overlay": "rust-overlay_5" + "rust-overlay": "rust-overlay_6" }, "locked": { "lastModified": 1737639419, diff --git a/flake.nix b/flake.nix index b0f5c05..9b513b7 100755 --- a/flake.nix +++ b/flake.nix @@ -52,6 +52,12 @@ inputs.home-manager.follows = "desktop-home-manager"; }; + # cosmic launcher + desktop-cosmic = { + url = "github:lilyinstarlight/nixos-cosmic"; + inputs.nixpkgs.follows = "desktop-nixpkgs"; + }; + ##################################################### # NAS # ##################################################### @@ -292,6 +298,7 @@ desktop-nixos-hardware, desktop-sops-nix, desktop-steam-rom-manager, + desktop-cosmic, # NAS nas-nixpkgs, @@ -467,6 +474,8 @@ home-manager.backupFileExtension = "backup"; } + desktop-cosmic.nixosModules.default + # nixos hardware desktop-nixos-hardware.nixosModules.common-cpu-amd desktop-nixos-hardware.nixosModules.common-cpu-amd-pstate diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index b35900f..0ef875a 100755 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -3,7 +3,6 @@ # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). { - outputs, lib, pkgs, ... @@ -108,6 +107,7 @@ in ./sops.nix ./users.nix ../default.nix + ../../modules/desktop-environments/cosmic/specialisation.nix ../../share/amd ]; diff --git a/modules/desktop-environments/cosmic/specialisation.nix b/modules/desktop-environments/cosmic/specialisation.nix index 5fba884..733cda3 100755 --- a/modules/desktop-environments/cosmic/specialisation.nix +++ b/modules/desktop-environments/cosmic/specialisation.nix @@ -1,6 +1,6 @@ -{ lib, ... }: +{ ... }: { specialisation.cosmic.configuration = { - imports = [ ./default.nix ] + imports = [ ./default.nix ]; }; }