diff options
| Commit | 7440b777f229176f4760463a645584e173dd9edc (patch) | |
|---|---|---|
| Author | 2025-12-28 14:08:20 +0200 | |
| Committer | 2025-12-28 14:08:20 +0200 | |
| Files | 8751e30885e6f4806e0916858e8f7dad7f641fe9 | |
| nix-7440b777f229176f4760463a645584e173dd9edc.tar nix-7440b777f229176f4760463a645584e173dd9edc.tar.gz nix-7440b777f229176f4760463a645584e173dd9edc.zip | ||
| Parent | 16b9ef444a45a4fabbfe87fe6b952df856833475 (diff) | |
feat!: Update to 25.11
10 files changed, 19 insertions, 18 deletions
| -rw-r--r-- | flake.lock | 8 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | machines/juno/hardware-configuration.nix | 4 | ||||
| -rw-r--r-- | machines/minerva/hardware-configuration.nix | 4 | ||||
| -rw-r--r-- | modules/personal/dev-cli.nix | 2 | ||||
| -rw-r--r-- | modules/personal/fonts.nix | 2 | ||||
| -rw-r--r-- | modules/personal/gui-essential.nix | 2 | ||||
| -rw-r--r-- | modules/personal/hardware-general.nix | 2 | ||||
| -rw-r--r-- | modules/personal/openbox-de.nix | 9 | ||||
| -rw-r--r-- | overlays/xed-editor/default.nix | 2 |
@@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1766399428, - "narHash": "sha256-vS6LSOMDOB3s+L6tqw9IGujxnmUAZQnEG+Vi640LayI=", + "lastModified": 1766736597, + "narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a6c3a6141ec1b367c58ead3f7f846c772a25f4e5", + "rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -2,7 +2,7 @@ description = "System setup"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-2305.url = "github:nixos/nixpkgs/nixos-23.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; diff --git a/machines/juno/hardware-configuration.nix b/machines/juno/hardware-configuration.nix index 1ca5b5f..c4a2428 100644 --- a/machines/juno/hardware-configuration.nix +++ b/machines/juno/hardware-configuration.nix @@ -35,13 +35,13 @@ # Hardware acceleration # https://nixos.wiki/wiki/Accelerated_Video_Playback nixpkgs.config.packageOverrides = pkgs: { - vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; + intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; }; }; hardware.opengl = { enable = true; extraPackages = with pkgs; [ intel-media-driver # LIBVA_DRIVER_NAME=iHD - vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) + intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) ]; }; } diff --git a/machines/minerva/hardware-configuration.nix b/machines/minerva/hardware-configuration.nix index ac80589..e7f8de5 100644 --- a/machines/minerva/hardware-configuration.nix +++ b/machines/minerva/hardware-configuration.nix @@ -39,13 +39,13 @@ # Hardware acceleration # https://nixos.wiki/wiki/Accelerated_Video_Playback nixpkgs.config.packageOverrides = pkgs: { - vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; + intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; }; }; hardware.opengl = { enable = true; extraPackages = with pkgs; [ intel-media-driver # LIBVA_DRIVER_NAME=iHD - vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) + intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) ]; }; } diff --git a/modules/personal/dev-cli.nix b/modules/personal/dev-cli.nix index 6df25eb..d13fc8e 100644 --- a/modules/personal/dev-cli.nix +++ b/modules/personal/dev-cli.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { environment.systemPackages = with pkgs; [ gnumake just - lowdown wakatime cloc go php fontforge ruby csslint highlight ripgrep + lowdown wakatime-cli cloc go php fontforge ruby highlight ripgrep # C/C++ clang clang-tools libclang glibc gcc gdb valgrind pugixml cmake libusb1 libusb-compat-0_1 meson # .NET diff --git a/modules/personal/fonts.nix b/modules/personal/fonts.nix index 4469ad6..b0790d9 100644 --- a/modules/personal/fonts.nix +++ b/modules/personal/fonts.nix @@ -2,7 +2,7 @@ fonts.packages = with pkgs; [ meslolgs-nerdfont # Note to self: DO NOT INSTALL ADOBE FONTS! - corefonts vistafonts liberation_ttf helvetica-neue-lt-std noto-fonts noto-fonts-emoji cm_unicode #symbola + corefonts vista-fonts liberation_ttf helvetica-neue-lt-std noto-fonts noto-fonts-color-emoji cm_unicode #symbola # CJK noto-fonts-cjk-sans arphic-ukai arphic-uming takao wqy_microhei wqy_zenhei ]; diff --git a/modules/personal/gui-essential.nix b/modules/personal/gui-essential.nix index f2eef15..6878463 100644 --- a/modules/personal/gui-essential.nix +++ b/modules/personal/gui-essential.nix @@ -9,7 +9,7 @@ # Settings and backup tools feh arandr pavucontrol blueberry piper # Tray - copyq flameshot barrier redshift + copyq flameshot nixpkgs-2305.barrier redshift # File openers/players audacious mpv libreoffice # File editors diff --git a/modules/personal/hardware-general.nix b/modules/personal/hardware-general.nix index 83a5371..9a5962d 100644 --- a/modules/personal/hardware-general.nix +++ b/modules/personal/hardware-general.nix @@ -15,7 +15,7 @@ hardware.graphics = { enable = true; extraPackages = with pkgs; [ - vaapiVdpau + libva-vdpau-driver libvdpau-va-gl ]; }; diff --git a/modules/personal/openbox-de.nix b/modules/personal/openbox-de.nix index 3cd155e..aa5163e 100644 --- a/modules/personal/openbox-de.nix +++ b/modules/personal/openbox-de.nix @@ -46,10 +46,11 @@ gnome.gnome-keyring.enable = true; gvfs.enable = true; # MTP (for nemo) - logind.extraConfig = '' - InhibitDelayMaxSec=1 - HoldoffTimeoutSec=1s - HandlePowerKey=poweroff''; + logind.settings.Login = { + InhibitDelayMaxSec = 1; + HoldoffTimeoutSec = "1s"; + HandlePowerKey = "poweroff"; + }; }; services.xserver = { diff --git a/overlays/xed-editor/default.nix b/overlays/xed-editor/default.nix index 28ef4f9..ed5f6dc 100644 --- a/overlays/xed-editor/default.nix +++ b/overlays/xed-editor/default.nix @@ -1,5 +1,5 @@ final: prev: { - xed-editor = prev.xed-editor.overrideAttrs (prevAttrs: { + xed-editor-fixed = prev.xed-editor.overrideAttrs (prevAttrs: { buildInputs = prevAttrs.buildInputs ++ (with final; [ gobject-introspection python3.pkgs.pygobject3 |
