From d0b775774170d4e1e8da75f9d4f607cc0669957c Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Mon, 10 Mar 2025 15:00:40 +0100 Subject: [PATCH] eeeeeeeeeeee --- common.nix | 10 --- flake.lock | 251 ++++++++++++++++++++++++++++++++++------------------- flake.nix | 22 ++--- 3 files changed, 170 insertions(+), 113 deletions(-) diff --git a/common.nix b/common.nix index fef5517..764bee3 100644 --- a/common.nix +++ b/common.nix @@ -13,15 +13,6 @@ with lib; with builtins; { imports = [lix-module.nixosModules.default]; nix = { - package = pkgs.nixVersions.stable; - settings = { - extra-substituters = [ - "https://cache.lix.systems" - ]; - trusted-public-keys = [ - "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" - ]; - }; extraOptions = '' experimental-features = nix-command flakes keep-outputs = true @@ -66,7 +57,6 @@ with builtins; { cool-retro-term maven - zed-editor jetbrains.idea-ultimate jdk diff --git a/flake.lock b/flake.lock index 1162a64..02ae1c6 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,26 @@ "nodes": { "crane": { "locked": { - "lastModified": 1736566337, - "narHash": "sha256-SC0eDcZPqISVt6R0UfGPyQLrI0+BppjjtQ3wcSlk0oI=", + "lastModified": 1741481578, + "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=", "owner": "ipetkov", "repo": "crane", - "rev": "9172acc1ee6c7e1cbafc3044ff850c568c75a5a3", + "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_2": { + "locked": { + "lastModified": 1727060013, + "narHash": "sha256-/fC5YlJy4IoAW9GhkJiwyzk0K/gQd9Qi4rRcoweyG9E=", + "owner": "ipetkov", + "repo": "crane", + "rev": "6b40cc876c929bfe1e3a24bf538ce3b5622646ba", "type": "github" }, "original": { @@ -23,11 +38,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1736577158, - "narHash": "sha256-ngnAENZ+vmzOFgnj0EDtHj22nuH7MQB+EqzUmdbvaqA=", + "lastModified": 1741588215, + "narHash": "sha256-XTZ051fwGcDPtCUSb7gJv5BsUPYcvjH9mFjVZboMIKQ=", "owner": "nix-community", "repo": "fenix", - "rev": "05dcdb02ea657f81b13d99bd0ca36b09d25f4c43", + "rev": "49b0989891f48cbfe6fc288ea76c3efa84000ed5", "type": "github" }, "original": { @@ -36,28 +51,50 @@ "type": "github" } }, + "fenix_2": { + "inputs": { + "nixpkgs": [ + "typst-within", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src_2" + }, + "locked": { + "lastModified": 1727245890, + "narHash": "sha256-B4gUhZxqdn24PqL7z7ZuvLOS84HVskhKRByWdgA4/RI=", + "owner": "nix-community", + "repo": "fenix", + "rev": "de3acda8b67b92abeeb35ac236924afd959874ad", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1731533236, "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", @@ -87,31 +124,6 @@ "type": "github" } }, - "helix-inline-diags": { - "inputs": { - "crane": [ - "crane" - ], - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1736602937, - "narHash": "sha256-KVw1PMrxlC1m+FT99BQxOO2nG2zQ5xDCoDgH7u3kO8A=", - "owner": "helix-editor", - "repo": "helix", - "rev": "b26903cd13fdf8976bda43abbc5e85a50130d12f", - "type": "github" - }, - "original": { - "owner": "helix-editor", - "repo": "helix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -119,11 +131,11 @@ ] }, "locked": { - "lastModified": 1736508663, - "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", + "lastModified": 1741613526, + "narHash": "sha256-HUEfRLqCy47BQ7kOG4SRVhqE7J6lkFzAagnd13I17qk=", "owner": "nix-community", "repo": "home-manager", - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", + "rev": "3593ee59a44974b8518829a5239b2f77222e3c81", "type": "github" }, "original": { @@ -135,11 +147,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1733448312, - "narHash": "sha256-id5U81bzXk/Lg900nGLM4CQb0wmTdzIvQz7CZk2OcTM=", - "rev": "2a9e560570982a91937d199af3e7b7a8f3cbe14b", + "lastModified": 1738174211, + "narHash": "sha256-eYmp1mKM4kULV1W+EBtCPk6LmKWl2REivaYfGRl+AWo=", + "rev": "64e33a7e09a0d1faacf2fd3f6ebd647fe4d8346a", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2a9e560570982a91937d199af3e7b7a8f3cbe14b.tar.gz?rev=2a9e560570982a91937d199af3e7b7a8f3cbe14b" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/64e33a7e09a0d1faacf2fd3f6ebd647fe4d8346a.tar.gz?rev=64e33a7e09a0d1faacf2fd3f6ebd647fe4d8346a" }, "original": { "type": "tarball", @@ -148,7 +160,7 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "flakey-profile": "flakey-profile", "lix": "lix", "nixpkgs": [ @@ -156,11 +168,11 @@ ] }, "locked": { - "lastModified": 1733522213, - "narHash": "sha256-H+Pk19MzvI/TAbXWimUPZAoKkD56OSyxJBm8lVIA5n0=", + "lastModified": 1738176840, + "narHash": "sha256-NG3IRvRs3u3btVCN861FqHvgOwqcNT/Oy6PBG86F5/E=", "ref": "refs/heads/main", - "rev": "c374ebf5548c7b6d4bf884369a5b6879cfc916ea", - "revCount": 124, + "rev": "621aae0f3cceaffa6d73a4fb0f89c08d338d729e", + "revCount": 133, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -172,7 +184,7 @@ "mac-brcm-fw": { "flake": false, "locked": { - "lastModified": 1727366922, + "lastModified": 1735699162, "narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=", "path": "/home/jade/nix-configs/mac-brcm-fw", "type": "path" @@ -200,11 +212,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736344531, - "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "lastModified": 1741379970, + "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", "type": "github" }, "original": { @@ -213,13 +225,25 @@ "type": "indirect" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1725233747, + "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + } + }, "nixpkgs-stable": { "locked": { - "lastModified": 1736200483, - "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", + "lastModified": 1741445498, + "narHash": "sha256-F5Em0iv/CxkN5mZ9hRn3vPknpoWdcdCyR0e4WklHwiE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", + "rev": "52e3095f6d812b91b22fb7ad0bfc1ab416453634", "type": "github" }, "original": { @@ -230,11 +254,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1736603572, - "narHash": "sha256-yOZxepSF/z6ZDAOlJ3VZRIGOKfroa6CmOm2x6ud8S3s=", + "lastModified": 1741605585, + "narHash": "sha256-1bgzejf8fwsbzr/5cRK7jPArxf7xGyQqKsy05J5p05o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "376250fab39653e93864b4dfd9ab161751fbe430", + "rev": "77172a85a0cdca4a9cc2aed74de9bbb14c7c8e43", "type": "github" }, "original": { @@ -243,28 +267,44 @@ "type": "indirect" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1726937504, + "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9357f4f23713673f310988025d9dc261c20e70c6", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "crane": "crane", "fenix": "fenix", - "helix-inline-diags": "helix-inline-diags", "home-manager": "home-manager", "lix-module": "lix-module", "mac-brcm-fw": "mac-brcm-fw", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable-small": "nixpkgs-unstable-small" + "nixpkgs-unstable-small": "nixpkgs-unstable-small", + "typst-within": "typst-within" } }, "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1736517563, - "narHash": "sha256-YJ5ajpMsyXITc91ZfnI0Mdocd+tmCFkZ3BLozUkB44M=", + "lastModified": 1741517882, + "narHash": "sha256-MmYdZyVwKa3YHzqoHdHw9/jZXkDE/5M3M+7363t4Pkc=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "4f35021ca9a8e7f9ed4344139b9eaf770a2e5725", + "rev": "5e7dd31c80d5821113ed9c9aa1616a73a63b49a1", "type": "github" }, "original": { @@ -274,27 +314,35 @@ "type": "github" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "helix-inline-diags", - "nixpkgs" - ] - }, + "rust-analyzer-src_2": { + "flake": false, "locked": { - "lastModified": 1728268235, - "narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "25685cc2c7054efc31351c172ae77b21814f2d42", + "lastModified": 1727104575, + "narHash": "sha256-lB/ZS0SnHyE8Z3G8DIL/QJPg6w6x5ZhgVO2pBqnz89g=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "3d0343251fe084b335b55c17a52bb4a3527b1bd0", "type": "github" }, "original": { - "owner": "oxalica", - "repo": "rust-overlay", + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", "type": "github" } }, + "rust-manifest": { + "flake": false, + "locked": { + "narHash": "sha256-Yqu2/i9170R7pQhvOCR1f5SyFr7PcFbO6xcMr9KWruQ=", + "type": "file", + "url": "https://static.rust-lang.org/dist/channel-rust-1.83.0.toml" + }, + "original": { + "type": "file", + "url": "https://static.rust-lang.org/dist/channel-rust-1.83.0.toml" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -324,6 +372,29 @@ "repo": "default", "type": "github" } + }, + "typst-within": { + "inputs": { + "crane": "crane_2", + "fenix": "fenix_2", + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_2", + "rust-manifest": "rust-manifest", + "systems": "systems_2" + }, + "locked": { + "lastModified": 1739736913, + "narHash": "sha256-qVaWE+q1Npq8XbvrZ/c6ElU+F1u1YNf2a18X4RzVLoc=", + "owner": "schrottkatze", + "repo": "typst", + "rev": "5aa9b90a7b3e7f5ed964bf6727e445bdfc5211cd", + "type": "github" + }, + "original": { + "owner": "schrottkatze", + "repo": "typst", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 98b4fbc..c4c0b17 100644 --- a/flake.nix +++ b/flake.nix @@ -5,12 +5,8 @@ nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs-stable.url = "nixpkgs/nixos-24.11"; nixpkgs-unstable-small.url = "nixpkgs/nixos-unstable-small"; - helix-inline-diags = { - url = "github:helix-editor/helix"; - inputs = { - crane.follows = "crane"; - nixpkgs.follows = "nixpkgs"; - }; + typst-within = { + url = "github:schrottkatze/typst"; }; lix-module = { url = "git+https://git.lix.systems/lix-project/nixos-module"; @@ -39,8 +35,8 @@ nixpkgs, nixpkgs-stable, nixpkgs-unstable-small, - helix-inline-diags, lix-module, + typst-within, home-manager, nixos-hardware, mac-brcm-fw, @@ -94,7 +90,7 @@ nixosConfigurations = { monosodium-glutamate-g = nixpkgs.lib.nixosSystem { specialArgs = { - inherit inputs pkgs-unstable-small pkgs-stable rs-programs lix-module helix-inline-diags; + inherit inputs pkgs-unstable-small pkgs-stable rs-programs lix-module; }; system = "x86_64-linux"; modules = [ @@ -104,7 +100,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { - inherit pkgs-unstable-small pkgs-stable; + inherit pkgs-unstable-small pkgs-stable typst-within; }; home-manager.users.jade = { nixosConfig, @@ -119,7 +115,7 @@ }; denkbrett = nixpkgs.lib.nixosSystem { specialArgs = { - inherit inputs pkgs-unstable-small pkgs-stable rs-programs lix-module helix-inline-diags; + inherit inputs pkgs-unstable-small pkgs-stable rs-programs lix-module; }; system = "x86_64-linux"; modules = [ @@ -129,7 +125,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { - inherit pkgs-unstable-small pkgs-stable; + inherit pkgs-unstable-small pkgs-stable typst-within; }; home-manager.users.jade = { nixosConfig, @@ -144,7 +140,7 @@ }; potatobook-g = nixpkgs.lib.nixosSystem { specialArgs = { - inherit inputs pkgs-unstable-small rs-programs lix-module helix-inline-diags; + inherit inputs pkgs-unstable-small rs-programs lix-module; }; system = "x86_64-linux"; modules = [ @@ -155,7 +151,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { - inherit pkgs-unstable-small pkgs-stable; + inherit pkgs-unstable-small pkgs-stable typst-within; }; home-manager.users.jade = { nixosConfig,