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 --- common/commandline.nix | 2 +- flake.lock | 16 ++++++++-------- flake.nix | 12 ++++++------ profiles/desktop.nix | 2 -- templates/desktop/flake.nix | 8 ++++---- usecases/desktop/graphical.nix | 16 ++++++++-------- usecases/desktop/graphical/gaming.nix | 2 +- usecases/desktop/graphical/gtk.nix | 2 +- usecases/server/jellyfin.nix | 2 +- 9 files changed, 30 insertions(+), 32 deletions(-) diff --git a/common/commandline.nix b/common/commandline.nix index 2ff6291..25ab404 100644 --- a/common/commandline.nix +++ b/common/commandline.nix @@ -82,7 +82,7 @@ in { cpr = "${pkgs.rsync}/bin/rsync -ah --inplace --info=progress2"; }; - programs.bash.enableCompletion = true; + programs.bash.completion.enable = true; programs.less = { envVariables = { diff --git a/flake.lock b/flake.lock index 6287550..114ee1d 100644 --- a/flake.lock +++ b/flake.lock @@ -151,16 +151,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1733951536, + "narHash": "sha256-Zb5ZCa7Xj+0gy5XVXINTSr71fCfAv+IKtmIXNrykT54=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "1318c3f3b068cdcea922fa7c1a0a1f0c96c22f5f", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -253,16 +253,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733730953, - "narHash": "sha256-dlK7n82FEyZlHH7BFHQAM5tua+lQO1Iv7aAtglc1O5s=", + "lastModified": 1733808091, + "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7109b680d161993918b0a126f38bc39763e5a709", + "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", "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 4103bf4..318d314 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,11 @@ description = "My NixOS configurations"; 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"; flake-utils.url = "github:numtide/flake-utils"; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; rycee-nur = { @@ -42,8 +42,8 @@ test = { config, ... }: { imports = [ self.nixosModules.default ]; - home-manager.users.minijackson.home.stateVersion = "24.05"; - home-manager.users.root.home.stateVersion = "24.05"; + home-manager.users.minijackson.home.stateVersion = "24.11"; + home-manager.users.root.home.stateVersion = "24.11"; users.users.minijackson.initialHashedPassword = ""; users.users.root.initialHashedPassword = ""; @@ -262,8 +262,8 @@ isoImage.makeEfiBootable = true; isoImage.makeUsbBootable = true; - home-manager.users.minijackson.home.stateVersion = "24.05"; - home-manager.users.root.home.stateVersion = "24.05"; + home-manager.users.minijackson.home.stateVersion = "24.11"; + home-manager.users.root.home.stateVersion = "24.11"; users.users.minijackson.initialHashedPassword = ""; users.users.root.initialHashedPassword = ""; diff --git a/profiles/desktop.nix b/profiles/desktop.nix index 6691d48..03705a3 100644 --- a/profiles/desktop.nix +++ b/profiles/desktop.nix @@ -6,7 +6,6 @@ inputs: {pkgs, ...}: { users.extraUsers.minijackson.packages = with pkgs; [ aria2 tmuxp - taskwarrior tokei neofetch ffmpeg @@ -17,7 +16,6 @@ inputs: {pkgs, ...}: { aspell aspellDicts.en aspellDicts.en-computers - aspellDicts.en-science aspellDicts.fr ]; diff --git a/templates/desktop/flake.nix b/templates/desktop/flake.nix index 12f0898..3025434 100644 --- a/templates/desktop/flake.nix +++ b/templates/desktop/flake.nix @@ -1,7 +1,7 @@ { description = "Flake for the myHostname host"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; inputs.nixos-config-reborn = { url = "git+https://git.huh.gdn/NixOS/nixos-config-reborn"; @@ -35,10 +35,10 @@ ./tinc.nix ({ ... }: { - home-manager.users.minijackson.home.stateVersion = "24.05"; - home-manager.users.root.home.stateVersion = "24.05"; + home-manager.users.minijackson.home.stateVersion = "24.11"; + home-manager.users.root.home.stateVersion = "24.11"; - system.stateVersion = "24.05"; + system.stateVersion = "24.11"; }) ]; }; 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