From 84df85818853c93570e1d3024778466d193a7e7a Mon Sep 17 00:00:00 2001 From: oddlama Date: Wed, 26 Jun 2024 02:32:28 +0200 Subject: [PATCH] chore: remove deprecated configuration --- config/hardware/nvidia.nix | 1 - flake.lock | 90 +++++++++++++++++------------------ hosts/nom/default.nix | 1 - hosts/ward/guests/forgejo.nix | 8 +--- hosts/ward/net.nix | 2 +- hosts/zackbiene/net.nix | 2 +- pkgs/default.nix | 14 +++--- 7 files changed, 56 insertions(+), 62 deletions(-) diff --git a/config/hardware/nvidia.nix b/config/hardware/nvidia.nix index cdc2bf5..d67d694 100644 --- a/config/hardware/nvidia.nix +++ b/config/hardware/nvidia.nix @@ -18,7 +18,6 @@ lib.optionalAttrs (!minimal) { }; opengl = { enable = true; - driSupport = true; driSupport32Bit = true; extraPackages = with pkgs; [ vaapiVdpau diff --git a/flake.lock b/flake.lock index a8e83f8..599c768 100644 --- a/flake.lock +++ b/flake.lock @@ -383,11 +383,11 @@ ] }, "locked": { - "lastModified": 1718846788, - "narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=", + "lastModified": 1719236180, + "narHash": "sha256-VZAfBk2Lo8hQy/NQ4XVSpTICT0ownXBUi1QvGfdlxaM=", "owner": "nix-community", "repo": "disko", - "rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e", + "rev": "dd4d1663ccf7fbdb32361b9afe9e71206584cd4c", "type": "github" }, "original": { @@ -1071,11 +1071,11 @@ ] }, "locked": { - "lastModified": 1718788307, - "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=", + "lastModified": 1719180626, + "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=", "owner": "nix-community", "repo": "home-manager", - "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca", + "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb", "type": "github" }, "original": { @@ -1092,11 +1092,11 @@ ] }, "locked": { - "lastModified": 1718788307, - "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=", + "lastModified": 1719037157, + "narHash": "sha256-aOKd8+mhBsLQChCu1mn/W5ww79ta5cXVE59aJFrifM8=", "owner": "nix-community", "repo": "home-manager", - "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca", + "rev": "cd886711998fe5d9ff7979fdd4b4cbd17b1f1511", "type": "github" }, "original": { @@ -1107,11 +1107,11 @@ }, "impermanence": { "locked": { - "lastModified": 1717932370, - "narHash": "sha256-7C5lCpiWiyPoIACOcu2mukn/1JRtz6HC/1aEMhUdcw0=", + "lastModified": 1719091691, + "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=", "owner": "nix-community", "repo": "impermanence", - "rev": "27979f1c3a0d3b9617a3563e2839114ba7d48d3f", + "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a", "type": "github" }, "original": { @@ -1142,11 +1142,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1718483375, - "narHash": "sha256-VvD7zmbEn9Ua8w2wAMcIBXD09QqG1Ra5bNjhd1eqhOo=", + "lastModified": 1719185120, + "narHash": "sha256-xsdESZDwOs0o96VlZNxThfLG8HW+qT2c7dYypGGUYXg=", "owner": "astro", "repo": "microvm.nix", - "rev": "b11f00056e11a802809935b0675176a2429593d9", + "rev": "146fec824fe8e06454e211a14ce29b5f692ad078", "type": "github" }, "original": { @@ -1163,11 +1163,11 @@ ] }, "locked": { - "lastModified": 1718662658, - "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=", + "lastModified": 1719128254, + "narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf", + "rev": "50581970f37f06a4719001735828519925ef8310", "type": "github" }, "original": { @@ -1183,11 +1183,11 @@ ] }, "locked": { - "lastModified": 1718507237, - "narHash": "sha256-xBEWCxWeRpWQggFFp8ugJCDa63cOJsVvx71R9F0Eowg=", + "lastModified": 1719111455, + "narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "6af2c5e58c20311276f59d247341cafeebfcb6f4", + "rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6", "type": "github" }, "original": { @@ -1245,11 +1245,11 @@ "pre-commit-hooks": "pre-commit-hooks_4" }, "locked": { - "lastModified": 1712921831, - "narHash": "sha256-5WVeVRFoO0QziYNeM+Wcxj12F2H8siNlQ0ueDZBD/e4=", + "lastModified": 1719361855, + "narHash": "sha256-JTIOZuYwFpVA7kvNx52gBiv28uY+mQv9oRGcaSd24Ho=", "owner": "oddlama", "repo": "nixos-extra-modules", - "rev": "fc2cef598dcf0f407d91cc2cde96144199fd1dca", + "rev": "28fdf3bfeab9e4907b8ad7c29e73c1013e74c113", "type": "github" }, "original": { @@ -1281,11 +1281,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1718894893, - "narHash": "sha256-hxQBUtDbFOCCW1CsFZTS9Q5Ov1ZKdJgbBZHSez1M6iA=", + "lastModified": 1719322773, + "narHash": "sha256-BqPxtFwXrpJQDh65NOIHX99pz2rtIMshG9Mt2xnnc5c=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "083823b7904e43a4fc1c7229781417e875359a42", + "rev": "caabc425565bbd5c8640630b0bf6974961a49242", "type": "github" }, "original": { @@ -1317,11 +1317,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718714799, - "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=", + "lastModified": 1719075281, + "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e", + "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "type": "github" }, "original": { @@ -1433,11 +1433,11 @@ }, "nixpkgs-stable_5": { "locked": { - "lastModified": 1718447546, - "narHash": "sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM=", + "lastModified": 1718811006, + "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "842253bf992c3a7157b67600c2857193f126563a", + "rev": "03d771e513ce90147b65fe922d87d3a0356fc125", "type": "github" }, "original": { @@ -1493,11 +1493,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1718956149, - "narHash": "sha256-DG8HGE6vuGJ1wXsji3XJijLijGpHZftEJK/Ol43O7ms=", + "lastModified": 1719228487, + "narHash": "sha256-eJUcZAjOcGAoh97ZRsy+ls8IkHPMpDuh0IpRKSmoWs4=", "owner": "nix-community", "repo": "nixvim", - "rev": "66b23fff8010d8f3b4c801564a617ffb4aca629a", + "rev": "66c8592b31845cb0a1335ecc31ea40e89bed1a38", "type": "github" }, "original": { @@ -1628,11 +1628,11 @@ "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { - "lastModified": 1718879355, - "narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=", + "lastModified": 1719259945, + "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a", + "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", "type": "github" }, "original": { @@ -1772,11 +1772,11 @@ ] }, "locked": { - "lastModified": 1718789425, - "narHash": "sha256-YJvgBThIUPeywoTjnFk+F73c0l2oaAENIrz2uldqb5A=", + "lastModified": 1719235398, + "narHash": "sha256-yccyHeuMUdbG/89Yi1ZSqx0XlpIKb0WQI+mAnTf/GJw=", "owner": "danth", "repo": "stylix", - "rev": "7dcab0711bfc103a1fb05ba643ee7a3bd309fbe4", + "rev": "7cdbd128172d7c4ec63f5073d49da5d0e7d6396c", "type": "github" }, "original": { @@ -2041,11 +2041,11 @@ "pre-commit-hooks": "pre-commit-hooks_6" }, "locked": { - "lastModified": 1719168621, - "narHash": "sha256-w5LbzmXlkm1uwjjS2s/0mBOqbQFD8gOr+ebd2a2varE=", + "lastModified": 1719174892, + "narHash": "sha256-tXFNf8V2KyxzTXRwh6FKmeH4mfWkZZai15T2svMD6IE=", "owner": "oddlama", "repo": "whisper-overlay", - "rev": "4ba57d95fa85fb071d49c29e974d4bcc69e92bc1", + "rev": "0ef2db6de797537c9014de6ed29715359c5527a0", "type": "github" }, "original": { diff --git a/hosts/nom/default.nix b/hosts/nom/default.nix index 2968051..81e012a 100644 --- a/hosts/nom/default.nix +++ b/hosts/nom/default.nix @@ -58,7 +58,6 @@ }; opengl = { enable = true; - driSupport = true; driSupport32Bit = true; extraPackages = with pkgs; [ vaapiVdpau diff --git a/hosts/ward/guests/forgejo.nix b/hosts/ward/guests/forgejo.nix index 816a2b1..b2789fb 100644 --- a/hosts/ward/guests/forgejo.nix +++ b/hosts/ward/guests/forgejo.nix @@ -13,11 +13,7 @@ in { firewallRuleForNode.sentinel.allowedTCPPorts = [config.services.forgejo.settings.server.HTTP_PORT]; }; - age.secrets.forgejo-mailer-password = { - rekeyFile = config.node.secretsDir + "/forgejo-mailer-password.age"; - mode = "440"; - inherit (config.services.forgejo) group; - }; + age.secrets.forgejo-mailer-password.rekeyFile = config.node.secretsDir + "/forgejo-mailer-password.age"; # Mirror the original oauth2 secret age.secrets.forgejo-oauth2-client-secret = { @@ -107,7 +103,7 @@ in { user = "git"; group = "git"; lfs.enable = true; - mailerPasswordFile = config.age.secrets.forgejo-mailer-password.path; + secrets.mailer.PASSWD = config.age.secrets.forgejo-mailer-password.path; settings = { DEFAULT.APP_NAME = "Redlew Git"; # tungsten inert gas? actions = { diff --git a/hosts/ward/net.nix b/hosts/ward/net.nix index 9c32f99..5c3f0e8 100644 --- a/hosts/ward/net.nix +++ b/hosts/ward/net.nix @@ -115,7 +115,7 @@ ipv6SendRAConfig.Managed = true; # Announce a static prefix ipv6Prefixes = [ - {ipv6PrefixConfig.Prefix = globals.net.home-lan.cidrv6;} + {Prefix = globals.net.home-lan.cidrv6;} ]; # Delegate prefix dhcpPrefixDelegationConfig = { diff --git a/hosts/zackbiene/net.nix b/hosts/zackbiene/net.nix index 132acd8..fee1b8f 100644 --- a/hosts/zackbiene/net.nix +++ b/hosts/zackbiene/net.nix @@ -43,7 +43,7 @@ in { }; # Announce a static prefix ipv6Prefixes = [ - {ipv6PrefixConfig.Prefix = iotCidrv6;} + {Prefix = iotCidrv6;} ]; linkConfig.RequiredForOnline = "no"; }; diff --git a/pkgs/default.nix b/pkgs/default.nix index 4673c15..8cc46f8 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -33,13 +33,13 @@ wrapProgram $out/bin/nvim --add-flags "--clean" ''; }); - pythonPackagesExtensions = - prev.pythonPackagesExtensions - ++ [ - (pythonFinal: _pythonPrev: { - jaxlib = pythonFinal.callPackage ./jaxlib.nix {}; - }) - ]; + #pythonPackagesExtensions = + # prev.pythonPackagesExtensions + # ++ [ + # (pythonFinal: _pythonPrev: { + # jaxlib = pythonFinal.callPackage ./jaxlib.nix {}; + # }) + # ]; formats = prev.formats