From 957b5f018f891e0948aae00a02abc11fe11c89b6 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Sun, 8 Mar 2026 13:58:22 -0400 Subject: [PATCH] Updated nix to 25.11 Fixed failing assertions: - xdg.portal now requires `environment.pathsToLink` - `virtualisation.libvirtd.qemu.ovmf` is deprecated - noto-fonts-emoji -> noto-fonts-color-emoji - `rofi-wayland` has been merged into `rofi` - `sumneko-lua-language-server` -> `lua-language-server` - `glxinfo` -> `mesa-demos` --- flake.lock | 58 ++++++------------- src/system/machines/desktop/hardware.nix | 4 +- src/system/machines/desktop/system.nix | 16 +++-- src/system/machines/workstation/hardware.nix | 3 - src/user/modules/git/default.nix | 2 +- .../gui/wm/hyprland/config/rofi/default.nix | 2 +- src/user/modules/gui/wm/hyprland/default.nix | 4 +- src/user/modules/gui/wm/i3/default.nix | 2 +- .../gui/wm/sway/config/rofi/default.nix | 2 +- src/user/modules/gui/wm/sway/default.nix | 2 +- .../utils/modules/neovim/config/pkgs.nix | 2 +- 11 files changed, 39 insertions(+), 58 deletions(-) diff --git a/flake.lock b/flake.lock index 107b007..a6bc478 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -44,16 +44,16 @@ ] }, "locked": { - "lastModified": 1751468302, - "narHash": "sha256-tWosziZTT039x6PgEZUhzGlV8oLvdDmIgKTE8ESMaEA=", + "lastModified": 1772985280, + "narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=", "owner": "nix-community", "repo": "home-manager", - "rev": "501cfec8277f931a9c9af9f23d3105c537faeafe", + "rev": "8f736f007139d7f70752657dff6a401a585d6cbc", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -82,27 +82,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751582995, - "narHash": "sha256-u7ubvtxdTnFPpV27AHpgoKn7qHuE7sgWgza/1oj5nzA=", + "lastModified": 1772822230, + "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7a732ed41ca0dd64b4b71b563ab9805a80a7d693", + "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1772773019, + "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "aca4d95fce4914b3892661bcb80b8087293536c6", "type": "github" }, "original": { @@ -115,15 +115,14 @@ "nur": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2", - "treefmt-nix": "treefmt-nix" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1733889014, - "narHash": "sha256-6w2W/GXmD4HqaAOXZXbJfJK89qiVi5JI2rygyPwVCtM=", + "lastModified": 1772989037, + "narHash": "sha256-MgM2cGG/gMFUJTPsx5htNw+KLnt4PbFYT7IjOQEARtw=", "owner": "nix-community", "repo": "NUR", - "rev": "7d710c09dcece5dc146a945d9b6e6a3862985bfa", + "rev": "58e5a1120be50a9434fc3ca91323a3c5a9baead7", "type": "github" }, "original": { @@ -139,27 +138,6 @@ "nixpkgs": "nixpkgs", "nur": "nur" } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", diff --git a/src/system/machines/desktop/hardware.nix b/src/system/machines/desktop/hardware.nix index 9a99a3a..3d77e6b 100644 --- a/src/system/machines/desktop/hardware.nix +++ b/src/system/machines/desktop/hardware.nix @@ -21,8 +21,9 @@ vulkan-loader vulkan-tools vulkan-extension-layer - glxinfo + mesa + mesa-demos cudaPackages.cudatoolkit cudaPackages.cudnn @@ -67,7 +68,6 @@ enable = true; qemu = { runAsRoot = true; - ovmf.enable = true; }; }; diff --git a/src/system/machines/desktop/system.nix b/src/system/machines/desktop/system.nix index 87a4d74..2a1af16 100644 --- a/src/system/machines/desktop/system.nix +++ b/src/system/machines/desktop/system.nix @@ -44,11 +44,17 @@ #timeout = null; }; - environment.systemPackages = with pkgs; [ - vim - git - usbutils - ]; + environment = { + systemPackages = with pkgs; [ + vim + git + usbutils + ]; + pathsToLink = [ + "/share/applications" + "/share/xdg-desktop-portal" + ]; + }; fonts.packages = with pkgs; [ nerd-fonts.terminess-ttf diff --git a/src/system/machines/workstation/hardware.nix b/src/system/machines/workstation/hardware.nix index b85333a..65039d1 100644 --- a/src/system/machines/workstation/hardware.nix +++ b/src/system/machines/workstation/hardware.nix @@ -38,8 +38,6 @@ mesa-demos libGL - - glxinfo ]; fileSystems = { @@ -72,7 +70,6 @@ enable = true; qemu = { runAsRoot = true; - ovmf.enable = true; }; }; diff --git a/src/user/modules/git/default.nix b/src/user/modules/git/default.nix index b3bc4d4..b03a23c 100644 --- a/src/user/modules/git/default.nix +++ b/src/user/modules/git/default.nix @@ -11,7 +11,7 @@ in git = { enable = true; package = pkgs.gitSVN; - extraConfig = { + settings = { init = { defaultBranch = "master"; }; #format = { pretty = "oneline"; }; #log = { abbrevCommit = true; }; diff --git a/src/user/modules/gui/wm/hyprland/config/rofi/default.nix b/src/user/modules/gui/wm/hyprland/config/rofi/default.nix index 6a6a5f4..724fd55 100644 --- a/src/user/modules/gui/wm/hyprland/config/rofi/default.nix +++ b/src/user/modules/gui/wm/hyprland/config/rofi/default.nix @@ -5,7 +5,7 @@ let in { enable = true; - package = pkgs.rofi-wayland; + package = pkgs.rofi; location = "center"; terminal = "\${pkgs.alacritty}/bin/alacritty"; plugins = with pkgs; [ diff --git a/src/user/modules/gui/wm/hyprland/default.nix b/src/user/modules/gui/wm/hyprland/default.nix index 4c52c73..5cfe73d 100644 --- a/src/user/modules/gui/wm/hyprland/default.nix +++ b/src/user/modules/gui/wm/hyprland/default.nix @@ -122,7 +122,7 @@ in programs.rofi = { enable = true; - package = pkgs.rofi-wayland; + package = pkgs.rofi; location = "center"; terminal = "alacritty"; plugins = with pkgs; [ @@ -159,7 +159,7 @@ in noto-fonts noto-fonts-cjk-sans - noto-fonts-emoji + noto-fonts-color-emoji ]; sessionVariables = { diff --git a/src/user/modules/gui/wm/i3/default.nix b/src/user/modules/gui/wm/i3/default.nix index eaea068..4617ee3 100644 --- a/src/user/modules/gui/wm/i3/default.nix +++ b/src/user/modules/gui/wm/i3/default.nix @@ -132,7 +132,7 @@ in nerd-fonts.terminess-ttf noto-fonts noto-fonts-cjk-sans - noto-fonts-emoji + noto-fonts-color-emoji ]; programs = { diff --git a/src/user/modules/gui/wm/sway/config/rofi/default.nix b/src/user/modules/gui/wm/sway/config/rofi/default.nix index 6a6a5f4..724fd55 100644 --- a/src/user/modules/gui/wm/sway/config/rofi/default.nix +++ b/src/user/modules/gui/wm/sway/config/rofi/default.nix @@ -5,7 +5,7 @@ let in { enable = true; - package = pkgs.rofi-wayland; + package = pkgs.rofi; location = "center"; terminal = "\${pkgs.alacritty}/bin/alacritty"; plugins = with pkgs; [ diff --git a/src/user/modules/gui/wm/sway/default.nix b/src/user/modules/gui/wm/sway/default.nix index bf27a57..3c89535 100644 --- a/src/user/modules/gui/wm/sway/default.nix +++ b/src/user/modules/gui/wm/sway/default.nix @@ -156,7 +156,7 @@ in nerd-fonts.terminess-ttf noto-fonts noto-fonts-cjk-sans - noto-fonts-emoji + noto-fonts-color-emoji ]; programs = { diff --git a/src/user/modules/utils/modules/neovim/config/pkgs.nix b/src/user/modules/utils/modules/neovim/config/pkgs.nix index 94ef1fc..7971a52 100644 --- a/src/user/modules/utils/modules/neovim/config/pkgs.nix +++ b/src/user/modules/utils/modules/neovim/config/pkgs.nix @@ -4,7 +4,7 @@ let lsp = with pkgs; [ nil marksman - sumneko-lua-language-server stylua + lua-language-server stylua nodePackages."@tailwindcss/language-server" pyright clang-tools