From 855f80c1bcbe89c637b7b2bcb06aef08bf7a8a90 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Mon, 31 Mar 2025 22:20:23 +0200 Subject: [PATCH] fix cosmic eval error --- flake.lock | 107 +++++-------------------------- flake.nix | 8 --- hosts/lambdaos/configuration.nix | 1 - 3 files changed, 15 insertions(+), 101 deletions(-) diff --git a/flake.lock b/flake.lock index 82fe1bf..99b4171 100644 --- a/flake.lock +++ b/flake.lock @@ -137,29 +137,6 @@ "type": "gitlab" } }, - "cosmic": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1743419774, - "narHash": "sha256-oZfx6GN9vBR5hr+CWl17ontcfeLBw0l834tj80QLwFY=", - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "rev": "4f659ef4b5b63c260ba3a2241e93355d82821f1c", - "type": "github" - }, - "original": { - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "type": "github" - } - }, "crane": { "locked": { "lastModified": 1741481578, @@ -400,15 +377,15 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1717312683, - "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", - "owner": "nix-community", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", "repo": "flake-compat", - "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { - "owner": "nix-community", + "owner": "edolstra", "repo": "flake-compat", "type": "github" } @@ -416,11 +393,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -446,22 +423,6 @@ } }, "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -749,11 +710,11 @@ "lanzaboote": { "inputs": { "crane": "crane_4", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts", "nixpkgs": "nixpkgs_4", "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay" }, "locked": { "lastModified": 1741442524, @@ -795,7 +756,7 @@ }, "lix": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "nix2container": "nix2container", "nixpkgs": [ "nixpkgs" @@ -845,7 +806,7 @@ "mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "nixpkgs": [ "nixpkgs" ], @@ -869,7 +830,7 @@ "inputs": { "nix-filter": "nix-filter", "nixpkgs": "nixpkgs_6", - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1743420920, @@ -955,7 +916,7 @@ }, "nixcord": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "nixpkgs": "nixpkgs_7", "systems": "systems_7", "treefmt-nix": "treefmt-nix" @@ -1036,22 +997,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1743367904, - "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1741708242, @@ -1232,7 +1177,6 @@ "inputs": { "agenix": "agenix", "automapaper": "automapaper", - "cosmic": "cosmic", "disko": "disko", "disqalculate": "disqalculate", "flurry": "flurry", @@ -1251,27 +1195,6 @@ } }, "rust-overlay": { - "inputs": { - "nixpkgs": [ - "cosmic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743388531, - "narHash": "sha256-OBcNE+2/TD1AMgq8HKMotSQF8ZPJEFGZdRoBJ7t/HIc=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "011de3c895927300651d9c2cb8e062adf17aa665", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "nixpkgs": [ "lazy", @@ -1293,7 +1216,7 @@ "type": "github" } }, - "rust-overlay_3": { + "rust-overlay_2": { "inputs": { "nixpkgs": [ "niri", diff --git a/flake.nix b/flake.nix index 7b46c09..90d8517 100644 --- a/flake.nix +++ b/flake.nix @@ -57,13 +57,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - cosmic = { - url = "github:lilyinstarlight/nixos-cosmic"; - inputs = { - nixpkgs.follows = "nixpkgs"; - }; - }; - niri = { url = "github:YaLTeR/niri"; }; @@ -103,7 +96,6 @@ modules = [ ./hosts/lambdaos/configuration.nix inputs.home-manager.nixosModules.default - inputs.cosmic.nixosModules.default inputs.agenix.nixosModules.default inputs.lix-module.nixosModules.default ]; diff --git a/hosts/lambdaos/configuration.nix b/hosts/lambdaos/configuration.nix index b40ab90..8e2d13c 100644 --- a/hosts/lambdaos/configuration.nix +++ b/hosts/lambdaos/configuration.nix @@ -105,7 +105,6 @@ acceleration = "cuda"; openFirewall = true; }; - desktopManager.cosmic.enable = false; fail2ban.enable = true; hardware = { openrgb = {