1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69

diff --git a/flake.lock b/flake.lock
index 7ab83a56ee8684d980665f3b8295633e0bba14c3..3ee584f4a8abd3a68880830bbf2f29a3666f73d8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,34 +1,17 @@
 {
   "nodes": {
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1747144303,
-        "narHash": "sha256-6WZAP0wiFxH9EYnyLOl9kRKrxmWlRR1sBYFvUzP9adw=",
+        "lastModified": 1747060738,
+        "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a59b0f1dfd64ca1cf96f7a6e7338f430428c3c17",
+        "rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -67,25 +50,9 @@       }
     },
     "root": {
       "inputs": {
-        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs",
         "tailwind-ctp": "tailwind-ctp",
         "tailwind-ctp-lsp": "tailwind-ctp-lsp"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
       }
     },
     "tailwind-ctp": {

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110

diff --git a/flake.nix b/flake.nix
index 0dc781402a23d7cd2328b7ff1948fd046c1d581e..6b523df58dcae41945ec079f998a8648e01200fb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,47 +1,67 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs";
-    flake-utils.url = "github:numtide/flake-utils";
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     tailwind-ctp.url = "git+https://git.jojodev.com/jolheiser/tailwind-ctp";
     tailwind-ctp-lsp.url = "git+https://git.jojodev.com/jolheiser/tailwind-ctp-intellisense";
   };
 
   outputs =
+    inputs:
+    let
+      systems = [
+        "x86_64-linux"
+        "i686-linux"
+        "x86_64-darwin"
+        "aarch64-linux"
+        "armv6l-linux"
+        "armv7l-linux"
+      ];
+      forAllSystems =
+        f:
+        inputs.nixpkgs.lib.genAttrs systems (
+          system:
+          f {
+            pkgs = import inputs.nixpkgs {
+              inherit system;
+              overlays = [ inputs.self.overlays.default ];
+            };
+          }
+        );
+    in
     {
-      self,
-      flake-utils,
-      nixpkgs,
-      tailwind-ctp,
-      tailwind-ctp-lsp,
-    }@inputs:
-    flake-utils.lib.eachDefaultSystem (
-      system:
-      let
-        pkgs = nixpkgs.legacyPackages.${system};
-        tailwind-ctp = inputs.tailwind-ctp.packages.${system}.default;
-        tailwind-ctp-lsp = inputs.tailwind-ctp-lsp.packages.${system}.default;
-      in
-      {
-        packages.default = pkgs.buildGoModule {
-          pname = "jolheiser.com";
-          version = "site";
-          src = ./.;
-          vendorHash = nixpkgs.lib.fileContents ./go.mod.sri;
-          nativeBuildInputs = [ tailwind-ctp ];
-          excludedPackages = ".";
-          postBuild = ''
-            go generate
-            mv dist $out
-          '';
-        };
-        devShells.default = pkgs.mkShell {
-          nativeBuildInputs = with pkgs; [
-            go
-            tailwind-ctp
-            tailwind-ctp-lsp
-            vscode-langservers-extracted
-          ];
-        };
-      }
-    );
+      overlays.default = final: prev: {
+        tailwind-ctp = inputs.tailwind-ctp.packages.${prev.system}.default;
+        tailwind-ctp-lsp = inputs.tailwind-ctp-lsp.packages.${prev.system}.default;
+      };
+      packages = forAllSystems (
+        { pkgs }:
+        {
+          default = pkgs.buildGoModule {
+            pname = "jolheiser.com";
+            version = "site";
+            src = ./.;
+            vendorHash = inputs.nixpkgs.lib.fileContents ./go.mod.sri;
+            nativeBuildInputs = [ inputs.tailwind-ctp ];
+            excludedPackages = ".";
+            postBuild = ''
+              go generate
+              mv dist $out
+            '';
+          };
+        }
+      );
+      devShells = forAllSystems (
+        { pkgs }:
+        {
+          default = pkgs.mkShell {
+            nativeBuildInputs = with pkgs; [
+              go
+              tailwind-ctp
+              tailwind-ctp-lsp
+              vscode-langservers-extracted
+            ];
+          };
+        }
+      );
+    };
 }