From 2f7221b4338b6dc6cae49f29cc05409eca5fc5cb Mon Sep 17 00:00:00 2001 From: Madeleine Sydney Date: Mon, 10 Mar 2025 15:16:47 -0600 Subject: [PATCH] refactor: Nix things... --- flake.lock | 136 ++------------------------ flake.nix | 1 - hosts/nixos-testbed/configuration.nix | 4 +- 3 files changed, 10 insertions(+), 131 deletions(-) diff --git a/flake.lock b/flake.lock index 57c3995..1526e45 100755 --- a/flake.lock +++ b/flake.lock @@ -4,7 +4,7 @@ "inputs": { "devshell": "devshell", "nix-fetcher-data": "nix-fetcher-data", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1732920288, @@ -204,62 +204,6 @@ "type": "github" } }, - "niri": { - "inputs": { - "niri-stable": "niri-stable", - "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_5", - "nixpkgs-stable": "nixpkgs-stable_2", - "xwayland-satellite-stable": "xwayland-satellite-stable", - "xwayland-satellite-unstable": "xwayland-satellite-unstable" - }, - "locked": { - "lastModified": 1738583235, - "narHash": "sha256-Tk5w3uqp045W/W0mDQT0swwy90ex0l3JWS2crimG8Wo=", - "owner": "sodiboo", - "repo": "niri-flake", - "rev": "1511396846427b58f1d6ca5442a228ede7673c67", - "type": "github" - }, - "original": { - "owner": "sodiboo", - "repo": "niri-flake", - "type": "github" - } - }, - "niri-stable": { - "flake": false, - "locked": { - "lastModified": 1736614405, - "narHash": "sha256-AJ1rlgNOPb3/+DbS5hkhm21t6Oz8IgqLllwmZt0lyzk=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "e05bc269e678ecf828b96ae79c991c13b00b38a5", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "ref": "v25.01", - "repo": "niri", - "type": "github" - } - }, - "niri-unstable": { - "flake": false, - "locked": { - "lastModified": 1738579367, - "narHash": "sha256-820QsR/C9+Gyn3v65LHNwwW7KxSA6u6MQtky3SUrZ3A=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "553b1ba85256e2cb290e8a67f709a14e603606bc", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "repo": "niri", - "type": "github" - } - }, "nix-fetcher-data": { "inputs": { "flake-parts": "flake-parts_2", @@ -326,22 +270,6 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1738435198, - "narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1737879851, @@ -391,22 +319,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1738517419, "narHash": "sha256-tttEXgKimgbtPvxFl+Avos4P4lssIqxHhxpLbbvNekk=", @@ -422,7 +334,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1731763621, "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", @@ -438,7 +350,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1728492678, "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", @@ -454,7 +366,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1737632463, "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=", @@ -499,8 +411,7 @@ "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", "impermanence": "impermanence", - "niri": "niri", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nur": "nur", "sops-nix": "sops-nix", "sydnix-cli": "sydnix-cli" @@ -508,7 +419,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1738291974, @@ -528,7 +439,7 @@ "inputs": { "clj-nix": "clj-nix", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1739936838, @@ -576,39 +487,6 @@ "repo": "treefmt-nix", "type": "github" } - }, - "xwayland-satellite-stable": { - "flake": false, - "locked": { - "lastModified": 1730166465, - "narHash": "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "a713cf46cb7db84a0d1b57c3a397c610cad3cf98", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "ref": "v0.5", - "repo": "xwayland-satellite", - "type": "github" - } - }, - "xwayland-satellite-unstable": { - "flake": false, - "locked": { - "lastModified": 1737837494, - "narHash": "sha256-wIMowP8Juas4ZwMRcpc+58sZ0kKTDu8fm13THPmv/F8=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "3944c9a0e40e5629f16ad023bbc90dac80d35a0f", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 2e3d2af..0b99bac 100755 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,6 @@ # We're using my branch until #6259 is merged. home-manager.url = "github:msyds/home-manager/service-mpdscribble"; # home-manager.url = "path:///persist/dots/DELETE-ME/home-manager"; - niri.url = "github:sodiboo/niri-flake"; sops-nix.url = "github:Mic92/sops-nix"; sydnix-cli.url = "path:///persist/dots/scripts/sydnix-cli"; copyparty.url = "github:9001/copyparty"; diff --git a/hosts/nixos-testbed/configuration.nix b/hosts/nixos-testbed/configuration.nix index 3be0196..195b0bb 100755 --- a/hosts/nixos-testbed/configuration.nix +++ b/hosts/nixos-testbed/configuration.nix @@ -104,6 +104,9 @@ nix = { settings = { + trusted-users = [ + "@wheel" + ]; substituters = [ "https://cache.deertopia.net" "https://nix-community.cachix.org" @@ -111,7 +114,6 @@ ]; trusted-public-keys = [ (builtins.readFile ../../public-keys/deertopia-cache.pub.pem) - "binarycache.example.com-1:dsafdafDFW123fdasfa123124FADSAD" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ]; };