jolheiser
/
jolheiser.com
mirror of https://git.jolheiser.com/jolheiser.com.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: jolheiser:51cb9f3126a869828278d7dd546012a7b1dcdeeb
Branches Tags
jolheiser:main
..
compare: jolheiser:91db581a2bc01eebdd376f79480476e97fcb9fb7
Branches Tags
jolheiser:main

No commits in common. "51cb9f3126a869828278d7dd546012a7b1dcdeeb" and "91db581a2bc01eebdd376f79480476e97fcb9fb7" have entirely different histories.
51cb9f3126 ... 91db581a2b

2 changed files with 81 additions and 68 deletions
Show Stats Expand all files Collapse all files

53
flake.lock
View File

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

56
flake.nix
View File

@ -1,59 +1,40 @@
{ {
inputs = { 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.url = "git+https://git.jojodev.com/jolheiser/tailwind-ctp";
tailwind-ctp-lsp.url = "git+https://git.jojodev.com/jolheiser/tailwind-ctp-intellisense"; tailwind-ctp-lsp.url = "git+https://git.jojodev.com/jolheiser/tailwind-ctp-intellisense";
}; };
outputs = outputs =
inputs: {
let self,
systems = [ flake-utils,
"x86_64-linux" nixpkgs,
"i686-linux" tailwind-ctp,
"x86_64-darwin" tailwind-ctp-lsp,
"aarch64-linux" }@inputs:
"armv6l-linux" flake-utils.lib.eachDefaultSystem (
"armv7l-linux"
];
forAllSystems =
f:
inputs.nixpkgs.lib.genAttrs systems (
system: system:
f { let
pkgs = import inputs.nixpkgs { pkgs = nixpkgs.legacyPackages.${system};
inherit system; tailwind-ctp = inputs.tailwind-ctp.packages.${system}.default;
overlays = [ inputs.self.overlays.default ]; tailwind-ctp-lsp = inputs.tailwind-ctp-lsp.packages.${system}.default;
};
}
);
in in
{ {
overlays.default = final: prev: { packages.default = pkgs.buildGoModule {
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"; pname = "jolheiser.com";
version = "site"; version = "site";
src = ./.; src = ./.;
vendorHash = inputs.nixpkgs.lib.fileContents ./go.mod.sri; vendorHash = nixpkgs.lib.fileContents ./go.mod.sri;
nativeBuildInputs = [ inputs.tailwind-ctp ]; nativeBuildInputs = [ tailwind-ctp ];
excludedPackages = "."; excludedPackages = ".";
postBuild = '' postBuild = ''
go generate go generate
mv dist $out mv dist $out
''; '';
}; };
} devShells.default = pkgs.mkShell {
);
devShells = forAllSystems (
{ pkgs }:
{
default = pkgs.mkShell {
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
go go
tailwind-ctp tailwind-ctp
@ -63,5 +44,4 @@
}; };
} }
); );
};
} }