From 8761dae20ce7dd7d2b84b32c952fce4a52e3d5f0 Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Mon, 2 Dec 2024 14:20:49 +0100 Subject: [PATCH] NixOS: Upgrade to 24.11 --- flake.lock | 16 ++++----- flake.nix | 4 +-- home/features/cli/gpg.nix | 2 +- home/global/default.nix | 2 +- hosts/adalbert/default.nix | 2 +- hosts/common/global/nix.nix | 2 +- hosts/common/optional/desktop/gnome.nix | 38 ++++++++++------------ hosts/common/optional/desktop/japanese.nix | 3 +- hosts/ludwig/default.nix | 4 +-- 9 files changed, 35 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index a223820..f398710 100644 --- a/flake.lock +++ b/flake.lock @@ -458,16 +458,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1733050161, + "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -938,16 +938,16 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1732749044, - "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", + "lastModified": 1732981179, + "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", + "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 462b6b4..c639f64 100644 --- a/flake.nix +++ b/flake.nix @@ -3,14 +3,14 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. # Home manager - home-manager.url = "github:nix-community/home-manager/release-24.05"; + home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; hardware.url = "github:nixos/nixos-hardware"; diff --git a/home/features/cli/gpg.nix b/home/features/cli/gpg.nix index 22a6510..302f389 100644 --- a/home/features/cli/gpg.nix +++ b/home/features/cli/gpg.nix @@ -19,7 +19,7 @@ # Disable gnome-keyring ssh-agent xdg.configFile."autostart/gnome-keyring-ssh.desktop".text = '' - ${lib.fileContents "${pkgs.gnome3.gnome-keyring}/etc/xdg/autostart/gnome-keyring-ssh.desktop"} + ${lib.fileContents "${pkgs.gnome-keyring}/etc/xdg/autostart/gnome-keyring-ssh.desktop"} Hidden=true ''; } diff --git a/home/global/default.nix b/home/global/default.nix index bc5e84d..704f58f 100644 --- a/home/global/default.nix +++ b/home/global/default.nix @@ -59,7 +59,7 @@ nix = { package = lib.mkDefault pkgs.nix; settings = { - experimental-features = ["nix-command" "flakes" "repl-flake"]; + experimental-features = ["nix-command" "flakes"]; warn-dirty = false; }; }; diff --git a/hosts/adalbert/default.nix b/hosts/adalbert/default.nix index 35515fc..3a78576 100644 --- a/hosts/adalbert/default.nix +++ b/hosts/adalbert/default.nix @@ -61,7 +61,7 @@ allowUnfree = true; firefox.enablePlasmaBrowserIntegration = true; segger-jlink.acceptLicense = true; - permittedInsecurePackages = ["segger-jlink-qt4-794l"]; + permittedInsecurePackages = ["segger-jlink-qt4-796s"]; }; }; diff --git a/hosts/common/global/nix.nix b/hosts/common/global/nix.nix index 08f9cfb..ee2d9ab 100644 --- a/hosts/common/global/nix.nix +++ b/hosts/common/global/nix.nix @@ -6,7 +6,7 @@ nix = { settings = { auto-optimise-store = lib.mkDefault true; - experimental-features = ["nix-command" "flakes" "repl-flake"]; + experimental-features = ["nix-command" "flakes"]; warn-dirty = false; system-features = ["kvm" "big-parallel" "nixos-test"]; }; diff --git a/hosts/common/optional/desktop/gnome.nix b/hosts/common/optional/desktop/gnome.nix index 6c06551..055eda6 100644 --- a/hosts/common/optional/desktop/gnome.nix +++ b/hosts/common/optional/desktop/gnome.nix @@ -16,36 +16,32 @@ wacom.enable = true; }; udev.packages = with pkgs; [ - gnome.gnome-settings-daemon + gnome-settings-daemon ]; }; environment = { systemPackages = with pkgs; [ # System-Wide Packages - gnome.adwaita-icon-theme - gnome.dconf-editor - gnome.gnome-tweaks + adwaita-icon-theme + dconf-editor + gnome-tweaks gnomeExtensions.kimpanel gnomeExtensions.vitals gnomeExtensions.tray-icons-reloaded ]; - gnome.excludePackages = - (with pkgs; [ - # Ignored Packages - gnome-tour - gedit - ]) - ++ (with pkgs.gnome; [ - atomix - epiphany - geary - gnome-characters - gnome-contacts - gnome-initial-setup - hitori - iagno - tali - ]); + gnome.excludePackages = with pkgs; [ + gnome-tour + gedit + atomix + epiphany + geary + gnome-characters + gnome-contacts + gnome-initial-setup + hitori + iagno + tali + ]; }; } diff --git a/hosts/common/optional/desktop/japanese.nix b/hosts/common/optional/desktop/japanese.nix index dfb9c2f..705d7ca 100644 --- a/hosts/common/optional/desktop/japanese.nix +++ b/hosts/common/optional/desktop/japanese.nix @@ -1,6 +1,7 @@ {pkgs, ...}: { i18n.inputMethod = { - enabled = "fcitx5"; + enable = true; + type = "fcitx5"; fcitx5.addons = with pkgs; [ fcitx5-mozc fcitx5-gtk diff --git a/hosts/ludwig/default.nix b/hosts/ludwig/default.nix index 78c89ee..c9765a2 100644 --- a/hosts/ludwig/default.nix +++ b/hosts/ludwig/default.nix @@ -60,7 +60,7 @@ # Disable if you don't want unfree packages allowUnfree = true; segger-jlink.acceptLicense = true; - permittedInsecurePackages = ["segger-jlink-qt4-794l"]; + permittedInsecurePackages = ["segger-jlink-qt4-796s"]; }; }; @@ -78,7 +78,7 @@ }; hardware = { - opengl = { + graphics = { enable = true; extraPackages = with pkgs; [ intel-media-driver # LIBVA_DRIVER_NAME=iHD