From 262e6ca26de0bbf7191477eb387dc06a506d16b1 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Thu, 12 Dec 2024 19:22:53 +0100 Subject: flake: upgrade NixOS 24.05 -> 24.11 --- usecases/desktop/graphical.nix | 16 ++++++++-------- usecases/desktop/graphical/gaming.nix | 2 +- usecases/desktop/graphical/gtk.nix | 2 +- usecases/server/jellyfin.nix | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'usecases') diff --git a/usecases/desktop/graphical.nix b/usecases/desktop/graphical.nix index 0e909ae..6a74ac1 100644 --- a/usecases/desktop/graphical.nix +++ b/usecases/desktop/graphical.nix @@ -17,12 +17,12 @@ inputs: { users.extraUsers.minijackson.packages = with pkgs; [ arandr dconf - gnome3.eog - gnome3.evince - gnome3.file-roller - gnome3.gnome-disk-utility - gnome3.gucharmap - gnome3.nautilus + eog + evince + file-roller + gnome-disk-utility + gucharmap + nautilus qutebrowser xdg-utils xsel @@ -42,7 +42,7 @@ inputs: { freefont_ttf liberation_ttf libertinus - noto-fonts-cjk + noto-fonts-cjk-sans #fira-mono-italic lmodern # Symbols @@ -79,7 +79,7 @@ inputs: { }; }; - hardware.opengl.enable = true; + hardware.graphics.enable = true; programs.dconf.enable = true; qt = { diff --git a/usecases/desktop/graphical/gaming.nix b/usecases/desktop/graphical/gaming.nix index ec47ed2..898a013 100644 --- a/usecases/desktop/graphical/gaming.nix +++ b/usecases/desktop/graphical/gaming.nix @@ -8,7 +8,7 @@ inputs: { enable = true; package = pkgs.steam.override { extraLibraries = pkgs: - with config.hardware.opengl; + with config.hardware.graphics; if pkgs.hostPlatform.is64bit then [package] ++ extraPackages else [package32] ++ extraPackages32; diff --git a/usecases/desktop/graphical/gtk.nix b/usecases/desktop/graphical/gtk.nix index f07d57e..13e0918 100644 --- a/usecases/desktop/graphical/gtk.nix +++ b/usecases/desktop/graphical/gtk.nix @@ -110,7 +110,7 @@ in { }; theme = { - package = pkgs.gnome.gnome-themes-extra; + package = pkgs.gnome-themes-extra; name = "Adwaita-dark"; }; diff --git a/usecases/server/jellyfin.nix b/usecases/server/jellyfin.nix index 6c891fe..177bb2d 100644 --- a/usecases/server/jellyfin.nix +++ b/usecases/server/jellyfin.nix @@ -51,7 +51,7 @@ inputs: "/etc/static/ssl/certs" "/etc/resolv.conf" - ] ++ lib.optional config.hardware.opengl.enable [ + ] ++ lib.optional config.hardware.graphics.enable [ "/run/opengl-driver" ] ++ config.services.jellyfin.allowedPaths; -- cgit v1.2.3