From d2d2aa398f933c57e9376dff9c5b4a343bc96b41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sun, 20 Oct 2024 17:07:42 +0200 Subject: [PATCH] nix: +y-combinator-wallpaper --- flake.lock | 218 ++++++++++++++++-- flake.nix | 5 + nix/packages/default.nix | 16 ++ .../lesbian-y-combinator-wallpaper/main.typ | 13 ++ 4 files changed, 230 insertions(+), 22 deletions(-) create mode 100644 nix/packages/lesbian-y-combinator-wallpaper/main.typ diff --git a/flake.lock b/flake.lock index d252af3f..9d8cebab 100644 --- a/flake.lock +++ b/flake.lock @@ -172,6 +172,22 @@ "type": "github" } }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -194,6 +210,24 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, + "locked": { + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_3" + }, "locked": { "lastModified": 1726153070, "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", @@ -208,9 +242,9 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" + "nixpkgs-lib": "nixpkgs-lib_4" }, "locked": { "lastModified": 1717285511, @@ -226,9 +260,9 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_5": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_4" + "nixpkgs-lib": "nixpkgs-lib_5" }, "locked": { "lastModified": 1726153070, @@ -244,9 +278,9 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_6": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_5" + "nixpkgs-lib": "nixpkgs-lib_6" }, "locked": { "lastModified": 1714641030, @@ -280,10 +314,30 @@ "type": "github" } }, + "flakies": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_3", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1728841639, + "narHash": "sha256-KoluZAdepn1rYIn3dBgW+cZKC3aZQNaCXcPH7WwnBrE=", + "ref": "refs/heads/mistress", + "rev": "04ae607c42af2ed045cfbdfafc2be716b4e78cea", + "revCount": 195, + "type": "git", + "url": "https://git.earth2077.fr/leana/flakies" + }, + "original": { + "type": "git", + "url": "https://git.earth2077.fr/leana/flakies" + } + }, "gitignore": { "inputs": { "nixpkgs": [ - "hoot", + "flakies", "pre-commit-hooks", "nixpkgs" ] @@ -303,6 +357,28 @@ } }, "gitignore_2": { + "inputs": { + "nixpkgs": [ + "hoot", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_3": { "inputs": { "nixpkgs": [ "pre-commit-hooks", @@ -325,7 +401,7 @@ }, "hbrainfuck": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "nixpkgs": [ "nixpkgs-stable" ] @@ -388,11 +464,11 @@ }, "hoot": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "nixpkgs": [ "nixpkgs-stable" ], - "pre-commit-hooks": "pre-commit-hooks" + "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { "lastModified": 1725814891, @@ -492,6 +568,18 @@ } }, "nixpkgs-lib_2": { + "locked": { + "lastModified": 1717284937, + "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" + } + }, + "nixpkgs-lib_3": { "locked": { "lastModified": 1725233747, "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", @@ -503,7 +591,7 @@ "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" } }, - "nixpkgs-lib_3": { + "nixpkgs-lib_4": { "locked": { "lastModified": 1717284937, "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", @@ -515,7 +603,7 @@ "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" } }, - "nixpkgs-lib_4": { + "nixpkgs-lib_5": { "locked": { "lastModified": 1725233747, "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", @@ -527,7 +615,7 @@ "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" } }, - "nixpkgs-lib_5": { + "nixpkgs-lib_6": { "locked": { "lastModified": 1714640452, "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=", @@ -556,6 +644,22 @@ } }, "nixpkgs-stable_2": { + "locked": { + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { "locked": { "lastModified": 1717144377, "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", @@ -586,6 +690,21 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1717701820, + "narHash": "sha256-lOrhZEytJrYkFfJUTDUc6dPavvALrzsegE/LyxxQioI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cc84ae23024ebf651f254ed2c1c78d417f370ac3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1710765496, "narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=", @@ -601,7 +720,23 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { + "locked": { + "lastModified": 1710765496, + "narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e367f7a1fb93137af22a3908f00b9a35e2d286a7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1728909085, "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=", @@ -617,7 +752,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_7": { "locked": { "lastModified": 1706487304, "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", @@ -652,7 +787,7 @@ "inputs": { "flake-compat": "flake-compat_2", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -673,6 +808,27 @@ "inputs": { "flake-compat": "flake-compat_3", "gitignore": "gitignore_2", + "nixpkgs": "nixpkgs_5", + "nixpkgs-stable": "nixpkgs-stable_2" + }, + "locked": { + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks_3": { + "inputs": { + "flake-compat": "flake-compat_4", + "gitignore": "gitignore_3", "nixpkgs": [ "nixpkgs-stable" ], @@ -696,7 +852,7 @@ }, "prop-solveur": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_5", "nixpkgs": [ "nixpkgs-stable" ] @@ -723,23 +879,25 @@ "deploy-rs": "deploy-rs", "disko": "disko", "flake-parts": "flake-parts", + "flakies": "flakies", "hbrainfuck": "hbrainfuck", "home-manager": "home-manager_2", "hoot": "hoot", "neovim-pin": "neovim-pin", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs": "nixpkgs_6", + "nixpkgs-stable": "nixpkgs-stable_3", "nur": "nur", - "pre-commit-hooks": "pre-commit-hooks_2", + "pre-commit-hooks": "pre-commit-hooks_3", "prop-solveur": "prop-solveur", + "typst-packages": "typst-packages", "wired-notify": "wired-notify" } }, "rust-overlay": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1715393623, @@ -800,6 +958,22 @@ "type": "github" } }, + "typst-packages": { + "flake": false, + "locked": { + "lastModified": 1729252723, + "narHash": "sha256-xdaQYNw1GApaJnXJO4WnUTNuYeRXisxIUSuAzVXFEW4=", + "owner": "typst", + "repo": "packages", + "rev": "9bcf190c85da91be6df9f5fc25a93ce5812489cc", + "type": "github" + }, + "original": { + "owner": "typst", + "repo": "packages", + "type": "github" + } + }, "utils": { "inputs": { "systems": "systems" @@ -838,7 +1012,7 @@ }, "wired-notify": { "inputs": { - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_6", "nixpkgs": [ "nixpkgs-stable" ], diff --git a/flake.nix b/flake.nix index c84476ea..2b691ee7 100644 --- a/flake.nix +++ b/flake.nix @@ -68,6 +68,11 @@ url = "github:nix-community/disko?ref=v1.8.0"; inputs.nixpkgs.follows = "nixpkgs-stable"; }; + flakies.url = "git+https://git.earth2077.fr/leana/flakies"; + typst-packages = { + url = "github:typst/packages"; + flake = false; + }; # pins alt-ergo-pin.url = "github:nixos/nixpkgs/1b95daa381fa4a0963217a5d386433c20008208a"; neovim-pin.url = "github:nixos/nixpkgs/6132b0f6e344ce2fe34fc051b72fb46e34f668e0"; diff --git a/nix/packages/default.nix b/nix/packages/default.nix index 152cd9a2..237287af 100644 --- a/nix/packages/default.nix +++ b/nix/packages/default.nix @@ -2,10 +2,14 @@ self, lib, inputs, + + withSystem, ... }: { + imports = [ inputs.flakies.flakeModules.typstLib ]; + flake.lib.mkNerdFont = ./mkNerdFont.nix; flake.overlays.packages = @@ -71,6 +75,18 @@ ffgun = final.callPackage ./ffgun.nix { }; easyscan = final.callPackage ./easyscan.nix { }; + y-combinator-wallpaper = withSystem final.system ( + { typstLib, ... }: + typstLib.typstDerivation.overrideAttrs { + src = ./lesbian-y-combinator-wallpaper; + buildPhase = '' + runHook preBuild + typst compile main.typ "$out"/main.svg + ''; + dontFixup = true; + } + ); + # Unmerged packages from nixfinal # TODO: use upstream when merged dl-librescore = final.callPackage ./dl-librescore.nix { }; diff --git a/nix/packages/lesbian-y-combinator-wallpaper/main.typ b/nix/packages/lesbian-y-combinator-wallpaper/main.typ new file mode 100644 index 00000000..dcaa43b8 --- /dev/null +++ b/nix/packages/lesbian-y-combinator-wallpaper/main.typ @@ -0,0 +1,13 @@ +#set page(width: 3840pt, height: 2160pt, fill: black) +#set text(size: 2160pt / 16) +#set align(horizon + center) + +#import "@preview/stonewall:0.1.0": lesbian +#let y_combinator = $lambda f. space ( + lambda x. space f (x space x) space (lambda x. space f (x space x)) + )$ + +#text( + fill: gradient.linear(..(lesbian)), + y_combinator, +)