From 48754bffe9557528b298fedaece6f706f685fedb Mon Sep 17 00:00:00 2001 From: Gustav Bruhn Date: Wed, 7 May 2025 08:51:20 +0200 Subject: [PATCH] 104 current 2025-05-07 08:51:13 25.05.20250505.3730d8a 6.12.26 * --- flake.lock | 115 ++++----------------------------------- flake.nix | 17 ------ modules/nixos/cosmic.nix | 7 --- 3 files changed, 10 insertions(+), 129 deletions(-) diff --git a/flake.lock b/flake.lock index a78be40..a8cc22a 100644 --- a/flake.lock +++ b/flake.lock @@ -1,21 +1,5 @@ { "nodes": { - "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" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -23,11 +7,11 @@ ] }, "locked": { - "lastModified": 1746413188, - "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=", + "lastModified": 1746585355, + "narHash": "sha256-p+3fK8HEYC+0q4gPKSE4OSRxqt5H/tWZkB9wF7aaWOY=", "owner": "nix-community", "repo": "home-manager", - "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a", + "rev": "35535345be0be7dbae2e9b787c6cf790f8c893d5", "type": "github" }, "original": { @@ -36,34 +20,13 @@ "type": "github" } }, - "nixos-cosmic": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1746443341, - "narHash": "sha256-A8nBRKoGW0eO/6mlg+suUHOBVIcaaukbftohSGmOkEY=", - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "rev": "db1f7e1101a89af1ad17cbee0b2c0e8b0352c3a2", - "type": "github" - }, - "original": { - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "type": "github" - } - }, "nixos-hardware": { "locked": { - "lastModified": 1746427242, - "narHash": "sha256-KvZ6G5sdBdcrglsqcOx8BT6NpHVMVHc8wssMRhv/+1g=", + "lastModified": 1746468201, + "narHash": "sha256-hSOSlrvMJwGr8hX/gc0mnhUf5UIClMDUAadfXlSXzfc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a4bb30a9000cf0444ecc8fdca8096d072f77f9e8", + "rev": "6aabf68429c0a414221d1790945babfb6a0bd068", "type": "github" }, "original": { @@ -75,43 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746328495, - "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1746422338, - "narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1746328495, - "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", + "lastModified": 1746461020, + "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", + "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", "type": "github" }, "original": { @@ -124,37 +55,11 @@ "root": { "inputs": { "home-manager": "home-manager", - "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", - "nixpgs": [ - "nixos-cosmic", - "nixpkgs" - ], - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "zen-browser": "zen-browser" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1746412651, - "narHash": "sha256-wwyhceL2urIUIhHtTS8QmRtxAigPBBnTWalxYf5h1uI=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "ce79bb52eb023f71a03e88cb36c66f35c6668a95", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "zen-browser": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 8af0ab1..6293ff6 100644 --- a/flake.nix +++ b/flake.nix @@ -3,8 +3,6 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpgs.follows = "nixos-cosmic/nixpkgs"; - nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; zen-browser.url = "github:youwen5/zen-browser-flake"; zen-browser.inputs.nixpkgs.follows = "nixpkgs"; @@ -18,7 +16,6 @@ outputs = { self, nixpkgs, - nixos-cosmic, nixos-hardware, ... } @ inputs: { @@ -29,13 +26,6 @@ modules = [ ./hosts/framework/configuration.nix inputs.home-manager.nixosModules.default - { - nix.settings = { - substituters = ["https://cosmic.cachix.org/"]; - trusted-public-keys = ["cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="]; - }; - } - nixos-cosmic.nixosModules.default nixos-hardware.nixosModules.framework-13-7040-amd ]; }; @@ -44,13 +34,6 @@ modules = [ ./hosts/desktop/configuration.nix inputs.home-manager.nixosModules.default - { - nix.settings = { - substituters = ["https://cosmic.cachix.org/"]; - trusted-public-keys = ["cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="]; - }; - } - nixos-cosmic.nixosModules.default ]; }; }; diff --git a/modules/nixos/cosmic.nix b/modules/nixos/cosmic.nix index 7ba753c..a490ccb 100644 --- a/modules/nixos/cosmic.nix +++ b/modules/nixos/cosmic.nix @@ -9,11 +9,4 @@ }; environment.sessionVariables.COSMIC_DATA_CONTROLL_ENABLED = 1; - services.geoclue2.enable = true; - systemd.packages = [pkgs.observatory]; - systemd.services.monitord.wantedBy = ["multi-user.target"]; - - environment.systemPackages = with pkgs; [ - observatory - ]; }