From ac505934cfdebcf1f0430220223ff6b6565a395f Mon Sep 17 00:00:00 2001 From: "xyno (Philipp Hochkamp)" Date: Thu, 22 Jun 2023 17:17:56 +0200 Subject: [PATCH] update --- flake.lock | 318 ++++++++------------- flake.nix | 4 + hosts/beliskner/disk-config.nix | 8 +- hosts/beliskner/hardware-configuration.nix | 5 +- hosts/ds9/default.nix | 5 +- hosts/picard/default.nix | 7 + 6 files changed, 135 insertions(+), 212 deletions(-) diff --git a/flake.lock b/flake.lock index 1d82d872..45677b4e 100644 --- a/flake.lock +++ b/flake.lock @@ -68,11 +68,11 @@ ] }, "locked": { - "lastModified": 1685559570, - "narHash": "sha256-MNIQvLRoq92isMLR/ordKNCl+aXNiuwBM4QyqmS8d00=", + "lastModified": 1687385522, + "narHash": "sha256-GR8mqsqYcdZ67dCcII5SWcwHqPAJRWXPmqsuMl7+KA4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "4338bc869e9874d54a4c89539af72f16666b2abe", + "rev": "bc346a67d34a336ca3c507570875cc88038e6120", "type": "github" }, "original": { @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1687028856, - "narHash": "sha256-vKV3I31tmXwaWHiUOgfDVd27cEHqaPBr1lt9+NKdIp8=", + "lastModified": 1687431792, + "narHash": "sha256-ba5d/XlxQrgNrYeYhriX3FISBMVBF+nKVBMLE0/OC0Q=", "owner": "nix-community", "repo": "disko", - "rev": "64c9c78c15fd4c899d857bf09dba88bda771b43a", + "rev": "637d87df3fd265a1d1669d897ad9436a87fc5ad8", "type": "github" }, "original": { @@ -118,22 +118,6 @@ "type": "github" } }, - "flake-compat_2": { - "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-parts": { "inputs": { "nixpkgs-lib": [ @@ -160,11 +144,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1685546676, - "narHash": "sha256-XDbjJyAg6odX5Vj0Q22iI/gQuFvEkv9kamsSbQ+npaI=", + "lastModified": 1685662779, + "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "6ef2707776c6379bc727faf3f83c0dd60b06e0c6", + "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", "type": "github" }, "original": { @@ -182,11 +166,11 @@ ] }, "locked": { - "lastModified": 1680392223, - "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", + "lastModified": 1685662779, + "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", + "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", "type": "github" }, "original": { @@ -196,71 +180,35 @@ } }, "flake-utils": { - "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_2": { - "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" - } - }, - "gitignore": { "inputs": { - "nixpkgs": [ - "neovim-nightly-overlay", - "hercules-ci-effects", - "hercules-ci-agent", - "pre-commit-hooks-nix", - "nixpkgs" - ] + "systems": "systems" }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, "haskell-flake": { "locked": { - "lastModified": 1678745009, - "narHash": "sha256-ujfwSrkxThmHJozibkCnJmlXLVyxm+Cbo2Q4wXPbCS4=", + "lastModified": 1684780604, + "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=", "owner": "srid", "repo": "haskell-flake", - "rev": "26852ade574c712bc3912ad28de52b0c4cf7d4cb", + "rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2", "type": "github" }, "original": { "owner": "srid", - "ref": "0.2.0", + "ref": "0.3.0", "repo": "haskell-flake", "type": "github" } @@ -269,16 +217,14 @@ "inputs": { "flake-parts": "flake-parts_3", "haskell-flake": "haskell-flake", - "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs", - "pre-commit-hooks-nix": "pre-commit-hooks-nix" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1681758488, - "narHash": "sha256-RBd/RNq3wL52FvoajMwrnfyZPfq67KMzmp6rtNAx/2o=", + "lastModified": 1686721748, + "narHash": "sha256-ilD6ANYID+b0/+GTFbuZXfmu92bqVqY5ITKXSxqIp5A=", "owner": "hercules-ci", "repo": "hercules-ci-agent", - "rev": "ef296dd6211e2ffeb942f12e6232a2d9abdd488d", + "rev": "7192b83935ab292a8e894db590dfd44f976e183b", "type": "github" }, "original": { @@ -296,11 +242,11 @@ ] }, "locked": { - "lastModified": 1685557007, - "narHash": "sha256-0prbgwFJeBuLGJgNdOXCXQ8/oSamzkcNZYHr04ZXI2I=", + "lastModified": 1686830987, + "narHash": "sha256-1XLTM0lFr3NV+0rd55SQW/8oQ3ACnqlYcda3FelIwHU=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "6d8e62977dc34fd2c187879856ebb6cf1faabba9", + "rev": "04e4ab63b9eed2452edee1bb698827e1cb8265c6", "type": "github" }, "original": { @@ -337,11 +283,11 @@ ] }, "locked": { - "lastModified": 1685599623, - "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=", + "lastModified": 1687163790, + "narHash": "sha256-CmG/ZdswJrWM0CMgJiVyWfO6LqaI4SKEAx9IrnYDrpI=", "owner": "nix-community", "repo": "home-manager", - "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd", + "rev": "ac53777f52929bc82efcd2830bfc5aa60bcb4337", "type": "github" }, "original": { @@ -366,6 +312,26 @@ "type": "github" } }, + "lolpizza": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1687449709, + "narHash": "sha256-JgSojVqO92TKf0fBK1ObMtk65/ud7ClV02HEKRr0HS8=", + "owner": "thexyno", + "repo": "lolpizza2", + "rev": "81b4aa7f51fcc3e965fe8ddd23e0e0b196b66aee", + "type": "github" + }, + "original": { + "owner": "thexyno", + "repo": "lolpizza2", + "type": "github" + } + }, "miro": { "flake": false, "locked": { @@ -405,7 +371,7 @@ }, "neovim-flake": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_2" }, "locked": { @@ -435,11 +401,11 @@ ] }, "locked": { - "lastModified": 1685664325, - "narHash": "sha256-WDvtmEjaK0vqtedflBks4BjcQ59e0Lu3xuzDVjg9T9o=", + "lastModified": 1687392394, + "narHash": "sha256-v+4/kfFdshUC8XLsAWFfWhIyRgtrWuEGRmvKl1T0Imk=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "6718b0c1926848a14178776a3afe295d60362915", + "rev": "85e04471ff5c3223f454368e74d56e838551e27d", "type": "github" }, "original": { @@ -448,36 +414,13 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "neovim-nightly-overlay", - "hercules-ci-effects", - "hercules-ci-agent", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1680266963, - "narHash": "sha256-IW/lzbUCOcldLHWHjNSg1YoViDnZOmz0ZJL7EH9OkV8=", - "owner": "LnL7", - "repo": "nix-darwin", - "rev": "99d4187d11be86b49baa3a1aec0530004072374f", - "type": "github" - }, - "original": { - "owner": "LnL7", - "repo": "nix-darwin", - "type": "github" - } - }, "nixos-hardware": { "locked": { - "lastModified": 1684899633, - "narHash": "sha256-NtwerXX8UFsoNy6k+DukJMriWtEjQtMU/Urbff2O2Dg=", + "lastModified": 1686838567, + "narHash": "sha256-aqKCUD126dRlVSKV6vWuDCitfjFrZlkwNuvj5LtjRRU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4cc688ee711159b9bcb5a367be44007934e1a49d", + "rev": "429f232fe1dc398c5afea19a51aad6931ee0fb89", "type": "github" }, "original": { @@ -489,11 +432,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1680213900, - "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", + "lastModified": 1686501370, + "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", + "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519", "type": "github" }, "original": { @@ -505,11 +448,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1685672710, - "narHash": "sha256-9mK8qqabxgMefDNNkYzMpMqTs+X5XuoJ/1yNNW9t7P8=", + "lastModified": 1687354544, + "narHash": "sha256-1Xu+QzyA10AiY21i27Zu9bqQAaxXBacNKbGUA9OZy7Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac5281cce24fac6d98773c55c038f654b8e84cd4", + "rev": "876181e3ae452cc6186486f6f7300a8a6de237cb", "type": "github" }, "original": { @@ -522,11 +465,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1682879489, - "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=", + "lastModified": 1685564631, + "narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0", + "rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a", "type": "github" }, "original": { @@ -539,11 +482,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1685713966, - "narHash": "sha256-7ISfjYDu1apITjyHoVelNVNkEidoeW9BujLxQfCBAtU=", + "lastModified": 1687449221, + "narHash": "sha256-QGZY2fTxe2VVX3Q2HT3rwdIachxybtT5bWhEFHAPW/0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c7b43f679be2576ee851588d631ba0f99d4cbe9", + "rev": "f18eea4fb3c5125c2414c5d3f1e8f29644bb9d95", "type": "github" }, "original": { @@ -553,29 +496,13 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1678872516, - "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1685655444, - "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=", + "lastModified": 1686960236, + "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd", + "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", "type": "github" }, "original": { @@ -587,11 +514,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1685620773, - "narHash": "sha256-iQ+LmporQNdLz8uMJdP62TaAWeLUwl43/MYUBtWqulM=", + "lastModified": 1687288566, + "narHash": "sha256-VckkiJ88Gzdc2cstm0z5eFcrHbvkm4VjxavHBGssvZI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f0ba8235153dd2e25cf06cbf70d43efdd4443592", + "rev": "b6c73c5fe53bb3afbf65e870541e0645e9145171", "type": "github" }, "original": { @@ -604,11 +531,11 @@ "nnn-nvim": { "flake": false, "locked": { - "lastModified": 1685623574, - "narHash": "sha256-975Ixos2LF118zZSWey4ojAC97RiKxho0voThhu1o5Q=", + "lastModified": 1686184812, + "narHash": "sha256-iJTN1g5uoS6yj0CZ6Q5wsCAVYVim5zl4ObwVyLtJkQ0=", "owner": "luukvbaal", "repo": "nnn.nvim", - "rev": "c3e00b32c3924eb5755ae7ff6c76aeb2765dec84", + "rev": "4616ec65eb0370af548e356c3ec542c1b167b415", "type": "github" }, "original": { @@ -620,11 +547,11 @@ "noice-nvim": { "flake": false, "locked": { - "lastModified": 1685295910, - "narHash": "sha256-FGxpAZ8srLxdXitR1lYyWtWgLi9+WInyJXF6d1GJynU=", + "lastModified": 1687185524, + "narHash": "sha256-aeuLB2wMl892s5KOA3bq4K1DWBTcvXDRIR552MBeZIU=", "owner": "folke", "repo": "noice.nvim", - "rev": "7e358170cea2314d9768b3f63616e8fad186195e", + "rev": "39461475d9de676bccc338876689c9e5b44bc932", "type": "github" }, "original": { @@ -636,11 +563,11 @@ "notify-nvim": { "flake": false, "locked": { - "lastModified": 1683967791, - "narHash": "sha256-WMty/xWLWt1/+1i+dBaOSQExem8zl5zgfpYuub3BHBY=", + "lastModified": 1685978736, + "narHash": "sha256-Rr2tzuEr06M9ZbvQbC07qcxkyjFJFYdABwRpYelKBFI=", "owner": "rcarriga", "repo": "nvim-notify", - "rev": "f3024b912073774111202f5fa6518b0cd2a74432", + "rev": "ea9c8ce7a37f2238f934e087c255758659948e0f", "type": "github" }, "original": { @@ -684,11 +611,11 @@ "pandoc-latex-template": { "flake": false, "locked": { - "lastModified": 1681739697, - "narHash": "sha256-l7SGMjRIXnUm79nIP7PAvM/xeB3jBjoipRho37j+0Zo=", + "lastModified": 1686117293, + "narHash": "sha256-F00ydIr9wETJgAQ9HwyI8Ev+hvl3ptVI48uVPKL4sAo=", "owner": "Wandmalfarbe", "repo": "pandoc-latex-template", - "rev": "8114319d5c2c17f4d047ebf7ecddd20446b2518d", + "rev": "e31e8b2d69b69246a29c93074f6f049def9b358b", "type": "github" }, "original": { @@ -697,33 +624,6 @@ "type": "github" } }, - "pre-commit-hooks-nix": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils", - "gitignore": "gitignore", - "nixpkgs": [ - "neovim-nightly-overlay", - "hercules-ci-effects", - "hercules-ci-agent", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1680170909, - "narHash": "sha256-FtKU/edv1jFRr/KwUxWTYWXEyj9g8GBrHntC2o8oFI8=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "29dbe1efaa91c3a415d8b45d62d48325a4748816", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "rnix-lsp": { "inputs": { "naersk": "naersk", @@ -754,6 +654,7 @@ "disko": "disko", "home-manager": "home-manager_2", "impermanence": "impermanence", + "lolpizza": "lolpizza", "miro": "miro", "neovim-nightly-overlay": "neovim-nightly-overlay", "nixos-hardware": "nixos-hardware", @@ -807,6 +708,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1656928814, @@ -824,14 +740,14 @@ }, "utils_2": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1687171271, + "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", "type": "github" }, "original": { @@ -883,11 +799,11 @@ "zsh-completions": { "flake": false, "locked": { - "lastModified": 1684905159, - "narHash": "sha256-jXlsB9Xz1sijATmQeMl7u9k+eYUaEdBi9N1ZkMgv4nk=", + "lastModified": 1687428329, + "narHash": "sha256-9rJhxEMjbP+DBnFBVJkhsDfhNW2O+7yUQYbMmv0bDDM=", "owner": "zsh-users", "repo": "zsh-completions", - "rev": "744af1910b1baf1521df4a72e7b06f21eb35fe45", + "rev": "aa5af8f991f71305b96cb7e2f9cf9fcc9a1bf1eb", "type": "github" }, "original": { @@ -899,11 +815,11 @@ "zsh-syntax-highlighting": { "flake": false, "locked": { - "lastModified": 1675586974, - "narHash": "sha256-kWgPe7QJljERzcv4bYbHteNJIxCehaTu4xU9r64gUM4=", + "lastModified": 1685766260, + "narHash": "sha256-iKx7lsQCoSAbpANYFkNVCZlTFdwOEI34rx/h1rnraSg=", "owner": "zsh-users", "repo": "zsh-syntax-highlighting", - "rev": "754cefe0181a7acd42fdcb357a67d0217291ac47", + "rev": "1386f1213eb0b0589d73cd3cf7c56e6a972a9bfd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ec8f6ae6..2d24bcd2 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,8 @@ # programs xynoblog.url = "github:thexyno/blog"; xynoblog.inputs.nixpkgs.follows = "nixpkgs"; + lolpizza.url = "github:thexyno/lolpizza2"; + lolpizza.inputs.nixpkgs.follows = "nixpkgs"; x.url = "github:thexyno/x"; x.inputs.nixpkgs.follows = "nixpkgs"; @@ -83,6 +85,7 @@ , darwin , utils , xynoblog + , lolpizza , x , ... }: @@ -182,6 +185,7 @@ impermanence.nixosModules.impermanence home-manager.nixosModules.home-manager xynoblog.nixosModule + lolpizza.nixosModule x.nixosModule ({ config, ... }: lib.mkMerge [{ nixpkgs.pkgs = pkgs; diff --git a/hosts/beliskner/disk-config.nix b/hosts/beliskner/disk-config.nix index 144ba633..5c29f151 100644 --- a/hosts/beliskner/disk-config.nix +++ b/hosts/beliskner/disk-config.nix @@ -1,9 +1,9 @@ -{ disks ? [ "/dev/vda" ], ... }: { +{ ... }: { disko.devices = { disk = { vda = { type = "disk"; - device = builtins.elemAt disks 0; + device = "/dev/vda"; content = { type = "table"; format = "gpt"; @@ -53,8 +53,8 @@ lvm_vg = { pool = { type = "lvm_vg"; - nix = { - persistent = { + lvs = { + nix = { size = "100%"; content = { type = "filesystem"; diff --git a/hosts/beliskner/hardware-configuration.nix b/hosts/beliskner/hardware-configuration.nix index 7910eeb2..788df67c 100644 --- a/hosts/beliskner/hardware-configuration.nix +++ b/hosts/beliskner/hardware-configuration.nix @@ -6,11 +6,8 @@ let pubkeys = import ../../data/pubkeys.nix; in { - imports = [ "${modulesPath}/profiles/qemu-guest.nix" inputs.disko.nixosModules.disko ]; + imports = [ "${modulesPath}/profiles/qemu-guest.nix" inputs.disko.nixosModules.disko ./disk-config.nix ]; boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/d2cb12f8-67e3-4725-86c3-0b5c7ebee3a6"; - disko.devices = import ./disk-config.nix { - inherit lib; - }; boot.initrd = { network = { diff --git a/hosts/ds9/default.nix b/hosts/ds9/default.nix index 795ccb26..e1f3ae5b 100644 --- a/hosts/ds9/default.nix +++ b/hosts/ds9/default.nix @@ -267,10 +267,10 @@ in ZED_EMAIL_PROG = "${pkgs.msmtp}/bin/msmtp"; ZED_EMAIL_OPTS = "@ADDRESS@"; - ZED_NOTIFY_INTERVAL_SECS = 3600; + ZED_NOTIFY_INTERVAL_SECS = 7200; #ZED_NOTIFY_VERBOSE = true; - ZED_USE_ENCLOSURE_LEDS = true; + ZED_USE_ENCLOSURE_LEDS = false; ZED_SCRUB_AFTER_RESILVER = true; }; @@ -316,7 +316,6 @@ in grafana.enable = true; libvirt.enable = true; paperless.enable = true; - unifi.enable = true; }; }; diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index f7dd9a21..6b3cc0e5 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -50,6 +50,13 @@ forceSSL = true; locations."/".proxyPass = "http://[::1]${config.services.xynoblog.listen}"; }; + services.lolpizza2.enable = true; + services.nginx.virtualHosts."lolpizza.ragon.xyz" = { + useACMEHost = "ragon.xyz"; + forceSSL = true; + locations."/".proxyPass = "http://[::1]${config.services.lolpizza2.listen}"; + }; + services.nginx.virtualHosts."xyno.systems" = { enableACME = true; forceSSL = true;