From 1f2dc23c0006f341be6fb58c27e901bababd9665 Mon Sep 17 00:00:00 2001 From: Malte Tammena Date: Thu, 8 Dec 2022 12:07:35 +0100 Subject: [PATCH] Update lockfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Updated input 'cataclysm-dda': 'github:CleverRaven/Cataclysm-DDA/5a82316ecf75eacac29dd6580ef152aee5e7d159' (2022-09-23) → 'github:CleverRaven/Cataclysm-DDA/8e428ca5f21fb868b7eb6aa8380d1fcdbb960bd8' (2022-12-08) • Updated input 'colmena': 'github:zhaofengli/colmena/a8e6b999cfec9fadc2ca81994da44182e73be7eb' (2022-09-21) → 'github:zhaofengli/colmena/64c46fa0169233d4faed70c52583cd3183c7f5aa' (2022-12-01) • Added input 'colmena/flake-utils': 'github:numtide/flake-utils/c0e246b9b83f637f4681389ecabcb2681b4f3af0' (2022-08-07) • Updated input 'colmena/nix-eval-jobs/flake-utils': 'github:numtide/flake-utils/c0e246b9b83f637f4681389ecabcb2681b4f3af0' (2022-08-07) → follows 'colmena/flake-utils' • Updated input 'colmena/stable': 'github:NixOS/nixpkgs/879121648fe522b38cc1cf75aef160a14a1f2e7b' (2022-08-14) → 'github:NixOS/nixpkgs/731cc710aeebecbf45a258e977e8b68350549522' (2022-11-29) • Removed input 'colmena/utils' • Updated input 'fenix': 'github:nix-community/fenix/3c8bbc1d99e241efa29df54658615d7f8344c01f' (2022-09-23) → 'github:nix-community/fenix/e7941faba7f6cd0a6058330ad8c40d8dc52d741c' (2022-12-08) • Updated input 'fenix/rust-analyzer-src': 'github:rust-lang/rust-analyzer/5b49745d009634170493a214364261e36228274b' (2022-09-20) → 'github:rust-lang/rust-analyzer/6e8a54d0f68702cf7981c8299357838eb0f4d5b2' (2022-12-07) • Updated input 'home-manager': 'github:nix-community/home-manager/bd83eab6220226085c82e637931a7ae3863d9893' (2022-09-22) → 'github:nix-community/home-manager/2af0d07678fc15612345e0dd55337550dcf6465f' (2022-12-05) • Updated input 'home-manager/utils': 'github:numtide/flake-utils/c0e246b9b83f637f4681389ecabcb2681b4f3af0' (2022-08-07) → 'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02) • Updated input 'hydra': 'github:NixOS/hydra/53335323ae79ca1a42643f58e520b376898ce641' (2022-09-22) → 'github:NixOS/hydra/d1fac69c213002721971cd983e2576b784677d40' (2022-12-05) • Updated input 'jovian-nixos': 'github:Jovian-Experiments/Jovian-NixOS/cc896be6a3ebbccf04e7e07e89b666fa091a846a' (2022-11-14) → 'github:Jovian-Experiments/Jovian-NixOS/6d70c2fda85377e1fd7f2ede9ac82ff02dfeb0d5' (2022-12-04) • Updated input 'nickel': 'github:tweag/nickel/12298a821c46459aa3651b5645a4c69340a25cd4' (2022-09-21) → 'github:tweag/nickel/6110c7f61e46f39e57503889b8f699de8ef3d41e' (2022-12-07) • Added input 'nickel/crane': 'github:ipetkov/crane/24591d5f8cc979f7b243b88a2d39da09976970ad' (2022-11-28) • Added input 'nickel/crane/flake-compat': 'github:edolstra/flake-compat/b4a34015c698c7793d592d66adbab377907a2be8' (2022-04-19) • Added input 'nickel/crane/flake-utils': 'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02) • Added input 'nickel/crane/nixpkgs': follows 'nickel/nixpkgs' • Added input 'nickel/crane/rust-overlay': 'github:oxalica/rust-overlay/cf668f737ac986c0a89e83b6b2e3c5ddbd8cf33b' (2022-11-03) • Added input 'nickel/crane/rust-overlay/flake-utils': follows 'nickel/crane/flake-utils' • Added input 'nickel/crane/rust-overlay/nixpkgs': follows 'nickel/crane/nixpkgs' • Updated input 'nickel/flake-utils': 'github:numtide/flake-utils/c0e246b9b83f637f4681389ecabcb2681b4f3af0' (2022-08-07) → 'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02) • Updated input 'nickel/pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/8cb8ea5f1c7bc2984f460587fddd5f2e558f6eb8' (2022-08-18) → 'github:cachix/pre-commit-hooks.nix/2597510df32efafda4d05f5122efe612a7a5da66' (2022-12-03) • Added input 'nickel/pre-commit-hooks/flake-compat': 'github:edolstra/flake-compat/009399224d5e398d03b22badca40a37ac85412a1' (2022-11-17) • Added input 'nickel/pre-commit-hooks/gitignore': 'github:hercules-ci/gitignore.nix/a20de23b925fd8264fd7fad6454652e142fd7f73' (2022-08-14) • Added input 'nickel/pre-commit-hooks/gitignore/nixpkgs': follows 'nickel/pre-commit-hooks/nixpkgs' • Added input 'nickel/pre-commit-hooks/nixpkgs-stable': 'github:NixOS/nixpkgs/cf63ade6f74bbc9d2a017290f1b2e33e8fbfa70a' (2022-11-20) • Updated input 'nickel/rust-overlay': 'github:oxalica/rust-overlay/8ac6d40380dc4ec86f1ff591d5c14c8ae1d77a18' (2022-09-03) → 'github:oxalica/rust-overlay/a0d5773275ecd4f141d792d3a0376277c0fc0b65' (2022-12-03) • Updated input 'nix-colors': 'github:Misterio77/nix-colors/787b9599227dbf09847e3b3d23187b88ba14e14a' (2022-09-21) → 'github:Misterio77/nix-colors/fcd345bd1c9e7c203c3320ee6ca39814c97ac1fe' (2022-12-05) • Updated input 'nix-colors/base16-schemes': 'github:base16-project/base16-schemes/7c247f734eac7f04518c6e28d098635ee8dcabf5' (2022-06-10) → 'github:tinted-theming/base16-schemes/a3dc916cf90471a422c0bfe1bb4b1bdd12185ced' (2022-10-13) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/a0df6cd6e199df4a78c833c273781ea92fa62cfb' (2022-09-15) → 'github:NixOS/nixos-hardware/9d87bc030a0bf3f00e953dbf095a7d8e852dab6b' (2022-12-04) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/d6490a0bd9dfb298fcd8382d3363b86870dc7340' (2022-09-21) → 'github:NixOS/nixpkgs/6e51c97f1c849efdfd4f3b78a4870e6aa2da4198' (2022-12-05) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/f6259c8daf197480297c33a442d78175b8b417b2' (2022-09-22) → 'github:nix-community/nixpkgs-wayland/5097457af8e9dcf45a68fa892716919ad28e545a' (2022-12-08) • Removed input 'nixpkgs-wayland/cachix' • Updated input 'nixpkgs-wayland/flake-compat': 'github:edolstra/flake-compat/b4a34015c698c7793d592d66adbab377907a2be8' (2022-04-19) → 'github:edolstra/flake-compat/009399224d5e398d03b22badca40a37ac85412a1' (2022-11-17) • Updated input 'nixpkgs-wayland/lib-aggregate': 'github:nix-community/lib-aggregate/05a081a254f4bc7ca026a6ebdcf9864170208bc3' (2022-09-18) → 'github:nix-community/lib-aggregate/c0f784c05c85422cd7d532fd1a630ba5e8f2348f' (2022-12-04) • Updated input 'nixpkgs-wayland/lib-aggregate/flake-utils': 'github:numtide/flake-utils/c0e246b9b83f637f4681389ecabcb2681b4f3af0' (2022-08-07) → 'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02) • Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib': 'github:nix-community/nixpkgs.lib/30286fa7fb374fa3ffc80ac35eb7fadf572ae357' (2022-09-18) → 'github:nix-community/nixpkgs.lib/77e67cb65014fb75c1c8ccfec60e9bd8b7d02c94' (2022-12-04) • Added input 'nixpkgs-wayland/nix-eval-jobs': 'github:nix-community/nix-eval-jobs/6117ef2024f679d5c52876031880b752f2be4517' (2022-12-08) • Added input 'nixpkgs-wayland/nix-eval-jobs/flake-utils': 'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02) • Added input 'nixpkgs-wayland/nix-eval-jobs/nixpkgs': follows 'nixpkgs-wayland/nixpkgs' • Updated input 'qmk-udev-rules': 'github:qmk/qmk_firmware/3b7aeddc4dea42f9c7850b2a39661349d0b1352e' (2022-09-22) → 'github:qmk/qmk_firmware/bb3d694875e4b02d0befee60853d3f5997acabb8' (2022-12-07) • Updated input 'sops-nix': 'github:Mic92/sops-nix/bae718a9d1e31ec478ddfcb75149f66e9625a825' (2022-09-18) → 'github:Mic92/sops-nix/da98a111623101c64474a14983d83dad8f09f93d' (2022-12-04) • Removed input 'sops-nix/nixpkgs-22_05' • Added input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/86370507cb20c905800527539fc049a2bf09c667' (2022-12-04) --- flake.lock | 413 ++++++++++++++++++++++++++------------- flake.nix | 2 +- hosts/cornu-aspersum.nix | 4 +- hosts/faunus-ater.nix | 16 +- modules/grafana.nix | 22 +-- modules/radicale.nix | 13 -- pkgs/helix.nix | 6 +- users/malte/broot.nix | 2 +- users/malte/home.nix | 2 +- users/malte/kitty.nix | 1 + users/malte/mpv.nix | 2 +- users/marie/home.nix | 2 +- 12 files changed, 310 insertions(+), 175 deletions(-) diff --git a/flake.lock b/flake.lock index 5d685bf..75f6742 100644 --- a/flake.lock +++ b/flake.lock @@ -19,43 +19,27 @@ "base16-schemes": { "flake": false, "locked": { - "lastModified": 1654895891, - "narHash": "sha256-xYYmZkHnyLCUBAkqkZ7v1Lc5m39857MukQLMRtGuvdk=", - "owner": "base16-project", + "lastModified": 1665690101, + "narHash": "sha256-J2ZvNaVFkqaTXzYO5L+jyRORfIOavFPKvWItP6UTMKs=", + "owner": "tinted-theming", "repo": "base16-schemes", - "rev": "7c247f734eac7f04518c6e28d098635ee8dcabf5", + "rev": "a3dc916cf90471a422c0bfe1bb4b1bdd12185ced", "type": "github" }, "original": { - "owner": "base16-project", + "owner": "tinted-theming", "repo": "base16-schemes", "type": "github" } }, - "cachix": { - "locked": { - "lastModified": 1659446231, - "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-21.11", - "repo": "nixpkgs", - "type": "github" - } - }, "cataclysm-dda": { "flake": false, "locked": { - "lastModified": 1663912514, - "narHash": "sha256-XjfXG/PnQUPHGVgmVw33jyYNpkkRA3OpKkVtCmYK1+k=", + "lastModified": 1670479840, + "narHash": "sha256-0en/OLMvCBp1zV6cf2g50Yv4ne2ivxf+d3qDMDgDgZQ=", "owner": "CleverRaven", "repo": "Cataclysm-DDA", - "rev": "5a82316ecf75eacac29dd6580ef152aee5e7d159", + "rev": "8e428ca5f21fb868b7eb6aa8380d1fcdbb960bd8", "type": "github" }, "original": { @@ -67,19 +51,19 @@ "colmena": { "inputs": { "flake-compat": "flake-compat", + "flake-utils": "flake-utils", "nix-eval-jobs": "nix-eval-jobs", "nixpkgs": [ "nixpkgs" ], - "stable": "stable", - "utils": "utils" + "stable": "stable" }, "locked": { - "lastModified": 1663742427, - "narHash": "sha256-1gcXLVbZRVbRfNo6bHemNxdnEBgs6W0QPw675/uso3w=", + "lastModified": 1669917327, + "narHash": "sha256-YYjaNOUJZaM5t35GbWtfX825TlI9LAksbfdhaCYWmfY=", "owner": "zhaofengli", "repo": "colmena", - "rev": "a8e6b999cfec9fadc2ca81994da44182e73be7eb", + "rev": "64c46fa0169233d4faed70c52583cd3183c7f5aa", "type": "github" }, "original": { @@ -88,6 +72,30 @@ "type": "github" } }, + "crane": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nickel", + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1669605882, + "narHash": "sha256-TiQtL5sUI5rp28S63v+VX25qNjcrc8Xeu+shf3g7Tj4=", + "owner": "ipetkov", + "repo": "crane", + "rev": "24591d5f8cc979f7b243b88a2d39da09976970ad", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "custom-udev-rules": { "locked": { "lastModified": 1629206028, @@ -209,11 +217,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1663915940, - "narHash": "sha256-6P/xwD2wi05gb3lliwWyhdtK9vKdt7VcZlKFTerd7Ek=", + "lastModified": 1670480689, + "narHash": "sha256-DADoR6R7DpnQaZjuUr6Z5EeNxr9ClP6u3Oqf7PpS9yA=", "owner": "nix-community", "repo": "fenix", - "rev": "3c8bbc1d99e241efa29df54658615d7f8344c01f", + "rev": "e7941faba7f6cd0a6058330ad8c40d8dc52d741c", "type": "github" }, "original": { @@ -254,6 +262,38 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -271,11 +311,11 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -286,11 +326,11 @@ }, "flake-utils_3": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -300,6 +340,36 @@ } }, "flake-utils_4": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -314,6 +384,28 @@ "type": "github" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "nickel", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "glados": { "inputs": { "nixCargoIntegration": "nixCargoIntegration_3" @@ -338,14 +430,14 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils_2" + "utils": "utils" }, "locked": { - "lastModified": 1663835995, - "narHash": "sha256-XNHQ+mdHbjNR1Oit00SFAEcrAZoCS08E7uAFcVMtwhM=", + "lastModified": 1670280307, + "narHash": "sha256-3x+0whP1nCz5adQMIsBA3L9fI/ABOpRUJdbw0AmxBnU=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd83eab6220226085c82e637931a7ae3863d9893", + "rev": "2af0d07678fc15612345e0dd55337550dcf6465f", "type": "github" }, "original": { @@ -365,11 +457,11 @@ ] }, "locked": { - "lastModified": 1663856502, - "narHash": "sha256-mt7he0xQdkde+sjkI8r+Q9dCq86nITP74hnnynd0E4M=", + "lastModified": 1670258926, + "narHash": "sha256-HVsp+BPjEDS1lR7sjplWNrNljHvYcaUiaAn8gGNAMxU=", "owner": "NixOS", "repo": "hydra", - "rev": "53335323ae79ca1a42643f58e520b376898ce641", + "rev": "d1fac69c213002721971cd983e2576b784677d40", "type": "github" }, "original": { @@ -396,11 +488,11 @@ "jovian-nixos": { "flake": false, "locked": { - "lastModified": 1668438481, - "narHash": "sha256-veNykk0yVAXYMf/XLVDp4pVXyVEeM6hhk5HXBmWDFgM=", + "lastModified": 1670112157, + "narHash": "sha256-zu3F3EBUca8LqQcc2PVrzT1lGpqSjxDlYiG1wIrj0kQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "cc896be6a3ebbccf04e7e07e89b666fa091a846a", + "rev": "6d70c2fda85377e1fd7f2ede9ac82ff02dfeb0d5", "type": "github" }, "original": { @@ -411,15 +503,15 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1663503058, - "narHash": "sha256-wagaFmv4qvsMO9A4kqGgfxsaRu71IecB9oKjDMss8u0=", + "lastModified": 1670155750, + "narHash": "sha256-42o7/LiCRPUd2eCnN576a973NfWcBrqURMTlKkOJafc=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "05a081a254f4bc7ca026a6ebdcf9864170208bc3", + "rev": "c0f784c05c85422cd7d532fd1a630ba5e8f2348f", "type": "github" }, "original": { @@ -465,20 +557,21 @@ }, "nickel": { "inputs": { - "flake-utils": "flake-utils_2", + "crane": "crane", + "flake-utils": "flake-utils_3", "import-cargo": "import-cargo", "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks", - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1663777338, - "narHash": "sha256-jFU43XDwTfaRK7sZa/gtPBdQJlRUxXzyMksVzQcudZU=", + "lastModified": 1670425837, + "narHash": "sha256-zRb0IpZPMsfmLkn3CZ+/tSIox0hpbJ6r0vvY1mWZJ84=", "owner": "tweag", "repo": "nickel", - "rev": "12298a821c46459aa3651b5645a4c69340a25cd4", + "rev": "6110c7f61e46f39e57503889b8f699de8ef3d41e", "type": "github" }, "original": { @@ -492,11 +585,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1663788796, - "narHash": "sha256-L5R8t88fI6XtHVW32vlXzAenr/FoucOLzbKHOQrLNhM=", + "lastModified": 1670210028, + "narHash": "sha256-2VpxobYICB+l6n963nR37r0ongTtvHfHQvsPGgMWDmw=", "owner": "Misterio77", "repo": "nix-colors", - "rev": "787b9599227dbf09847e3b3d23187b88ba14e14a", + "rev": "fcd345bd1c9e7c203c3320ee6ca39814c97ac1fe", "type": "github" }, "original": { @@ -507,7 +600,10 @@ }, "nix-eval-jobs": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": [ + "colmena", + "flake-utils" + ], "nixpkgs": [ "colmena", "nixpkgs" @@ -528,6 +624,28 @@ "type": "github" } }, + "nix-eval-jobs_2": { + "inputs": { + "flake-utils": "flake-utils_5", + "nixpkgs": [ + "nixpkgs-wayland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1670462645, + "narHash": "sha256-dneOybXzqQUF0Q7ywW24NXrbbbE0RWQeySrD9M8Xex0=", + "owner": "nix-community", + "repo": "nix-eval-jobs", + "rev": "6117ef2024f679d5c52876031880b752f2be4517", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-eval-jobs", + "type": "github" + } + }, "nixCargoIntegration": { "inputs": { "devshell": "devshell", @@ -637,11 +755,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1663229557, - "narHash": "sha256-1uU4nsDLXKG0AHc/VCsNBAEPkTA/07juYhcEWRb1O1E=", + "lastModified": 1670174919, + "narHash": "sha256-XdQr3BUnrvVLRFunLWrZORhwYHDG0+9jUUe0Jv1pths=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a0df6cd6e199df4a78c833c273781ea92fa62cfb", + "rev": "9d87bc030a0bf3f00e953dbf095a7d8e852dab6b", "type": "github" }, "original": { @@ -666,22 +784,6 @@ "type": "github" } }, - "nixpkgs-22_05": { - "locked": { - "lastModified": 1663433994, - "narHash": "sha256-Bpthhv1PdZRrIFct8KbHACNvOu9bsYAMEaqoH83cvqM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "17989edb05615c4f61803b9c427d80b84c289c6b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-22.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "lastModified": 1655599917, @@ -699,11 +801,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1663463003, - "narHash": "sha256-X2k3WagXicaNiBswEJz3PqznEtovp1fKbuAMUMOHzeg=", + "lastModified": 1670114968, + "narHash": "sha256-2a9m6wpsGKRpQdBh3B+aMVzfKzrOpu9+HbLXO1DNy7Y=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "30286fa7fb374fa3ffc80ac35eb7fadf572ae357", + "rev": "77e67cb65014fb75c1c8ccfec60e9bd8b7d02c94", "type": "github" }, "original": { @@ -728,21 +830,53 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1668984258, + "narHash": "sha256-0gDMJ2T3qf58xgcSbYoXiRGUkPWmKyr5C3vcathWhKs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cf63ade6f74bbc9d2a017290f1b2e33e8fbfa70a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1670146390, + "narHash": "sha256-XrEoDpuloRHHbUkbPnhF2bQ0uwHllXq3NHxtuVe/QK4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "86370507cb20c905800527539fc049a2bf09c667", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-wayland": { "inputs": { - "cachix": "cachix", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_4", "lib-aggregate": "lib-aggregate", + "nix-eval-jobs": "nix-eval-jobs_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1663876547, - "narHash": "sha256-x0c94E9sIjMkVcdlO5GpChp1uh0N2lWL5r2s9HKvO+k=", + "lastModified": 1670465161, + "narHash": "sha256-iJmBbuq2Wwq3U5bieqdB3ZNw728leZ7bQHl8pEgqY3s=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "f6259c8daf197480297c33a442d78175b8b417b2", + "rev": "5097457af8e9dcf45a68fa892716919ad28e545a", "type": "github" }, "original": { @@ -817,11 +951,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1663761423, - "narHash": "sha256-bDLXl2BVq7eIQz/8CduZI1SLyhG9u/CrckHd6f7bwPE=", + "lastModified": 1670242877, + "narHash": "sha256-jBLh7dRHnbfvPPA9znOC6oQfKrCPJ0El8Zoe0BqnCjQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6490a0bd9dfb298fcd8382d3363b86870dc7340", + "rev": "6e51c97f1c849efdfd4f3b78a4870e6aa2da4198", "type": "github" }, "original": { @@ -832,21 +966,24 @@ }, "pre-commit-hooks": { "inputs": { + "flake-compat": "flake-compat_3", "flake-utils": [ "nickel", "flake-utils" ], + "gitignore": "gitignore", "nixpkgs": [ "nickel", "nixpkgs" - ] + ], + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1660830093, - "narHash": "sha256-HUhx3a82C7bgp2REdGFeHJdhEAzMGCk3V8xIvfBqg1I=", + "lastModified": 1670078914, + "narHash": "sha256-oS3/KHb+S1Hf/PSqHAs8xVmvORRL3G2N+9hvX5uP1rI=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "8cb8ea5f1c7bc2984f460587fddd5f2e558f6eb8", + "rev": "2597510df32efafda4d05f5122efe612a7a5da66", "type": "github" }, "original": { @@ -858,11 +995,11 @@ "qmk-udev-rules": { "flake": false, "locked": { - "lastModified": 1663890741, - "narHash": "sha256-oTE5oSFmePsKbHQdC84YZyzi/RxziTonpCFrihR7JBQ=", + "lastModified": 1670446925, + "narHash": "sha256-O+dVFWhsJFBb5Fbq2KPWXwdFLhIMku1ZYU6my+nBkVo=", "owner": "qmk", "repo": "qmk_firmware", - "rev": "3b7aeddc4dea42f9c7850b2a39661349d0b1352e", + "rev": "bb3d694875e4b02d0befee60853d3f5997acabb8", "type": "github" }, "original": { @@ -928,17 +1065,17 @@ "radicale_infcloud": "radicale_infcloud", "rip": "rip", "sops-nix": "sops-nix", - "utils": "utils_3" + "utils": "utils_2" } }, "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1663689031, - "narHash": "sha256-ElrhxG+zwTOolSsSYtkyFK7MLZKkDi19LyQ6kExoprk=", + "lastModified": 1670426523, + "narHash": "sha256-Zh+pAuj4PmBmISXCz+54yVSwSXZwbn+ZELgM85xVUE0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "5b49745d009634170493a214364261e36228274b", + "rev": "6e8a54d0f68702cf7981c8299357838eb0f4d5b2", "type": "github" }, "original": { @@ -949,6 +1086,33 @@ } }, "rust-overlay": { + "inputs": { + "flake-utils": [ + "nickel", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "nickel", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1667487142, + "narHash": "sha256-bVuzLs1ZVggJAbJmEDVO9G6p8BH3HRaolK70KXvnWnU=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "cf668f737ac986c0a89e83b6b2e3c5ddbd8cf33b", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { "inputs": { "flake-utils": [ "nickel", @@ -960,11 +1124,11 @@ ] }, "locked": { - "lastModified": 1662173844, - "narHash": "sha256-+ZgW98Y8fZkgFSylE+Mzalumw+kw3SVivZznbJqQaj8=", + "lastModified": 1670034122, + "narHash": "sha256-EqmuOKucPWtMvCZtHraHr3Q3bgVszq1x2PoZtQkUuEk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8ac6d40380dc4ec86f1ff591d5c14c8ae1d77a18", + "rev": "a0d5773275ecd4f141d792d3a0376277c0fc0b65", "type": "github" }, "original": { @@ -1042,14 +1206,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-22_05": "nixpkgs-22_05" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1663475375, - "narHash": "sha256-uIhMyLFkU8Tp0uxLd7tKn++G/yHsB9r7YRvsBdoGvsk=", + "lastModified": 1670149631, + "narHash": "sha256-rwmtlxx45PvOeZNP51wql/cWjY3rqzIR3Oj2Y+V7jM0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "bae718a9d1e31ec478ddfcb75149f66e9625a825", + "rev": "da98a111623101c64474a14983d83dad8f09f93d", "type": "github" }, "original": { @@ -1060,27 +1224,27 @@ }, "stable": { "locked": { - "lastModified": 1660496378, - "narHash": "sha256-sgAhmrC1iSnl5T2VPPiMpciH1aRw5c7PYEdXX6jd6Gk=", + "lastModified": 1669735802, + "narHash": "sha256-qtG/o/i5ZWZLmXw108N2aPiVsxOcidpHJYNkT45ry9Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "879121648fe522b38cc1cf75aef160a14a1f2e7b", + "rev": "731cc710aeebecbf45a258e977e8b68350549522", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } }, "utils": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -1090,23 +1254,8 @@ } }, "utils_2": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_3": { "inputs": { - "flake-utils": "flake-utils_4" + "flake-utils": "flake-utils_6" }, "locked": { "lastModified": 1657226504, diff --git a/flake.nix b/flake.nix index c467d36..20535ed 100644 --- a/flake.nix +++ b/flake.nix @@ -127,7 +127,7 @@ nix.linkInputs = true; sharedOverlays = [ - inputs.fenix.overlay + inputs.fenix.overlays.default inputs.colmena.overlay utils.overlay (self: super: { diff --git a/hosts/cornu-aspersum.nix b/hosts/cornu-aspersum.nix index bc3f198..0f45e8d 100644 --- a/hosts/cornu-aspersum.nix +++ b/hosts/cornu-aspersum.nix @@ -37,12 +37,12 @@ addr = "127.0.0.1"; auth.anonymous.enable = false; }; - services.nginx.virtualHosts.${config.services.grafana.domain} = { + services.nginx.virtualHosts.${config.services.grafana.settings.server.domain} = { enableACME = true; forceSSL = true; serverAliases = ["data.tammena.rocks"]; locations."/" = { - proxyPass = "http://127.0.0.1:${toString config.services.grafana.port}"; + proxyPass = "http://127.0.0.1:${toString config.services.grafana.settings.server.http_port}"; proxyWebsockets = true; }; }; diff --git a/hosts/faunus-ater.nix b/hosts/faunus-ater.nix index 8bc4dfd..a87b8cf 100644 --- a/hosts/faunus-ater.nix +++ b/hosts/faunus-ater.nix @@ -6,14 +6,12 @@ }: let sopsPath = key: config.sops.secrets.${key}.path; - scrapedExporters = - lib.attrsets.mapAttrsToList (expName: conf: { - job_name = expName; - static_configs = lib.singleton { - targets = lib.singleton "localhost:${builtins.toString conf.port}"; - }; - }) - config.services.prometheus.exporters; + scrapedExporters = lib.attrsets.mapAttrsToList (expName: conf: { + job_name = expName; + static_configs = lib.singleton { + targets = lib.singleton "localhost:${builtins.toString conf.port}"; + }; + }); mkVirtHost = lib.attrsets.recursiveUpdate { addSSL = true; @@ -288,7 +286,7 @@ in { disabledCollectors = ["diskstats"]; }; }; - scrapeConfigs = scrapedExporters; + scrapeConfigs = scrapedExporters {inherit (config.services.prometheus.exporters) fritzbox node;}; }; systemd.services."prometheus-fritzbox-exporter".serviceConfig.EnvironmentFile = sopsPath "fritzbox-exporter-env"; # TODO: Yikes diff --git a/modules/grafana.nix b/modules/grafana.nix index d89b09f..b51daee 100644 --- a/modules/grafana.nix +++ b/modules/grafana.nix @@ -39,18 +39,18 @@ in { config = lib.mkIf cfg.enable { # === Grafana === services.grafana = { - security.adminPasswordFile = cfg.grafana.adminPasswordFile; enable = true; - domain = "stats.home"; - port = 9387; - addr = "[::1]"; - auth.anonymous.enable = true; - extraOptions = { - DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH = "${grafanaDashboards}/grafana-dashboard-home.json"; + settings = { + dashboards.default_home_dashboard_path = "${grafanaDashboards}/grafana-dashboard-home.json"; + security.admin_password = "$__file{${cfg.grafana.adminPasswordFile}}"; + "auth.anonymous".enabled = true; + server.domain = "stats.home"; + server.http_port = 9387; + server.http_add = "[::1]"; }; provision = { enable = true; - datasources = [ + datasources.settings.datasources = [ { name = "local-prometheus"; type = "prometheus"; @@ -59,7 +59,7 @@ in { isDefault = true; } ]; - dashboards = [ + dashboards.settings.providers = [ { name = "Dashboards"; options.path = grafanaDashboards; @@ -69,12 +69,12 @@ in { }; # === Nginx === - services.nginx.virtualHosts.${config.services.grafana.domain} = { + services.nginx.virtualHosts.${config.services.grafana.settings.server.domain} = { inherit (cfg.nginx) listenAddresses sslCertificate sslCertificateKey; addSSL = true; sslTrustedCertificate = pkgs.writeText "ca.crt" (builtins.readFile ../secrets/ca.crt); locations."/" = { - proxyPass = "http://[::1]:${toString config.services.grafana.port}"; + proxyPass = "http://[::1]:${toString config.services.grafana.settings.server.http_port}"; proxyWebsockets = true; }; }; diff --git a/modules/radicale.nix b/modules/radicale.nix index 5b5134f..4f37d8a 100644 --- a/modules/radicale.nix +++ b/modules/radicale.nix @@ -15,19 +15,8 @@ inherit (lock.nodes.radicale_infcloud.locked) owner repo rev; sha256 = lock.nodes.radicale_infcloud.locked.narHash; }; - # Remove depend on radicale to fix infinite recursion - # and set some of my own settings - patches = (old.patches or []) ++ [../patches/radicale_infcloud.patch]; }); - overlay = self: super: { - radicale = super.radicale.overrideAttrs (old: { - propagatedBuildInputs = - old.propagatedBuildInputs - ++ [radicale_infcloud]; - }); - }; - htpasswd_filename = "/etc/radicale/users"; in { options.services."radicaleWithInfcloud" = with lib; { @@ -36,8 +25,6 @@ in { }; config = lib.mkIf cfg.enable { - nixpkgs.overlays = [overlay]; - services.radicale = { enable = true; settings = { diff --git a/pkgs/helix.nix b/pkgs/helix.nix index 1eb2137..ee778d4 100644 --- a/pkgs/helix.nix +++ b/pkgs/helix.nix @@ -6,17 +6,17 @@ }: rustPlatform.buildRustPackage rec { pname = "helix"; - version = "22.08.1"; + version = "22.12"; # This release tarball includes source code for the tree-sitter grammars, # which is not ordinarily part of the repository. src = fetchzip { url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz"; - sha256 = "sha256-pqAhUxKeFN7eebVdNN3Ge38sA30SUSu4Xn4HDZAjjyY="; + sha256 = "sha256-En6SOyAPNPPzDGdm2XTjbGG0NQFGBVzjjoyCbdnHFao="; stripRoot = false; }; - cargoSha256 = "sha256-idItRkymr+cxk3zv2mPBR/frCGvzEUdSAhY7gghfR3M="; + cargoSha256 = "sha256-oSS0LkLg2JSRLYoF0+FVQzFUJtFuVKtU2MWYenmFC0s="; nativeBuildInputs = [makeWrapper]; diff --git a/users/malte/broot.nix b/users/malte/broot.nix index ec7486a..ba4fdf4 100644 --- a/users/malte/broot.nix +++ b/users/malte/broot.nix @@ -2,7 +2,7 @@ programs.broot = { enable = true; enableFishIntegration = true; - skin = { + settings.skin = { # TODO: Fix all these colors, make them dependent on config.colors default = "rgb(235, 219, 178) rgb(40, 40, 40) / rgb(189, 174, 147) rgb(40, 40, 40)"; tree = "rgb(168, 153, 132) None / rgb(102, 92, 84) None"; diff --git a/users/malte/home.nix b/users/malte/home.nix index 9efd4d5..069e150 100644 --- a/users/malte/home.nix +++ b/users/malte/home.nix @@ -77,7 +77,7 @@ in { home = { packages = [ - pkgs.polymc + pkgs.prismlauncher pkgs.jq pkgs.mosh pkgs.wl-clipboard diff --git a/users/malte/kitty.nix b/users/malte/kitty.nix index da40f6c..5ea242b 100644 --- a/users/malte/kitty.nix +++ b/users/malte/kitty.nix @@ -25,6 +25,7 @@ in { enable_audio_bell = "no"; #touch_scroll_multiplier = "10.0"; allow_remote_control = "yes"; + remember_window_size = false; }; extraConfig = '' diff --git a/users/malte/mpv.nix b/users/malte/mpv.nix index 1a115f4..1cd61c0 100644 --- a/users/malte/mpv.nix +++ b/users/malte/mpv.nix @@ -7,7 +7,7 @@ in { programs.mpv = { enable = true; - package = pkgs.mpv-with-scripts; + package = pkgs.mpv; config = { sub-color = "#fcc437"; sub-border-color = "#${colDark.base00}"; diff --git a/users/marie/home.nix b/users/marie/home.nix index 7baa83f..ba40087 100644 --- a/users/marie/home.nix +++ b/users/marie/home.nix @@ -46,7 +46,7 @@ in { programs.mpv = { enable = true; - package = pkgs.mpv-with-scripts; + package = pkgs.mpv; }; dconf.settings = {