From e14c15e1ffd767611eeac73a0fbb6eca685a8091 Mon Sep 17 00:00:00 2001 From: winston Date: Sun, 28 Jul 2024 18:09:11 +0200 Subject: [PATCH] feat: rename deprecated options/pkgs --- home/apps/sway.nix | 2 +- machines/common/linux/default.nix | 2 +- machines/common/linux/sway.nix | 8 ++++---- machines/futomaki/hardware.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/home/apps/sway.nix b/home/apps/sway.nix index 9f3422f..4a021be 100644 --- a/home/apps/sway.nix +++ b/home/apps/sway.nix @@ -105,7 +105,7 @@ in modFocus = "${mod}+Ctrl"; hyper = "Mod4+Mod1+Shift+Ctrl"; - filebrowser = "${pkgs.gnome.nautilus}/bin/nautilus"; + filebrowser = "${pkgs.nautilus}/bin/nautilus"; screenshot = "${pkgs.sway-contrib.grimshot}/bin/grimshot copy area"; playerctl = "${pkgs.playerctl}/bin/playerctl"; swayosd = pkgs.swayosd + "/bin/swayosd-client"; diff --git a/machines/common/linux/default.nix b/machines/common/linux/default.nix index 7af8fc9..e4e26e8 100644 --- a/machines/common/linux/default.nix +++ b/machines/common/linux/default.nix @@ -44,6 +44,6 @@ # enable yubikey u2f support security.pam.u2f = { enable = true; - cue = true; + settings.cue = true; }; } diff --git a/machines/common/linux/sway.nix b/machines/common/linux/sway.nix index ce1911c..26abbb4 100644 --- a/machines/common/linux/sway.nix +++ b/machines/common/linux/sway.nix @@ -11,10 +11,10 @@ p7zip unzip zip - gnome.file-roller - gnome.nautilus - gnome.nautilus-python - gnome.sushi + file-roller + nautilus + nautilus-python + sushi nautilus-open-any-terminal # thumbnails diff --git a/machines/futomaki/hardware.nix b/machines/futomaki/hardware.nix index 529da8d..7c45690 100644 --- a/machines/futomaki/hardware.nix +++ b/machines/futomaki/hardware.nix @@ -31,9 +31,9 @@ # Intel Arc A770 environment.sessionVariables.LIBVA_DRIVER_NAME = "iHD"; boot.extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ]; - hardware.opengl = { + hardware.graphics = { enable = true; - driSupport32Bit = true; + enable32Bit = true; extraPackages = with pkgs; [ intel-compute-runtime intel-media-driver