From 107cfa93fb39d8d80c51d5fe079643e45c9109fb Mon Sep 17 00:00:00 2001 From: Andre Date: Mon, 18 Nov 2024 11:10:20 -0500 Subject: [PATCH] General: upgrade to NixOS 24.11 --- flake.lock | 16 +++++----- flake.nix | 4 +-- hosts/Hevana/default.nix | 3 -- hosts/Khanda/default.nix | 5 +--- hosts/Pihole/default.nix | 2 +- hosts/Shura/default.nix | 5 +--- modules/apps/development.nix | 1 - modules/system/bluetooth.nix | 9 ------ modules/system/bluetooth/shure-aonic-tw2 | 19 ------------ modules/system/gpu/amd.nix | 7 ++--- modules/ui/desktops/common.nix | 2 +- modules/ui/desktops/gnome.nix | 38 ++++++------------------ 12 files changed, 26 insertions(+), 85 deletions(-) delete mode 100644 modules/system/bluetooth/shure-aonic-tw2 diff --git a/flake.lock b/flake.lock index 415fef2..7d6d389 100644 --- a/flake.lock +++ b/flake.lock @@ -157,16 +157,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" } @@ -331,16 +331,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1731755305, + "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", "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 56db5d6..c5376e9 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ # Import the desired Nix channel. Defaults to unstable, which uses a fully tested rolling release model. # You can find a list of channels at https://wiki.nixos.org/wiki/Channel_branches # To follow a different channel, replace `nixos-unstable` with the channel name, e.g. `nixos-24.05`. - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Repository for Gnome triple buffering patch @@ -19,7 +19,7 @@ # Home-manager support home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/hosts/Hevana/default.nix b/hosts/Hevana/default.nix index ca80aec..5b0f1fb 100644 --- a/hosts/Hevana/default.nix +++ b/hosts/Hevana/default.nix @@ -35,9 +35,6 @@ in networking.hostName = hostName; ###*** Configure your system below this line. ***### - # Set your time zone. - # To see all available timezones, run `timedatectl list-timezones`. - time.timeZone = "America/New_York"; # Enable dynamic DNS with Porkbun services.ddclient = { diff --git a/hosts/Khanda/default.nix b/hosts/Khanda/default.nix index d53d745..a076298 100644 --- a/hosts/Khanda/default.nix +++ b/hosts/Khanda/default.nix @@ -59,10 +59,7 @@ in }; ui = { - desktops.gnome = { - enable = true; - experimental.enable = false; - }; + desktops.gnome.enable = true; flatpak = { # Enable Flatpak support. enable = true; diff --git a/hosts/Pihole/default.nix b/hosts/Pihole/default.nix index 73ea477..7bdde1c 100644 --- a/hosts/Pihole/default.nix +++ b/hosts/Pihole/default.nix @@ -34,7 +34,7 @@ in ]; services.ssh = { enable = true; - ports = [ config.secrets.hosts.dimaga.ssh.port ]; + ports = [ config.secrets.hosts.hevana.ssh.port ]; }; users.aires.enable = true; }; diff --git a/hosts/Shura/default.nix b/hosts/Shura/default.nix index efaa74b..e7a68cf 100644 --- a/hosts/Shura/default.nix +++ b/hosts/Shura/default.nix @@ -97,10 +97,7 @@ in useBindFS = true; }; - desktops.gnome = { - enable = true; - experimental.enable = true; - }; + desktops.gnome.enable = true; }; users = { aires = { diff --git a/modules/apps/development.nix b/modules/apps/development.nix index c26c228..b6f1427 100644 --- a/modules/apps/development.nix +++ b/modules/apps/development.nix @@ -20,7 +20,6 @@ in (lib.mkIf cfg.enable { aux.system = { packages = with pkgs; [ - nixd nix-prefetch-scripts ]; ui.flatpak = { diff --git a/modules/system/bluetooth.nix b/modules/system/bluetooth.nix index 4638a8e..42b1532 100644 --- a/modules/system/bluetooth.nix +++ b/modules/system/bluetooth.nix @@ -8,9 +8,6 @@ let cfg = config.aux.system.bluetooth; - - # Copy bluetooth device configs - shure-aonic-bluetooth = pkgs.writeText "info" (builtins.readFile ./bluetooth/shure-aonic-tw2); in { @@ -42,11 +39,5 @@ in # Add Bluetooth LE audio support environment.systemPackages = with pkgs; [ liblc3 ]; - - # Install Bluetooth device profiles - systemd.tmpfiles.rules = lib.mkIf (cfg.adapter != "") [ - "d /var/lib/bluetooth/${cfg.adapter}/ 0700 root root" # First, make sure the directory exists - "L+ /var/lib/bluetooth/${cfg.adapter}/00:0E:DD:72:2F:0C/info - - - - ${shure-aonic-bluetooth}" - ]; }; } diff --git a/modules/system/bluetooth/shure-aonic-tw2 b/modules/system/bluetooth/shure-aonic-tw2 deleted file mode 100644 index ea210d2..0000000 --- a/modules/system/bluetooth/shure-aonic-tw2 +++ /dev/null @@ -1,19 +0,0 @@ -[General] -Name=Shure AONIC TW2 -Class=0x2c0404 -SupportedTechnologies=BR/EDR;LE; -Trusted=true -Blocked=false -Services=00001101-0000-1000-8000-00805f9b34fb;00001108-0000-1000-8000-00805f9b34fb;0000110a-0000-1000-8000-00805f9b34fb;0000110b-0000-1000-8000-00805f9b34fb;0000110c-0000-1000-8000-00805f9b34fb;0000110d-0000-1000-8000-00805f9b34fb;0000110e-0000-1000-8000-00805f9b34fb;0000111e-0000-1000-8000-00805f9b34fb;0000eb03-d102-11e1-9b23-00025b00a5a5;0000eb04-d102-11e1-9b23-00025b00a5a5;0000eb05-d102-11e1-9b23-00025b00a5a5; -AddressType=public - -[LinkKey] -Key=DFC42899B038D6C6B1296CF98DB0508A -Type=4 -PINLength=0 - -[ConnectionParameters] -MinInterval=24 -MaxInterval=40 -Latency=0 -Timeout=400 \ No newline at end of file diff --git a/modules/system/gpu/amd.nix b/modules/system/gpu/amd.nix index 63a2cb8..39828ef 100644 --- a/modules/system/gpu/amd.nix +++ b/modules/system/gpu/amd.nix @@ -17,11 +17,10 @@ in boot.initrd.kernelModules = [ "amdgpu" ]; services.xserver.videoDrivers = [ "amdgpu" ]; - hardware.opengl = { - extraPackages = [ pkgs.amdvlk ]; + hardware.graphics = { + enable = true; # 32-bit application compatibility - driSupport32Bit = true; - extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ]; + enable32Bit = true; }; }; } diff --git a/modules/ui/desktops/common.nix b/modules/ui/desktops/common.nix index 4b5862b..23f5154 100644 --- a/modules/ui/desktops/common.nix +++ b/modules/ui/desktops/common.nix @@ -58,7 +58,7 @@ in # Install extra fonts packages = with pkgs; [ noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji liberation_ttf fira-code diff --git a/modules/ui/desktops/gnome.nix b/modules/ui/desktops/gnome.nix index 2f43069..c9d1843 100644 --- a/modules/ui/desktops/gnome.nix +++ b/modules/ui/desktops/gnome.nix @@ -15,7 +15,6 @@ in options = { aux.system.ui.desktops.gnome = { enable = lib.mkEnableOption "Enables the Gnome Desktop Environment."; - experimental.enable = lib.mkEnableOption "Enables fractional scaling, dynamic triple buffering, and variable refresh rate (VRR)."; }; }; @@ -31,13 +30,10 @@ in # Enable Gnome desktopManager.gnome = { enable = true; - - # Enable experimental features - extraGSettingsOverrides = lib.mkIf cfg.experimental.enable '' + extraGSettingsOverrides = '' [org.gnome.mutter] - experimental-features = [ 'scale-monitor-framebuffer','variable-refresh-rate' ] + experimental-features = [ 'variable-refresh-rate' ] ''; - extraGSettingsOverridePackages = lib.mkIf cfg.experimental.enable [ pkgs.gnome.mutter ]; }; displayManager.gdm.enable = true; }; @@ -67,14 +63,13 @@ in environment = { # Remove default Gnome packages that came with the install, then install the ones I actually use - gnome.excludePackages = - (with pkgs; [ + gnome.excludePackages = ( + with pkgs; + [ gnome-photos gnome-tour gnomeExtensions.extension-list gedit # text editor - ]) - ++ (with pkgs.gnome; [ gnome-music gnome-calendar epiphany # web browser @@ -87,18 +82,15 @@ in iagno # go game hitori # sudoku game atomix # puzzle game - ]); + ] + ); # Install additional packages systemPackages = with pkgs; [ # Gnome tweak tools - gnome.gnome-tweaks - # Gnome extensions - gnomeExtensions.alphabetical-app-grid - gnomeExtensions.appindicator - gnomeExtensions.dash-to-panel + gnome-tweaks # Themeing - gnome.gnome-themes-extra + gnome-themes-extra papirus-icon-theme qogir-icon-theme ]; @@ -110,17 +102,5 @@ in platformTheme = "gnome"; style = "adwaita-dark"; }; - - nixpkgs.overlays = lib.mkIf cfg.experimental.enable [ - (final: prev: { - gnome = prev.gnome.overrideScope ( - gnomeFinal: gnomePrev: { - mutter = gnomePrev.mutter.overrideAttrs (old: { - src = inputs.gnome-triplebuffering; - }); - } - ); - }) - ]; }; }