From 3beb6360e5c1c9f2ffc1cba6d91f69c848d396e7 Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Wed, 3 Jul 2024 18:01:54 -0500 Subject: [PATCH] Revert changes for 24.05 --- nixos/modules/nixos/hardware/nvidia/default.nix | 7 ++++--- nixos/overlays/default.nix | 2 +- nixos/overlays/talosctl/update.sh | 4 +--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/nixos/modules/nixos/hardware/nvidia/default.nix b/nixos/modules/nixos/hardware/nvidia/default.nix index 1d98ac0..403ee0c 100644 --- a/nixos/modules/nixos/hardware/nvidia/default.nix +++ b/nixos/modules/nixos/hardware/nvidia/default.nix @@ -10,12 +10,13 @@ in # ref: https://nixos.wiki/wiki/Nvidia # Enable OpenGL - hardware.graphics = { + hardware.opengl = { enable = true; - enable32Bit = true; + driSupport = true; + driSupport32Bit = true; }; - hardware.graphics.extraPackages = with pkgs; [ + hardware.opengl.extraPackages = with pkgs; [ vaapiVdpau ]; diff --git a/nixos/overlays/default.nix b/nixos/overlays/default.nix index 9bfb253..caf0958 100644 --- a/nixos/overlays/default.nix +++ b/nixos/overlays/default.nix @@ -11,7 +11,7 @@ in nur = inputs.nur.overlay; warp-terminal = warpTerminalOverlay; termius = termiusOverlay; - # talosctl = talosctlOverlay; + talosctl = talosctlOverlay; # go = goOverlay; # The unstable nixpkgs set (declared in the flake inputs) will diff --git a/nixos/overlays/talosctl/update.sh b/nixos/overlays/talosctl/update.sh index f10db73..087e78c 100755 --- a/nixos/overlays/talosctl/update.sh +++ b/nixos/overlays/talosctl/update.sh @@ -11,6 +11,4 @@ if [[ "$currentVersion" == "$latestVersion" ]]; then exit 0 fi -update-source-version talosctl "$latestVersion" - -$(nix-build . -A talosctl --no-out-link) \ No newline at end of file +update-source-version talosctl "$latestVersion" \ No newline at end of file