From 6eb1763e7c0d88391b5d39a2dd98778ab35e7e13 Mon Sep 17 00:00:00 2001 From: fuckwit Date: Sun, 30 Jun 2024 19:21:57 +0200 Subject: [PATCH] framework changes --- flake.lock | 471 ++++++++++-------------------- nixos/celestia/configuration.nix | 31 +- nixos/framework/configuration.nix | 12 + nixos/framework/home.nix | 140 +++++---- outputs.nix | 12 +- 5 files changed, 285 insertions(+), 381 deletions(-) diff --git a/flake.lock b/flake.lock index f389c02..b40efb1 100644 --- a/flake.lock +++ b/flake.lock @@ -19,19 +19,25 @@ "cachix": { "inputs": { "devenv": "devenv_2", - "flake-compat": "flake-compat_3", + "flake-compat": [ + "devenv", + "flake-compat" + ], "nixpkgs": [ "devenv", "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks" + "pre-commit-hooks": [ + "devenv", + "pre-commit-hooks" + ] }, "locked": { - "lastModified": 1710475558, - "narHash": "sha256-egKrPCKjy/cE+NqCj4hg2fNX/NwLCf0bRDInraYXDgs=", + "lastModified": 1712055811, + "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=", "owner": "cachix", "repo": "cachix", - "rev": "661bbb7f8b55722a0406456b15267b5426a3bda6", + "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30", "type": "github" }, "original": { @@ -48,11 +54,11 @@ ] }, "locked": { - "lastModified": 1711299236, - "narHash": "sha256-6/JsyozOMKN8LUGqWMopKTSiK8N79T8Q+hcxu2KkTXg=", + "lastModified": 1718474113, + "narHash": "sha256-UKrfy/46YF2TRnxTtKCYzqf2f5ZPRRWwKCCJb7O5X8U=", "owner": "ipetkov", "repo": "crane", - "rev": "880573f80d09e18a11713f402b9e6172a085449f", + "rev": "0095fd8ea00ae0a9e6014f39c375e40c2fbd3386", "type": "github" }, "original": { @@ -68,11 +74,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1708091384, - "narHash": "sha256-dTGGw2y8wvfjr+J9CjQbfdulOq72hUG17HXVNxpH1yE=", + "lastModified": 1718194053, + "narHash": "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=", "owner": "serokell", "repo": "deploy-rs", - "rev": "0a0187794ac7f7a1e62cda3dabf8dc041f868790", + "rev": "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a", "type": "github" }, "original": { @@ -84,19 +90,19 @@ "devenv": { "inputs": { "cachix": "cachix", - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_3", "nix": "nix_2", "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks_2" + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1711381142, - "narHash": "sha256-JCxjmWr2+75KMPOoVybNZhy9zhhrg9BAKA8D+J6MNBc=", + "lastModified": 1718265154, + "narHash": "sha256-eTbBvYwGlKExMSTyHQya6+6kdx1rtva/aVfyAZu2NUU=", "owner": "cachix", "repo": "devenv", - "rev": "72affdb7f6f16886d4fe471d2f6bbdae880d70d2", + "rev": "1983f635c29dc68bb0d29b3a7e227579a1d98788", "type": "github" }, "original": { @@ -139,16 +145,16 @@ }, "emacs": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs": "nixpkgs_6", - "nixpkgs-stable": "nixpkgs-stable_4" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1711330304, - "narHash": "sha256-ekzWO410axeB8MGFcFbUHjrERMt3WcXaFak4zW4WYtA=", + "lastModified": 1714614481, + "narHash": "sha256-vykQwGwiu178RHmmRRTzId3qpc9YQtY29Jie7E2GFMg=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3b51a53286ab12124ddb7e22e037bad2aeb6dc0f", + "rev": "cccda8508481ea8c8ff4e50a297900ed54b26dc3", "type": "github" }, "original": { @@ -260,54 +266,6 @@ "type": "github" } }, - "flake-compat_6": { - "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-compat_7": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_8": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -316,11 +274,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -352,11 +310,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -370,11 +328,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -420,24 +378,6 @@ } }, "flake-utils_6": { - "inputs": { - "systems": "systems_7" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_7": { "locked": { "lastModified": 1637014545, "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", @@ -452,7 +392,7 @@ "type": "github" } }, - "flake-utils_8": { + "flake-utils_7": { "locked": { "lastModified": 1629284811, "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", @@ -471,17 +411,16 @@ "inputs": { "nixpkgs": [ "devenv", - "cachix", "pre-commit-hooks", "nixpkgs" ] }, "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -491,28 +430,6 @@ } }, "gitignore_2": { - "inputs": { - "nixpkgs": [ - "devenv", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_3": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -539,11 +456,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1711133180, - "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", + "lastModified": 1719677234, + "narHash": "sha256-qO9WZsj/0E6zcK4Ht1y/iJ8XfwbBzq7xdqhBh44OP/M=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", + "rev": "36317d4d38887f7629876b0e43c8d9593c5cc48d", "type": "github" }, "original": { @@ -555,19 +472,19 @@ "lanzaboote": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_4", "flake-parts": "flake-parts", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_4", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1711372858, - "narHash": "sha256-OS07Su2TnH/WqMcdk/vzi1FIw1WwYVUtzCGnKmrEl4Q=", + "lastModified": 1718782018, + "narHash": "sha256-8SBmf7Sx5xMLzL4VGEU0fe8cuq0yMumdkXgOPXXD3Bo=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "d67e1cc1374e2a11be6bbd21237a1e7fdf63afa9", + "rev": "6fa7bc0522f71d3906a3788bbd80c344cd9c4523", "type": "github" }, "original": { @@ -588,11 +505,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1708577783, - "narHash": "sha256-92xq7eXlxIT5zFNccLpjiP7sdQqQI30Gyui2p/PfKZM=", + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", "owner": "domenkozar", "repo": "nix", - "rev": "ecd0af0c1f56de32cbad14daa1d82a132bf298f8", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", "type": "github" }, "original": { @@ -628,7 +545,10 @@ }, "nix_2": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": [ + "devenv", + "flake-compat" + ], "nixpkgs": [ "devenv", "nixpkgs" @@ -636,11 +556,11 @@ "nixpkgs-regression": "nixpkgs-regression_2" }, "locked": { - "lastModified": 1710500156, - "narHash": "sha256-zvCqeUO2GLOm7jnU23G4EzTZR7eylcJN+HJ5svjmubI=", + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", "owner": "domenkozar", "repo": "nix", - "rev": "c5bbf14ecbd692eeabf4184cc8d50f79c2446549", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", "type": "github" }, "original": { @@ -666,6 +586,21 @@ "type": "github" } }, + "nixpkgs-24_05": { + "locked": { + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-24.05", + "type": "indirect" + } + }, "nixpkgs-f2k": { "inputs": { "emacs": "emacs", @@ -676,11 +611,11 @@ "parts": "parts" }, "locked": { - "lastModified": 1711333583, - "narHash": "sha256-hki7G6KKQZYy8Wd3Q1p2rMTjNLUr88YdM8WmC8rsK+A=", + "lastModified": 1714616867, + "narHash": "sha256-GHvEVdWFSP5Ci7J3ZmcrBs/vag+NJ0ub8j9V0tZjAVM=", "owner": "fortuneteller2k", "repo": "nixpkgs-f2k", - "rev": "b322aa5aa5de0e0a0af6f42af1f8f932e69964f3", + "rev": "07f53aa9b3f4ce64fd39903ba09a3d8e26e4ecee", "type": "github" }, "original": { @@ -692,7 +627,7 @@ "nixpkgs-fmt": { "inputs": { "fenix": "fenix", - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs-f2k", "nixpkgs" @@ -715,11 +650,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -764,11 +699,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1704874635, - "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", "type": "github" }, "original": { @@ -779,22 +714,6 @@ } }, "nixpkgs-stable_2": { - "locked": { - "lastModified": 1704874635, - "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { "locked": { "lastModified": 1710695816, "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", @@ -810,13 +729,29 @@ "type": "github" } }, - "nixpkgs-stable_4": { + "nixpkgs-stable_3": { "locked": { - "lastModified": 1711124224, - "narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=", + "lastModified": 1714531828, + "narHash": "sha256-ILsf3bdY/hNNI/Hu5bSt2/KbmHaAVhBbNUOdGztTHEg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "56528ee42526794d413d6f244648aaee4a7b56c0", + "rev": "0638fe2715d998fa81d173aad264eb671ce2ebc1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_4": { + "locked": { + "lastModified": 1719663039, + "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119", "type": "github" }, "original": { @@ -828,27 +763,11 @@ }, "nixpkgs-stable_5": { "locked": { - "lastModified": 1711124224, - "narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=", + "lastModified": 1719663039, + "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "56528ee42526794d413d6f244648aaee4a7b56c0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_6": { - "locked": { - "lastModified": 1711233294, - "narHash": "sha256-eEu5y4J145BYDw9o/YEmeJyqh8blgnZwuz9k234zuWc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ac6bdf6181666ebb4f90dd20f31e2fa66ede6b68", + "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119", "type": "github" }, "original": { @@ -876,11 +795,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1710806803, - "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", + "lastModified": 1719254875, + "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", + "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "type": "github" }, "original": { @@ -892,11 +811,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1711297276, - "narHash": "sha256-KtHBr73Z729krfueBV6pUsEyq/4vILGP77DPmrKOTrI=", + "lastModified": 1718541509, + "narHash": "sha256-TmC5TxW5WPAfmovDzi1hLe1i4qqND79s9SH9UOKcSvo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3d41d1087707826b3a90685ab69147f8dc8145d5", + "rev": "ba06293cdba1c94af9710024abf3b94cf8d76349", "type": "github" }, "original": { @@ -908,11 +827,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "lastModified": 1719506693, + "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a", "type": "github" }, "original": { @@ -924,11 +843,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -940,11 +859,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1711200738, - "narHash": "sha256-dkJmk/ET/tRV4007O6kU101UEg1svUwiyk/zEEX9Tdg=", + "lastModified": 1719468428, + "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20bc93ca7b2158ebc99b8cef987a2173a81cde35", + "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d", "type": "github" }, "original": { @@ -956,11 +875,11 @@ }, "nurpkgs": { "locked": { - "lastModified": 1711391150, - "narHash": "sha256-JxZjYgddO/OfkNMYs4K1sZFC8KlSLCn6OWF2W/QStiI=", + "lastModified": 1719762299, + "narHash": "sha256-hD+5hNGqPBipDTuZZImSCU36RqacSJadHjQtK/gbaxU=", "owner": "nix-community", "repo": "NUR", - "rev": "de949cf5f7456d62398d2d5ee2cf235e1a1df0b7", + "rev": "80b917d886c6554264f71e1fc68e6b17cd5fdfa1", "type": "github" }, "original": { @@ -974,11 +893,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1714606777, + "narHash": "sha256-bMkNmAXLj8iyTvxaaD/StcLSadbj1chPcJOjtuVnLmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "4d34ce6412bc450b1d4208c953dc97c7fc764f1a", "type": "github" }, "original": { @@ -1014,22 +933,24 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": [ + "devenv", + "flake-compat" + ], "flake-utils": "flake-utils_2", "gitignore": "gitignore", "nixpkgs": [ "devenv", - "cachix", "nixpkgs" ], "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1708018599, - "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", + "lastModified": 1713775815, + "narHash": "sha256-Wu9cdYTnGQQwtT20QQMg7jzkANKQjwBD9iccfGKkfls=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", + "rev": "2ac4dcbf55ed43f3be0bae15e181f08a57af24a4", "type": "github" }, "original": { @@ -1044,51 +965,19 @@ "lanzaboote", "flake-compat" ], - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], - "gitignore": "gitignore_3", - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_3" - }, - "locked": { - "lastModified": 1710923068, - "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks_2": { - "inputs": { - "flake-compat": [ - "devenv", - "flake-compat" - ], - "flake-utils": "flake-utils_3", "gitignore": "gitignore_2", "nixpkgs": [ - "devenv", + "lanzaboote", "nixpkgs" ], "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1708018599, - "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "type": "github" }, "original": { @@ -1101,12 +990,12 @@ "inputs": { "deploy": "deploy", "devenv": "devenv", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "home-manager": "home-manager", "lanzaboote": "lanzaboote", "nixpkgs": "nixpkgs_5", "nixpkgs-f2k": "nixpkgs-f2k", - "nixpkgs-stable": "nixpkgs-stable_5", + "nixpkgs-stable": "nixpkgs-stable_4", "nurpkgs": "nurpkgs", "rycee-nurpkgs": "rycee-nurpkgs", "simple-nixos-mailserver": "simple-nixos-mailserver", @@ -1142,11 +1031,11 @@ ] }, "locked": { - "lastModified": 1711246447, - "narHash": "sha256-g9TOluObcOEKewFo2fR4cn51Y/jSKhRRo4QZckHLop0=", + "lastModified": 1718504420, + "narHash": "sha256-F2HT/abCfr0CDpkvXwYCscJyD66XDTLMVfdrIMRp2ck=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "dcc802a6ec4e9cc6a1c8c393327f0c42666f22e4", + "rev": "0043c3f92304823cc2c0a4354b0feaa61dfb4cd9", "type": "github" }, "original": { @@ -1157,18 +1046,18 @@ }, "rycee-nurpkgs": { "inputs": { - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_7", "nixpkgs": [ "nixpkgs" ] }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1711349769, - "narHash": "sha256-YyDJq/Cf57QIAvhIRiUkfft7zQP6sWG/KFVdtbptmEU=", + "lastModified": 1719644951, + "narHash": "sha256-MTF+/uUIdFNeyzEFirWyza43AFfr3Syld7aPw2CSCkI=", "owner": "rycee", "repo": "nur-expressions", - "rev": "a6bc3598b9e686d1d0002df0ce435a10c81e19e9", + "rev": "590551ba0bb0f960c7fcd37d6ff3a429f7cc9dd1", "type": "gitlab" }, "original": { @@ -1181,18 +1070,18 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_8", + "flake-compat": "flake-compat_5", "nixpkgs": [ "nixpkgs" ], - "utils": "utils_2" + "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { - "lastModified": 1710449465, - "narHash": "sha256-2orO8nfplp6uQJBFqKkj1iyNMC6TysmwbWwbb4osTag=", + "lastModified": 1718697807, + "narHash": "sha256-Enla61WFisytTYbWygPynEbu8vozjeGc6Obkj2GRj7o=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "79c8cfcd5873a85559da6201b116fb38b490d030", + "rev": "290a995de5c3d3f08468fa548f0d55ab2efc7b6b", "type": "gitlab" }, "original": { @@ -1205,14 +1094,14 @@ "sops-nix": { "inputs": { "nixpkgs": "nixpkgs_7", - "nixpkgs-stable": "nixpkgs-stable_6" + "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { - "lastModified": 1711249319, - "narHash": "sha256-N+Pp3/8H+rd7cO71VNV/ovV/Kwt+XNeUHNhsmyTabdM=", + "lastModified": 1719716556, + "narHash": "sha256-KA9gy2Wkv76s4A8eLnOcdKVTygewbw3xsB8+awNMyqs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "405987a66cce9a4a82f321f11b205982a7127c88", + "rev": "b5974d4331fb6c893e808977a2e1a6d34b3162d6", "type": "github" }, "original": { @@ -1311,36 +1200,6 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "utils": { "inputs": { "systems": "systems" @@ -1358,24 +1217,6 @@ "repo": "flake-utils", "type": "github" } - }, - "utils_2": { - "inputs": { - "systems": "systems_8" - }, - "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/nixos/celestia/configuration.nix b/nixos/celestia/configuration.nix index 0eaedd0..ed96225 100644 --- a/nixos/celestia/configuration.nix +++ b/nixos/celestia/configuration.nix @@ -100,10 +100,6 @@ in { }; }; - systemd.services.dnscrypt-proxy2.serviceConfig = { - StateDirectory = "dnscrypt-proxy"; - }; - security.acme = { acceptTerms = true; defaults = { @@ -124,9 +120,9 @@ in { openFirewall = true; useRoutingFeatures = "both"; extraUpFlags = ["--advertise-routes=192.168.1.11/32"]; - authKeyFile = config.sops.secrets."tailscale-auth-key".path; + authKeyFile = config.sops.secrets."tailscale-auth-key".path; }; - + dnscrypt-proxy2 = { enable = true; settings = { @@ -413,4 +409,27 @@ in { enable = true; powerUpCommands = lib.strings.concatMapStringsSep "\n" (disk: "${pkgs.hdparm}/sbin/hdparm -S 241 " + disk) disks; }; + + systemd.services = let + ensure-perms = path: user: group: { + enable = true; + description = "Ensures permissionsions and ownership of files in ${path}"; + wantedBy = ["multi-user.target"]; + + script = '' + while read -r evt file; do + ${pkgs.coreutils}/bin/chown ${user}:${group} "$file" + ${pkgs.coreutils}/bin/chmod 755 "$file" + done < <(${pkgs.inotify-tools}/bin/inotifywait -e create,move -m -r --format '%e %w%f' ${path}) + ''; + }; + in { + dnscrypt-proxy2.serviceConfig = { + StateDirectory = "dnscrypt-proxy"; + }; + + ensure-radarr-perms = ensure-perms "/tank/video/movie" "radarr" "nas"; + ensure-sonarr-perms = ensure-perms "/tank/video/series" "sonarr" "nas"; + ensure-lidarr-perms = ensure-perms "/tank/audio" "lidarr" "nas"; + }; } diff --git a/nixos/framework/configuration.nix b/nixos/framework/configuration.nix index 1887252..6f6979f 100644 --- a/nixos/framework/configuration.nix +++ b/nixos/framework/configuration.nix @@ -2,6 +2,7 @@ config, pkgs, lib, + mypkgs, ... }: { imports = [./hardware-configuration.nix]; @@ -34,8 +35,17 @@ extraPackages = [pkgs.vaapiVdpau]; }; + hardware.bluetooth.enable = true; + + security.pam.services.swaylock = {}; + fonts.packages = with pkgs; [ + font-awesome + (nerdfonts.override {fonts = ["FiraMono"];}) + mypkgs.comic-mono + ]; + services = { illum.enable = true; fwupd.enable = true; @@ -101,6 +111,8 @@ pulse.enable = true; }; + services.blueman.enable = true; + users.users.patrick = { isNormalUser = true; extraGroups = ["wheel"]; diff --git a/nixos/framework/home.nix b/nixos/framework/home.nix index 0718378..f70c38d 100644 --- a/nixos/framework/home.nix +++ b/nixos/framework/home.nix @@ -1,21 +1,15 @@ {pkgs, ...}: { home.packages = with pkgs; [ - helix firefox-devedition - git + git # TODO: use programs.git pinentry acpi - sops moonlight-qt - discord vesktop telegram-desktop obs-studio ]; - programs.bash.enable = true; - programs.swaylock.enable = true; - wayland.windowManager.hyprland = let locker = "${pkgs.swaylock}/bin/swaylock"; set-dpms = "${pkgs.hyprland}/bin/hyprctl dispatcher dpms"; @@ -116,7 +110,8 @@ "$mod, mouse:273, resizewindow" ]; - "device:razer-razer-blackwidow-chroma" = { + device = { + name = "razer-razer-blackwidow-chroma"; kb_layout = "de"; }; @@ -127,67 +122,100 @@ }; }; - programs.waybar = { - enable = true; + programs = { + swaylock.enable = true; + zoxide.enable = true; - settings.mainbar = { - layer = "top"; - position = "top"; - height = 30; - - modules-left = ["hyprland/workspaces"]; - modules-right = ["pulseaudio" "network" "cpu" "memory" "temperature" "battery" "clock" "tray"]; + bash = { + enable = true; + enableVteIntegration = true; + enableCompletion = true; }; - }; - programs.starship.enable = true; + starship = { + enable = true; - programs.helix = { - enable = true; - defaultEditor = true; + settings = { + add_newline = false; + }; + }; - settings = { - theme = "onedark"; + eza = { + enable = true; - editor = { - line-number = "relative"; - true-color = true; - gutters = ["diagnostics" "spacer" "line-numbers" "spacer" "diff"]; - cursorline = true; - completion-trigger-len = 2; + icons = true; + git = true; + }; - cursor-shape = { - insert = "bar"; - normal = "block"; - select = "underline"; - }; + atuin = { + enable = true; - lsp = { - display-messages = true; - display-inlay-hints = true; - }; + settings = { + enter_accept = true; + }; + }; - statusline = { - left = ["mode" "spinner"]; - center = ["file-name"]; - right = ["diagnostics" "selections" "position" "file-encoding" "file-line-ending" "file-type" "version-control"]; + waybar = { + enable = true; - mode = { - normal = "NORMAL"; - insert = "INSERT"; - select = "SELECT"; + settings.mainbar = { + layer = "top"; + position = "top"; + height = 30; + + modules-left = ["hyprland/workspaces"]; + modules-right = ["pulseaudio" "network" "cpu" "memory" "temperature" "battery" "clock" "tray"]; + }; + }; + + helix = { + enable = true; + defaultEditor = true; + + settings = { + theme = "onedark"; + + editor = { + line-number = "relative"; + true-color = true; + gutters = ["diagnostics" "spacer" "line-numbers" "spacer" "diff"]; + cursorline = true; + completion-trigger-len = 2; + + cursor-shape = { + insert = "bar"; + normal = "block"; + select = "underline"; + }; + + lsp = { + display-messages = true; + display-inlay-hints = true; + }; + + statusline = { + left = ["mode" "spinner"]; + center = ["file-name"]; + right = ["diagnostics" "selections" "position" "file-encoding" "file-line-ending" "file-type" "version-control"]; + + mode = { + normal = "NORMAL"; + insert = "INSERT"; + select = "SELECT"; + }; }; }; }; }; - }; - programs.thunderbird = { - enable = true; - profiles = { - main = { - isDefault = true; - withExternalGnupg = true; + thunderbird = { + enable = true; + + profiles = { + main = { + isDefault = true; + withExternalGnupg = true; + }; }; }; }; @@ -198,10 +226,12 @@ realName = "Patrick Michl"; address = "me@fuckwit.dev"; userName = "me@fuckwit.dev"; + gpg = { key = "5FA64909521A5C85992F26E0F819AEFF941BB849"; signByDefault = true; }; + imap = { host = "mail.fuckwit.dev"; port = 143; @@ -209,6 +239,7 @@ useStartTls = true; }; }; + smtp = { host = "mail.fuckwit.dev"; port = 587; @@ -216,6 +247,7 @@ useStartTls = true; }; }; + thunderbird = { enable = true; profiles = ["main"]; diff --git a/outputs.nix b/outputs.nix index 2a714a6..e571436 100644 --- a/outputs.nix +++ b/outputs.nix @@ -18,12 +18,12 @@ in { formatter = pkgs.alejandra; })) // { - homeConfigurations.patrick = home-manager.lib.homeManagerConfiguration { - pkgs = import nixpkgs { - system = "x86_64-linux"; - # config.allowUnfree = true; - }; - }; + # homeConfigurations.patrick = home-manager.lib.homeManagerConfiguration { + # pkgs = import nixpkgs { + # system = "x86_64-linux"; + # # config.allowUnfree = true; + # }; + # }; nixosConfigurations = import ./nixos/configurations.nix (inputs // {inherit inputs;});