commit 328996676f09e23a1420fd210ca01ffca9e508d8
parent 5119d3922948d688242511955bf3f01d86c78ea0
Author: Katja Ramona Sophie Kwast (zaphyra) <git@zaphyra.eu>
Date: Thu, 21 Aug 2025 21:14:09 +0200
parent 5119d3922948d688242511955bf3f01d86c78ea0
Author: Katja Ramona Sophie Kwast (zaphyra) <git@zaphyra.eu>
Date: Thu, 21 Aug 2025 21:14:09 +0200
flake: add `tgcNUR`
2 files changed, 75 insertions(+), 9 deletions(-)
diff --git a/flake.lock b/flake.lock @@ -223,6 +223,28 @@ "url": "https://git.zaphyra.eu/dns.nix" } }, + "emacs-overlay": { + "inputs": { + "nixpkgs": [ + "tgcNUR", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_3" + }, + "locked": { + "lastModified": 1754361940, + "narHash": "sha256-2KROQdENN8Ix5kiBZRM8FQP1KiJDikKPTiaaExYdVAY=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "a9a667084c0cf89081842d3002aef7b4829980aa", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -929,6 +951,22 @@ "type": "github" } }, + "nixpkgs-stable_3": { + "locked": { + "lastModified": 1751274312, + "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgsUnstable": { "locked": { "lastModified": 1755268003, @@ -1058,6 +1096,7 @@ "simpleNixosMailserverUnstable": "simpleNixosMailserverUnstable", "sopsNix": "sopsNix", "stagit": "stagit", + "tgcNUR": "tgcNUR", "things": "things", "zaphyraWebsite": "zaphyraWebsite" } @@ -1245,6 +1284,30 @@ "url": "https://git.zaphyra.eu/stagit" } }, + "tgcNUR": { + "inputs": { + "emacs-overlay": "emacs-overlay", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgsUnstable": [ + "nixpkgsUnstable" + ] + }, + "locked": { + "lastModified": 1755801617, + "narHash": "sha256-52zA06TkzXCmAyU/ClaUIkif8OAxYZe/PujwrYRr7J4=", + "ref": "refs/heads/main", + "rev": "1f167e7ae841569f4a8bc6ed3834e26bcc534855", + "revCount": 37, + "type": "git", + "url": "https://git.transgirl.cafe/zaphyra/tgc-nix-user-repository" + }, + "original": { + "type": "git", + "url": "https://git.transgirl.cafe/zaphyra/tgc-nix-user-repository" + } + }, "things": { "inputs": { "nixpkgs": [
diff --git a/flake.nix b/flake.nix @@ -16,13 +16,7 @@ let nixpkgsLib = inputs.nixpkgs.lib; unstableNixpkgsLib = inputs.nixpkgsUnstable.lib; - - forAllSystems = - function: - (nixpkgsLib.genAttrs [ - "x86_64-linux" - "aarch64-linux" - ] (system: function inputs.nixpkgs.legacyPackages."${system}")); + tgcLib = inputs.tgcNUR.lib; transformer = name: value: @@ -43,7 +37,7 @@ nixpkgsLib.filterAttrs (key: value: nixpkgsLib.hasSuffix "linux" key) inputs.deploy-rs.lib ); - formatter = forAllSystems (pkgs: pkgs.nixfmt-rfc-style); + formatter = tgcLib.forAllSystems { body = pkgs: pkgs.nixfmt-rfc-style; }; resources = loadDir [ (inputs.haumea.lib.matchers.always pathLoader) @@ -53,7 +47,7 @@ (inputs.haumea.lib.matchers.always pathLoader) ] ./secrets; - packages = forAllSystems (pkgs: (loadDir (pkgsLoader pkgs) ./packages)); + packages = tgcLib.forAllSystems { body = pkgs: loadDir (pkgsLoader pkgs) ./packages; }; nixosModules.default = ./config/nixosModules.nix; @@ -76,6 +70,8 @@ inputs.things.overlays.default inputs.mqttWebUI.overlays.default inputs.airpodsctl.overlays.default + inputs.tgcNUR.overlays.default + inputs.tgcNUR.overlays.tuigreet (final: prev: { sherlock-launcher = inputs.sherlock.packages.${prev.system}.default; }) ]; @@ -131,6 +127,7 @@ inputs.lanzaboote.nixosModules.lanzaboote inputs.sopsNix.nixosModules.sops inputs.grapevine.nixosModules.default + inputs.tgcNUR.nixosModules.default inputs.things.nixosModules.default inputs.self.nixosModules.default @@ -305,6 +302,12 @@ flake-parts.follows = "flakeParts"; }; + tgcNUR.url = "git+https://git.transgirl.cafe/zaphyra/tgc-nix-user-repository"; + tgcNUR.inputs = { + nixpkgs.follows = "nixpkgs"; + nixpkgsUnstable.follows = "nixpkgsUnstable"; + }; + zaphyraWebsite.url = "git+https://git.zaphyra.eu/website"; zaphyraWebsite.inputs.nixpkgs.follows = "nixpkgs";