flake.lock

@@ -1,28 +1,45 @@
 {
   "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1747060738,
+        "lastModified": 1728680019,
-        "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=",
+        "narHash": "sha256-CoGRd1UPU14eJjBzv+z8ieaoJD+HU1muHELcfXyxuLA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1",
+        "rev": "09dae2b06e0d9cc30217c19930e83c077e4fa195",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1695806987,
+        "lastModified": 1741037377,
-        "narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=",
+        "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f3dab3509afca932f3f4fd0908957709bb1c1f57",
+        "rev": "02032da4af073d0f6110540c8677f16d4be0117f",
         "type": "github"
       },
       "original": {
@@ -34,11 +51,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1699343069,
+        "lastModified": 1741037377,
-        "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=",
+        "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d",
+        "rev": "02032da4af073d0f6110540c8677f16d4be0117f",
         "type": "github"
       },
       "original": {
@@ -50,11 +67,27 @@
     },
     "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": {
       "inputs": {
         "nixpkgs": "nixpkgs_2"

flake.nix

@@ -1,67 +1,47 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs";
+    flake-utils.url = "github:numtide/flake-utils";
     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
     {
-      overlays.default = final: prev: {
+      self,
-        tailwind-ctp = inputs.tailwind-ctp.packages.${prev.system}.default;
+      flake-utils,
-        tailwind-ctp-lsp = inputs.tailwind-ctp-lsp.packages.${prev.system}.default;
+      nixpkgs,
-      };
+      tailwind-ctp,
-      packages = forAllSystems (
+      tailwind-ctp-lsp,
-        { pkgs }:
+    }@inputs:
-        {
+    flake-utils.lib.eachDefaultSystem (
-          default = pkgs.buildGoModule {
+      system:
-            pname = "jolheiser.com";
+      let
-            version = "site";
+        pkgs = nixpkgs.legacyPackages.${system};
-            src = ./.;
+        tailwind-ctp = inputs.tailwind-ctp.packages.${system}.default;
-            vendorHash = inputs.nixpkgs.lib.fileContents ./go.mod.sri;
+        tailwind-ctp-lsp = inputs.tailwind-ctp-lsp.packages.${system}.default;
-            nativeBuildInputs = [ inputs.tailwind-ctp ];
+      in
-            excludedPackages = ".";
+      {
-            postBuild = ''
+        packages.default = pkgs.buildGoModule {
-              go generate
+          pname = "jolheiser.com";
-              mv dist $out
+          version = "site";
-            '';
+          src = ./.;
-          };
+          vendorHash = nixpkgs.lib.fileContents ./go.mod.sri;
-        }
+          nativeBuildInputs = [ tailwind-ctp ];
-      );
+          excludedPackages = ".";
-      devShells = forAllSystems (
+          postBuild = ''
-        { pkgs }:
+            go generate
-        {
+            mv dist $out
-          default = pkgs.mkShell {
+          '';
-            nativeBuildInputs = with pkgs; [
+        };
-              go
+        devShells.default = pkgs.mkShell {
-              tailwind-ctp
+          nativeBuildInputs = with pkgs; [
-              tailwind-ctp-lsp
+            go
-              vscode-langservers-extracted
+            tailwind-ctp
-            ];
+            tailwind-ctp-lsp
-          };
+            vscode-langservers-extracted
-        }
+          ];
-      );
+        };
-    };
+      }
+    );
 }