zaphyra's git: tgcNUR

fork of https://git.transgirl.cafe/zaphoid/tgc-nix-user-repository

commit ac795d98b5ce1f1d665e6baf2c5c256f7ea98edb
parent c44bf6ac743aab288a30bcbba081ddef2e7cc981
Author: emily lucy onyx reia yuki linfan ishikawa <elishikawa+git@jagudev.net>
Date: Tue, 5 Aug 2025 13:59:09 +0200

diggah

2 files changed, 67 insertions(+), 27 deletions(-)
M
flake.lock
|
44
+++++++++++++++++++++++++++++++++++++++++---
M
flake.nix
|
50
++++++++++++++++++++++++++------------------------
diff --git a/flake.lock b/flake.lock
@@ -1,5 +1,26 @@
 {
   "nodes": {
+    "emacs-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable"
+      },
+      "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"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"

@@ -20,11 +41,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1753345091,
-        "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=",
+        "lastModified": 1754292888,
+        "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9",
+        "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121",
         "type": "github"
       },
       "original": {

@@ -34,8 +55,25 @@
         "type": "github"
       }
     },
+    "nixpkgs-stable": {
+      "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"
+      }
+    },
     "root": {
       "inputs": {
+        "emacs-overlay": "emacs-overlay",
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }

diff --git a/flake.nix b/flake.nix
@@ -11,38 +11,40 @@
   };
 
   outputs =
-    inputs:
-    inputs.flake-utils.lib.eachSystem [ "aarch64-linux" "x86_64-linux" ] (
+    {
+      self,
+      nixpkgs,
+      flake-utils,
+      emacs-overlay
+    }:
+    (flake-utils.lib.eachSystem [ "aarch64-linux" "x86_64-linux" ] (
       system:
       let
-        lib = inputs.nixpkgs.lib;
-        pkgs = import inputs.nixpkgs {
+        pkgs = import nixpkgs {
           inherit system;
-          overlays = [ inputs.emacs-overlay.overlays.package ];
+          overlays = [ emacs-overlay.overlays.package ];
         };
-
-        packages = lib.mapAttrs (name: _: pkgs.callPackage ./pkgs/${name}/package.nix { }) (
+      in {
+        packages = nixpkgs.lib.mapAttrs (name: _: pkgs.callPackage ./pkgs/${name}/package.nix { }) (
           builtins.readDir ./pkgs
         );
 
-        overlay = final: prev: {
-          emivoid = packages;
-        };
-      in
-      rec {
-        overlays = {
-          default = overlay;
-        };
-
-        nixosModules = {
-          default = {
-            nixpkgs.overlays = [ overlay ];
+        formatter = pkgs.nixfmt-rfc-style;
+      }) // (
+        let
+          overlay = final: prev: {
+            emivoid = self.packages.${prev.system};
+          };
+        in {
+          overlays = {
+            default = overlay;
           };
-        };
-
-        inherit packages;
 
-        formatter = pkgs.nixfmt-rfc-style;
-      }
+          nixosModules = {
+            default = {
+              nixpkgs.overlays = [ overlay ];
+            };
+          };
+        })
     );
 }