From 57696b49c7eaebc884703a5555307e83cad1e7b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 11 Oct 2023 23:16:30 +0200 Subject: Add typst --- flake.lock | 176 ++++++++++------------------------------------ flake.nix | 2 - nixos/modules/desktop.nix | 4 ++ 3 files changed, 42 insertions(+), 140 deletions(-) diff --git a/flake.lock b/flake.lock index 57f60ab..cbad0a4 100644 --- a/flake.lock +++ b/flake.lock @@ -42,22 +42,6 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -225,11 +209,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1696529394, - "narHash": "sha256-0yTod159EDVHqb0CgYk+6GEJ7rnuueE52cQY8YL7YTo=", + "lastModified": 1696868698, + "narHash": "sha256-JaEEgRKz88EsNaQrsTY83t/7W/9W9XokBaZ6Qb3LUds=", "ref": "refs/heads/master", - "rev": "8ff2ed61ee94abd8a14c6c16e523ec9b71f60786", - "revCount": 3198, + "rev": "abe1b03fd19b55d1fcd55c2fb087e2a126de2dca", + "revCount": 3209, "submodules": true, "type": "git", "url": "http://jessie.elektroline.cz/elektroline/flatlineng.git" @@ -264,7 +248,7 @@ "libshv": { "inputs": { "flake-utils": "flake-utils_8", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1695376977, @@ -282,46 +266,10 @@ "url": "https://github.com/silicon-heaven/libshv.git" } }, - "lowdown-src": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, - "nix": { - "inputs": { - "flake-compat": "flake-compat", - "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_3", - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1696671022, - "narHash": "sha256-Qs9hVi4sKOsvV3YjKJK16hF/XF4PZ8l7XzAipjyWMPU=", - "owner": "NixOS", - "repo": "nix", - "rev": "c29b8ba142a0650d1182ca838ddc1b2d273dcd2a", - "type": "github" - }, - "original": { - "id": "nix", - "type": "indirect" - } - }, "nixbigclown": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1680946769, @@ -337,20 +285,6 @@ "type": "github" } }, - "nixos-hardware": { - "locked": { - "lastModified": 1696614066, - "narHash": "sha256-nAyYhO7TCr1tikacP37O9FnGr2USOsVBD3IgvndUYjM=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "bb2db418b616fea536b1be7f6ee72fb45c11afe0", - "type": "github" - }, - "original": { - "id": "nixos-hardware", - "type": "indirect" - } - }, "nixpkgs": { "locked": { "lastModified": 1677676435, @@ -367,37 +301,7 @@ "type": "github" } }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "nixpkgs_10": { - "locked": { - "lastModified": 1694032533, - "narHash": "sha256-I8cfCV/4JNJJ8KHOTxTU1EphKT8ARSb4s9pq99prYV0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "efd23a1c9ae8c574e2ca923c2b2dc336797f4cc4", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1682109806, "narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=", @@ -411,7 +315,7 @@ "type": "indirect" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1637875414, "narHash": "sha256-Ica++SXFuLyxX9Q7YxhfZulUif6/gwM8AEQYlUxqSgE=", @@ -426,7 +330,7 @@ "type": "indirect" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1696419054, "narHash": "sha256-EdR+dIKCfqL3voZUDYwcvgRDOektQB9KbhBVcE0/3Mo=", @@ -455,22 +359,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1695283060, - "narHash": "sha256-CJz71xhCLlRkdFUSQEL0pIAAfcnWFXMzd9vXhPrnrEg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "31ed632c692e6a36cfc18083b88ece892f863ed4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1679319606, "narHash": "sha256-wyEMIZB6BnsmJWInEgDZu66hXVMGJEZFl5uDsn27f9M=", @@ -484,13 +372,13 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1696729975, - "narHash": "sha256-Bgm3GFrNftDwDbnNYvKzeX1jW5euOLif5ZsvYsYYq30=", + "lastModified": 1696874314, + "narHash": "sha256-Tdq3pVF1We5rX5sI6IsyFmh0pHQmpS6GQBdaBdH0FkY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0cbdedb436366db9863df099a934306028ed21ca", + "rev": "38aa96fc39c9719994f08100f791c27d31ee7892", "type": "github" }, "original": { @@ -500,7 +388,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1679734080, "narHash": "sha256-z846xfGLlon6t9lqUzlNtBOmsgQLQIZvR6Lt2dImk1M=", @@ -514,7 +402,7 @@ "type": "indirect" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1678875422, "narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=", @@ -528,7 +416,7 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1696419054, "narHash": "sha256-EdR+dIKCfqL3voZUDYwcvgRDOektQB9KbhBVcE0/3Mo=", @@ -542,7 +430,7 @@ "type": "indirect" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1694948089, "narHash": "sha256-d2B282GmQ9o8klc22/Rbbbj6r99EnELQpOQjWMyv0rU=", @@ -556,10 +444,24 @@ "type": "indirect" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1694032533, + "narHash": "sha256-I8cfCV/4JNJJ8KHOTxTU1EphKT8ARSb4s9pq99prYV0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "efd23a1c9ae8c574e2ca923c2b2dc336797f4cc4", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nixturris": { "inputs": { "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1680711275, @@ -594,7 +496,7 @@ "inputs": { "flake-utils": "flake-utils_7", "libshv": "libshv", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1696323749, @@ -616,10 +518,8 @@ "agenix": "agenix", "flake-utils": "flake-utils", "flatline": "flatline", - "nix": "nix", "nixbigclown": "nixbigclown", - "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixturris": "nixturris", "personal-secret": "personal-secret", "shellrc": "shellrc", @@ -633,7 +533,7 @@ "shellrc": { "inputs": { "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1679654704, @@ -652,7 +552,7 @@ "shvcli": { "inputs": { "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "pyshv": "pyshv" }, "locked": { @@ -673,7 +573,7 @@ "shvspy": { "inputs": { "flake-utils": "flake-utils_9", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1696253966, @@ -693,7 +593,7 @@ }, "sterm": { "inputs": { - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1661025608, @@ -817,7 +717,7 @@ "usbkey": { "inputs": { "flake-utils": "flake-utils_10", - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1696631236, diff --git a/flake.nix b/flake.nix index a073bb1..7325120 100644 --- a/flake.nix +++ b/flake.nix @@ -22,8 +22,6 @@ outputs = { self, nixpkgs, - nix, - nixos-hardware, flake-utils, shellrc, ... diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix index 3697ec8..30f59eb 100644 --- a/nixos/modules/desktop.nix +++ b/nixos/modules/desktop.nix @@ -140,6 +140,10 @@ in { # Writing texlive.combined.scheme-full + typst + typst-fmt + typst-live + typst-lsp vale # Gnome utils -- cgit v1.2.3