From 4efebf051ac0b848fb658d9a8c7ca1a3a3f8928a Mon Sep 17 00:00:00 2001 From: alsaiduq-lab Date: Fri, 5 Dec 2025 16:25:11 -0700 Subject: [PATCH] update to 25.11 --- flake.lock | 138 ++++++++++++++++------------ flake.nix | 6 +- home-manager/cobray.nix | 2 + home-manager/init.nix | 3 +- home-manager/modules/emulators.nix | 2 +- home-manager/modules/quickshell.nix | 2 + hosts/modules/core.nix | 6 +- hosts/modules/env.nix | 2 - hosts/modules/fonts.nix | 2 +- hosts/modules/hyprland.nix | 16 +++- hosts/modules/libs.nix | 9 +- hosts/modules/nixos.nix | 2 + hosts/modules/searxng.nix | 2 +- 13 files changed, 118 insertions(+), 74 deletions(-) diff --git a/flake.lock b/flake.lock index 4362f48..67d0e0a 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1763922789, - "narHash": "sha256-XnkWjCpeXfip9tqYdL0b0zzBDjq+dgdISvEdSVGdVyA=", + "lastModified": 1764370710, + "narHash": "sha256-7iZklFmziy6Vn5ZFy9mvTSuFopp3kJNuPxL5QAvtmFQ=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a20a0e67a33b6848378a91b871b89588d3a12573", + "rev": "561ae7fbe1ca15dfd908262ec815bf21a13eef63", "type": "github" }, "original": { @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1764629372, - "narHash": "sha256-FvF/Mg5knyvo/lvn0Rk5wYm62jfo6Yqz7xpUGVloHcw=", + "lastModified": 1764974375, + "narHash": "sha256-gclFWbZr77pgomHmO2XAu4EhGTQnnLURDV1LzlAe7XM=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "468e569bc7d596f35c9e8564bbe76eae146869c1", + "rev": "2ddc448150b0576afe528ae5700ac031f94c9547", "type": "github" }, "original": { @@ -173,11 +173,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1764605702, - "narHash": "sha256-ZGIKHORnvJ+6ghU/KjtXTesbRB4S75KwwAat7UFMpXU=", + "lastModified": 1764953050, + "narHash": "sha256-TkMjYCGm6FHflVQadN6mx1+3lWzY4wl+3U40lfvTroQ=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "5714ed07a1012573261b7b7e3ed2add9c1504496", + "rev": "08c9661683edc1e9e63d8e6abd469a68faaee575", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1764636297, - "narHash": "sha256-S41K55kw+hWgDfgKmZ9/fMZ3F0BQDMvqFfE120fMHeE=", + "lastModified": 1764952935, + "narHash": "sha256-cRPB2zESVMjIGxJ49qj4t4qnT0ae44E+fS/mkfOS/BY=", "owner": "nix-community", "repo": "home-manager", - "rev": "ff067cfc619fdf6f82d50344e7d19ff2323f0827", + "rev": "519828bf1c97f8bc2ed2d3b79214067047d3c67d", "type": "github" }, "original": { @@ -333,17 +333,20 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_5", + "hyprwire": "hyprwire", + "nixpkgs": [ + "nixpkgs" + ], "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_3", "xdph": "xdph" }, "locked": { - "lastModified": 1764607679, - "narHash": "sha256-1Bsem6lhJWMQmkLIml5oKOL+z1dYMewZ6ql0K35Y3TA=", + "lastModified": 1764967410, + "narHash": "sha256-oXxSEEcFCEJ1sbpx/L6CCJYUNTzd/gxKg68GFemxPts=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f82a8630d7a51dab4cc70924f500bf70e723db12", + "rev": "222dbe99d0d2d8a61f3b3202f8ef1794b0b081b7", "type": "github" }, "original": { @@ -401,11 +404,11 @@ ] }, "locked": { - "lastModified": 1763727565, - "narHash": "sha256-vRff/2R1U1jzPBy4OODqh2kfUzmizW/nfV2ROzTDIKo=", + "lastModified": 1764616927, + "narHash": "sha256-wRT0MKkpPo11ijSX3KeMN+EQWnpSeUlRtyF3pFLtlRU=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "7724d3a12a0453e7aae05f2ef39474219f05a4b4", + "rev": "25cedbfdc5b3ea391d8307c9a5bea315e5df3c52", "type": "github" }, "original": { @@ -455,11 +458,11 @@ ] }, "locked": { - "lastModified": 1763819661, - "narHash": "sha256-0jLarTR/BLWdGlboM86bPVP2zKJNI2jvo3JietnDkOM=", + "lastModified": 1764612430, + "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "a318deec0c12409ec39c68d2be8096b636dc2a5c", + "rev": "0d00dc118981531aa731150b6ea551ef037acddd", "type": "github" }, "original": { @@ -507,11 +510,11 @@ ] }, "locked": { - "lastModified": 1763503177, - "narHash": "sha256-VPoiswJBBmTLVuNncvT/8FpFR+sYcAi/LgP/zTZ+5rA=", + "lastModified": 1764592794, + "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "f4e1e12755567ecf39090203b8f43eace8279630", + "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e", "type": "github" }, "original": { @@ -532,11 +535,11 @@ ] }, "locked": { - "lastModified": 1763996058, - "narHash": "sha256-DsqzFZvrEV+aDmavjaD4/bk5qxeZwhGxPWBQdpFyM9Y=", + "lastModified": 1764637132, + "narHash": "sha256-vSyiKCzSY48kA3v39GFu6qgRfigjKCU/9k1KTK475gg=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "0168583075baffa083032ed13a8bea8ea12f281a", + "rev": "2f2413801beee37303913fc3c964bbe92252a963", "type": "github" }, "original": { @@ -570,17 +573,46 @@ "type": "github" } }, + "hyprwire": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1764773840, + "narHash": "sha256-9UcCdwe7vPgEcJJ64JseBQL0ZJZoxp/2iFuvfRI+9zk=", + "owner": "hyprwm", + "repo": "hyprwire", + "rev": "3f1997d6aeced318fb141810fded2255da811293", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwire", + "type": "github" + } + }, "nix-gaming": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1764555997, - "narHash": "sha256-R9xuqu+i23t7DQj2hZQ0HINW9V0GsxBFMTQyshGxo0k=", + "lastModified": 1764900011, + "narHash": "sha256-iG5HqIzZ12qzTi3xCwBinw/PR0xNlJNXLLQyV2En1OY=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "a36dc95a8108fa992cc3ecaaa6b5e50700d2788b", + "rev": "e1829ce2d33b1e289b3ecca7530dee84da8d9e85", "type": "github" }, "original": { @@ -663,22 +695,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1764384123, "narHash": "sha256-UoliURDJFaOolycBZYrjzd9Cc66zULEyHqGFH3QHEq0=", @@ -694,18 +710,18 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { - "lastModified": 1764560356, - "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=", + "lastModified": 1764831616, + "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6", + "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -776,11 +792,11 @@ ] }, "locked": { - "lastModified": 1764482797, - "narHash": "sha256-ynV90KoBrPe38YFlKAHtPFk4Ee3IANUsIFGxRaq7H/s=", + "lastModified": 1764663772, + "narHash": "sha256-sHqLmm0wAt3PC4vczJeBozI1/f4rv9yp3IjkClHDXDs=", "ref": "refs/heads/master", - "rev": "d24e8e9736287d01ee73ef9d573d2bc316a62d5c", - "revCount": 710, + "rev": "26531fc46ef17e9365b03770edd3fb9206fcb460", + "revCount": 713, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -801,7 +817,7 @@ "hyprland": "hyprland", "hyprland-dots": "hyprland-dots", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "nvim-dots": "nvim-dots", "pinix": "pinix", "quickshell": "quickshell", @@ -855,11 +871,11 @@ }, "unstable": { "locked": { - "lastModified": 1764611609, - "narHash": "sha256-yU9BNcP0oadUKupw0UKmO9BKDOVIg9NStdJosEbXf8U=", + "lastModified": 1764915887, + "narHash": "sha256-CeBCJ9BMsuzVgn8GVfuSRZ6xeau7szzG0Xn6O/OxP9M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8c29968b3a942f2903f90797f9623737c215737c", + "rev": "42e29df35be6ef54091d3a3b4e97056ce0a98ce8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9ee88ae..e15c34f 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "NixOS configuration (hyprland) for Cobray"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; home-manager = { url = "github:nix-community/home-manager"; @@ -72,6 +72,7 @@ hyprland = { url = "github:hyprwm/Hyprland"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -123,7 +124,7 @@ hostPlatform = system; overlays = [ (final: prev: { - quickshell = unstable.legacyPackages.${system}.quickshell; + quickshell = unstablePkgs.quickshell; ghostty = inputs.ghostty.packages.${system}.default; hu-tao-animated-cursor = inputs.hu-tao-cursor.packages.${system}.default; grim-hyprland = inputs.grim-hyprland.packages.${system}.default; @@ -160,6 +161,7 @@ inherit inputs; hyprlanddots = inputs.hyprland-dots; nvimDotfiles = inputs.nvim-dots; + dankMaterialShell = inputs.dankMaterialShell.packages.${system}.default; }; users.cobray = import ./home-manager/cobray.nix; }; diff --git a/home-manager/cobray.nix b/home-manager/cobray.nix index 58d6d8b..e1d2ba1 100644 --- a/home-manager/cobray.nix +++ b/home-manager/cobray.nix @@ -42,5 +42,7 @@ home.packages = with pkgs; [ kdePackages.dolphin voicevox + vkbasalt + hashcat ]; } diff --git a/home-manager/init.nix b/home-manager/init.nix index e7fe085..3f3ad07 100644 --- a/home-manager/init.nix +++ b/home-manager/init.nix @@ -4,6 +4,7 @@ pkgs, hyprlanddots, nvimDotfiles, + dankMaterialShell, ... }: { home.activation.HyprlandDots = lib.hm.dag.entryAfter ["linkGeneration"] '' @@ -11,7 +12,7 @@ umask 022 repo=${lib.escapeShellArg hyprlanddots} nvimrepo=${lib.escapeShellArg nvimDotfiles} - dmsConfig="${pkgs.dankMaterialShell}/etc/xdg/quickshell/dms" + dmsConfig="${dankMaterialShell}/etc/xdg/quickshell/dms" mkdir -p "${config.xdg.configHome}" copy_dir() { src="$1"; dest="$2"; skip="''${3:-true}" diff --git a/home-manager/modules/emulators.nix b/home-manager/modules/emulators.nix index 6a94df8..98c7211 100644 --- a/home-manager/modules/emulators.nix +++ b/home-manager/modules/emulators.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { home.packages = with pkgs; [ desmume - ryujinx + # ryujinx retroarch waydroid rpcs3 diff --git a/home-manager/modules/quickshell.nix b/home-manager/modules/quickshell.nix index 34fd77b..6a7509f 100644 --- a/home-manager/modules/quickshell.nix +++ b/home-manager/modules/quickshell.nix @@ -12,4 +12,6 @@ cliphist ]; home.sessionPath = ["${pkgs.quickshell}/bin"]; + + programs.dankMaterialShell.enable = true; } diff --git a/hosts/modules/core.nix b/hosts/modules/core.nix index 6181ad9..421f5b6 100644 --- a/hosts/modules/core.nix +++ b/hosts/modules/core.nix @@ -4,10 +4,8 @@ unzip jq wrk - bitwarden - hashcat cachix - gcc14 + gcc15 gnumake cmake ninja @@ -24,5 +22,7 @@ clang openssl pinix + cairo + cabextract ]; } diff --git a/hosts/modules/env.nix b/hosts/modules/env.nix index 1397e2a..7a79e25 100644 --- a/hosts/modules/env.nix +++ b/hosts/modules/env.nix @@ -42,12 +42,10 @@ LD_LIBRARY_PATH = lib.makeLibraryPath [ pkgs.libglvnd pkgs.mesa - pkgs.gcc-unwrapped.lib pkgs.cudatoolkit pkgs.mangohud pkgs.portaudio pkgs.alsa-lib - pkgs.stdenv.cc.cc.lib pkgs.wayland pkgs.libxkbcommon pkgs.glib diff --git a/hosts/modules/fonts.nix b/hosts/modules/fonts.nix index b63692a..6d5af52 100644 --- a/hosts/modules/fonts.nix +++ b/hosts/modules/fonts.nix @@ -4,7 +4,7 @@ noto-fonts noto-fonts-cjk-sans noto-fonts-cjk-serif - noto-fonts-emoji + noto-fonts-color-emoji nerd-fonts._0xproto nerd-fonts.noto nerd-fonts.symbols-only diff --git a/hosts/modules/hyprland.nix b/hosts/modules/hyprland.nix index 20887ee..aa94ec9 100644 --- a/hosts/modules/hyprland.nix +++ b/hosts/modules/hyprland.nix @@ -3,6 +3,7 @@ programs.hyprland = { enable = true; + package = pkgs.hyprland; xwayland.enable = true; }; @@ -21,16 +22,29 @@ }; }; + services.gnome.gnome-keyring.enable = true; + security.pam.services.greetd.enableGnomeKeyring = true; security.polkit.enable = true; services.accounts-daemon.enable = true; systemd.user.services.hyprpolkitagent = { enable = true; + description = "hyprpolkitagent"; wantedBy = ["graphical-session.target"]; + wants = ["graphical-session.target"]; + after = ["graphical-session.target"]; + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.hyprpolkitagent}/libexec/hyprpolkitagent"; + Restart = "on-failure"; + RestartSec = 1; + TimeoutStopSec = 10; + }; }; environment.systemPackages = with pkgs; [ + hyprland qt5.qtwayland qt6.qtwayland candy-icons @@ -54,9 +68,9 @@ hyprpicker nwg-look gsimplecal - kdePackages.xwaylandvideobridge matugen brightnessctl xwayland-satellite + hyprshade ]; } diff --git a/hosts/modules/libs.nix b/hosts/modules/libs.nix index abf22c2..3ef16a0 100644 --- a/hosts/modules/libs.nix +++ b/hosts/modules/libs.nix @@ -2,11 +2,18 @@ environment.systemPackages = with pkgs; [ libclang texlive.combined.scheme-full - poppler_utils + poppler-utils libnotify egl-wayland vulkan-tools libva-utils vdpauinfo + libadwaita + gtk4 + pango + cairo + xz + bzip2 + libc ]; } diff --git a/hosts/modules/nixos.nix b/hosts/modules/nixos.nix index 8571c05..75297f9 100644 --- a/hosts/modules/nixos.nix +++ b/hosts/modules/nixos.nix @@ -15,6 +15,7 @@ "https://ghostty.cachix.org" "https://hyprland.cachix.org" "https://nix-community.cachix.org" + "https://cache.nixos-cuda.org" ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" @@ -23,6 +24,7 @@ "ghostty.cachix.org-1:QB389yTa6gTyneehvqG58y0WnHjQOqgnA+wBnpWWxns=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" ]; }; } diff --git a/hosts/modules/searxng.nix b/hosts/modules/searxng.nix index b6f7d41..f0f7e84 100644 --- a/hosts/modules/searxng.nix +++ b/hosts/modules/searxng.nix @@ -12,7 +12,7 @@ in { package = pkgs.searxng; redisCreateLocally = true; environmentFile = envFile; - runInUwsgi = false; + configureUwsgi = false; settings = { server = { bind_address = "127.0.0.1";