From 8928c67520d6f6c5a2de608681ed6a48fe500190 Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Mon, 18 Nov 2024 21:18:36 +0100 Subject: [PATCH] Upgrade to 24.11 --- flake.lock | 28 ++++++++++++++-------------- flake.nix | 4 ++-- modules/desktop/packages.nix | 6 +++--- modules/desktop/system.nix | 8 ++++---- modules/nvidia/default.nix | 4 +++- users/lyes/packages.nix | 5 ----- 6 files changed, 26 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index c31a977..a203db8 100644 --- a/flake.lock +++ b/flake.lock @@ -7,16 +7,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1731880681, + "narHash": "sha256-FmYTkIyPBUxSWgA7DPIVTsCCMvSSbs56yOtHpLNSnKg=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "aecd341dfead1c3ef7a3c15468ecd71e8343b7c6", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -39,11 +39,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731403644, - "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", + "lastModified": 1731797098, + "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f6581f1c3b137086e42a08a906bdada63045f991", + "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", "type": "github" }, "original": { @@ -55,27 +55,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731239293, - "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", + "lastModified": 1731755305, + "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", + "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ea5daab..792b639 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,9 @@ description = "NixOS Configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; - 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"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; diff --git a/modules/desktop/packages.nix b/modules/desktop/packages.nix index a60ecea..07eb978 100644 --- a/modules/desktop/packages.nix +++ b/modules/desktop/packages.nix @@ -113,7 +113,7 @@ in { # Containers & VMs toolbox distrobox - gnome.gnome-boxes + gnome-boxes # Virtualization qemu @@ -125,7 +125,7 @@ in { # Utilities impression resources - gnome.file-roller + file-roller baobab # Proton @@ -135,7 +135,7 @@ in { unstable.proton-pass # Customization - gnome.gnome-tweaks + gnome-tweaks gnome-extension-manager adw-gtk3 paper-icon-theme diff --git a/modules/desktop/system.nix b/modules/desktop/system.nix index f7bbf30..fde5862 100644 --- a/modules/desktop/system.nix +++ b/modules/desktop/system.nix @@ -20,15 +20,15 @@ auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so auth optional pam_permit.so auth required pam_env.so - auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so - auth optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so + auth [success=ok default=1] ${pkgs.gdm}/lib/security/pam_gdm.so + auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so account include login password required pam_deny.so session include login - session optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start + session optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start ''; # Touchpad @@ -64,7 +64,7 @@ # Firefox config programs.firefox = { enable = true; - package = (pkgs.wrapFirefox (pkgs.firefox-beta-unwrapped.override { pipewireSupport = true;}) {}); + package = pkgs.firefox-beta; # Doesn't work ? # languagePacks = [ "fr" "en-US" ]; }; diff --git a/modules/nvidia/default.nix b/modules/nvidia/default.nix index d662884..3529c1d 100644 --- a/modules/nvidia/default.nix +++ b/modules/nvidia/default.nix @@ -1,4 +1,4 @@ -{ ... }: +{ config, ... }: { # NVidia @@ -10,6 +10,8 @@ }; hardware.nvidia = { + package = config.boot.kernelPackages.nvidiaPackages.beta; + # Modesetting is needed for most wayland compositors modesetting.enable = true; diff --git a/users/lyes/packages.nix b/users/lyes/packages.nix index 9bcd343..298db43 100644 --- a/users/lyes/packages.nix +++ b/users/lyes/packages.nix @@ -23,10 +23,5 @@ ledit nodejs nil - - # Containers & VMs - toolbox - distrobox - gnome.gnome-boxes ]; }