diff --git a/config/default.nix b/config/default.nix index e3cb94f1..d66bec4f 100644 --- a/config/default.nix +++ b/config/default.nix @@ -72,7 +72,7 @@ in swappy stylua typstfmt - typst + typst-dev ] ++ [ # gcc # glibc diff --git a/flake.lock b/flake.lock index 83fb27e3..47ccdf90 100644 --- a/flake.lock +++ b/flake.lock @@ -35,6 +35,27 @@ "type": "github" } }, + "crane": { + "inputs": { + "nixpkgs": [ + "typst", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1698166613, + "narHash": "sha256-y4rdN4flxRiROqNi1waMYIZj/Fs7L2OrszFk/1ry9vU=", + "owner": "ipetkov", + "repo": "crane", + "rev": "b7db46f0f1751f7b1d1911f6be7daf568ad5bc65", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "emacs-overlay": { "inputs": { "flake-utils": "flake-utils_2", @@ -113,6 +134,23 @@ "type": "indirect" } }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -271,6 +309,24 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1696019113, + "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1705331948, @@ -319,13 +375,30 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1698318101, + "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "bob": "bob", "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", "neovim-nightly-overlay": "neovim-nightly-overlay", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_3", + "typst": "typst" } }, "systems": { @@ -372,6 +445,42 @@ "repo": "default", "type": "github" } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "typst": { + "inputs": { + "crane": "crane", + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_4", + "systems": "systems_4" + }, + "locked": { + "lastModified": 1705584441, + "narHash": "sha256-xTat1Xc46hSLy7rkNnSnqgnB4YVvG6EkL6vpsWHcUv0=", + "owner": "typst", + "repo": "typst", + "rev": "f27321b269e8e258cdb1322ed399c22711bbfaa8", + "type": "github" + }, + "original": { + "owner": "typst", + "repo": "typst", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 2e1d5c2a..0725fbb2 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + typst.url = "github:typst/typst"; bob = { url = "path:./pkgs/bob-nvim"; inputs.nixpkgs.follows = "nixpkgs"; @@ -30,6 +31,7 @@ nixpkgs.overlays = [ inputs.neovim-nightly-overlay.overlay inputs.emacs-overlay.overlays.emacs + inputs.typst.overlays.default (self: super: { kanagawa-gtk-theme = super.callPackage ./pkgs/kanagawa-gtk { }; lxappearance = super.lxappearance.overrideAttrs (oldAttrs: {