From 1a7151d87d238bc16bfbd72d9d71bc92b427b31e Mon Sep 17 00:00:00 2001 From: Nicole Date: Fri, 17 Jul 2026 20:36:03 +0200 Subject: [PATCH] Major update: 26.05 --- etc/nixos/configuration.nix | 5 +- etc/nixos/flake.lock | 582 ++++++------------ etc/nixos/flake.nix | 13 +- etc/nixos/modules/flatpak.nix | 2 +- etc/nixos/modules/nvidia.nix | 34 +- etc/nixos/modules/ollama.nix | 1 - etc/nixos/modules/pkgs/msty/default.nix | 8 +- .../pkgs/xwayland-satellite/default.nix | 6 +- etc/nixos/modules/programs.nix | 25 +- 9 files changed, 226 insertions(+), 450 deletions(-) diff --git a/etc/nixos/configuration.nix b/etc/nixos/configuration.nix index 2e9e008..5b3cf32 100644 --- a/etc/nixos/configuration.nix +++ b/etc/nixos/configuration.nix @@ -54,6 +54,7 @@ in services.blueman.enable = true; boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.consoleMode = "max"; boot.loader.efi.canTouchEfiVariables = true; boot = { @@ -79,9 +80,9 @@ in }; kernelPackages = pkgs.linuxPackages_zen; + #kernelPackages = pkgs.linuxPackages; loader.timeout = 0; - loader.systemd-boot.consoleMode = "auto"; # Add a midi bridge for BLE MIDI devices kernelModules = [ "snd-virmidi" ]; @@ -187,7 +188,7 @@ in environment.sessionVariables.NAUTILUS_4_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-4"; - system.stateVersion = "25.11"; + system.stateVersion = "26.05"; system.autoUpgrade = { enable = false; diff --git a/etc/nixos/flake.lock b/etc/nixos/flake.lock index 45a10f8..b754664 100644 --- a/etc/nixos/flake.lock +++ b/etc/nixos/flake.lock @@ -1,27 +1,9 @@ { "nodes": { - "abseil-src": { - "flake": false, - "locked": { - "lastModified": 1722535511, - "narHash": "sha256-51jpDhdZ0n+KLmxh8KVaTz53pZAB0dHjmILFX+OLud4=", - "owner": "abseil", - "repo": "abseil-cpp", - "rev": "4447c7562e3bc702ade25105912dce503f0c4010", - "type": "github" - }, - "original": { - "owner": "abseil", - "ref": "20240722.0", - "repo": "abseil-cpp", - "type": "github" - } - }, "affinity-nix": { "inputs": { "corefonts": "corefonts", "crane": "crane", - "elemental-wine-source": "elemental-wine-source", "fenix": "fenix", "flake-compat": "flake-compat", "flake-parts": "flake-parts", @@ -33,11 +15,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1777554983, - "narHash": "sha256-CxMPFUonNdDPVBrcT7tI29UTV9r0YF0Bon9BgZ5SfEE=", + "lastModified": 1783987500, + "narHash": "sha256-KvQSG1KJMIoKDx1UY1Ps98MA+oKcVmeE1WPWXG3B4w8=", "owner": "mrshmllow", "repo": "affinity-nix", - "rev": "fa753e9de7674a792f88f459f410adfaafae5e2d", + "rev": "fe12b087f518cd5c2cd03fcc63f30cd78108bc35", "type": "github" }, "original": { @@ -46,23 +28,6 @@ "type": "github" } }, - "asio-src": { - "flake": false, - "locked": { - "lastModified": 1702548444, - "narHash": "sha256-8Xo6J6+dTvDtsthjbLMMTInHMDnMMM0rQwzbZu70J/s=", - "owner": "chriskohlhoff", - "repo": "asio", - "rev": "22ccfc94fc77356f7820601f9f33b9129a337d2d", - "type": "github" - }, - "original": { - "owner": "chriskohlhoff", - "ref": "asio-1-30-0", - "repo": "asio", - "type": "github" - } - }, "corefonts": { "flake": false, "locked": { @@ -81,11 +46,11 @@ }, "crane": { "locked": { - "lastModified": 1777335812, - "narHash": "sha256-bEg5xoAxAwsyfnGhkEX7RJViTIBIYPd8ISg4O1c0HFc=", + "lastModified": 1783203018, + "narHash": "sha256-G6R9IT/xwFuu+CYBWDUAok6AdC4ERC4ZfPPFtEpxnZE=", "owner": "ipetkov", "repo": "crane", - "rev": "5e0fb2f64edff2822249f21293b8304dedaaf676", + "rev": "80db5bdc391be8a1794f6d8a2d56e3a84ebcede2", "type": "github" }, "original": { @@ -94,42 +59,6 @@ "type": "github" } }, - "curl-src": { - "flake": false, - "locked": { - "lastModified": 1743572790, - "narHash": "sha256-huAGWNm2rYBmgzUuYQ21IYp2skyQECelEkXPMBJY3cE=", - "owner": "curl", - "repo": "curl", - "rev": "1c3149881769e7bd79b072e48374e4c2b3678b2f", - "type": "github" - }, - "original": { - "owner": "curl", - "ref": "curl-8_13_0", - "repo": "curl", - "type": "github" - } - }, - "elemental-wine-source": { - "flake": false, - "locked": { - "host": "gitlab.winehq.org", - "lastModified": 1722747031, - "narHash": "sha256-XVhz9p2kgFBoJ376vg8OaFXxcMEjAe9AK1hk0I1rb1Q=", - "owner": "ElementalWarrior", - "repo": "wine", - "rev": "a7c9b19e1a26cf49c63a7c19189a3e2bbe2c6ac2", - "type": "gitlab" - }, - "original": { - "host": "gitlab.winehq.org", - "owner": "ElementalWarrior", - "ref": "affinity-photo3-wine9.13-part3", - "repo": "wine", - "type": "gitlab" - } - }, "fenix": { "inputs": { "nixpkgs": [ @@ -139,11 +68,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1777488689, - "narHash": "sha256-UYE+SRTDdhXz/y9wmtibVyNapdQF7KCKa1w0Aw3bT7U=", + "lastModified": 1782900513, + "narHash": "sha256-GHrsl1+ysDFgmDQtQSqWS7TiYD2Q58VlwLvnf1+crJM=", "owner": "nix-community", "repo": "fenix", - "rev": "ed56ade264bdc3294f457b472cb0482fc36f105c", + "rev": "16810aa8f4ad89ca480b1513774e8b6f485fe368", "type": "github" }, "original": { @@ -186,11 +115,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -201,7 +130,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1694529238, @@ -217,35 +146,17 @@ "type": "github" } }, - "fmt-src": { - "flake": false, - "locked": { - "lastModified": 1758127535, - "narHash": "sha256-AZDmIeU1HbadC+K0TIAGogvVnxt0oE9U6ocpawIgl6g=", - "owner": "fmtlib", - "repo": "fmt", - "rev": "e424e3f2e607da02742f73db84873b8084fc714c", - "type": "github" - }, - "original": { - "owner": "fmtlib", - "ref": "12.0.0", - "repo": "fmt", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_2", - "gitignore": "gitignore", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1776796298, - "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=", + "lastModified": 1783008725, + "narHash": "sha256-jGiy6+sxjNWXSjp25uoJuNfyH9zBK1PEDY0lVoL4ibQ=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad", + "rev": "bca82caa46d5ec0f5d422c61fb1e30bc51313cbe", "type": "github" }, "original": { @@ -254,145 +165,44 @@ "type": "github" } }, - "gitignore": { + "helium": { "inputs": { - "nixpkgs": [ - "affinity-nix", - "git-hooks", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_4", + "nixpkgs-darwin": "nixpkgs-darwin", + "utils": "utils" }, "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "lastModified": 1783756748, + "narHash": "sha256-hB8uUHBDsaZafd19ilbNVntTzaF7Sr2zGQDDb1tk8pE=", + "owner": "schembriaiden", + "repo": "helium-browser-nix-flake", + "rev": "2efc1e5eaabb81ffcbd66ded45a18bf3aa1c21c5", "type": "github" }, "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "incbin-src": { - "flake": false, - "locked": { - "lastModified": 1748303270, - "narHash": "sha256-vgOfViZnWTKpBB6vDNDJSB3YuuGGVhg++zsi9Ubatno=", - "owner": "graphitemaster", - "repo": "incbin", - "rev": "22061f51fe9f2f35f061f85c2b217b55dd75310d", - "type": "github" - }, - "original": { - "owner": "graphitemaster", - "repo": "incbin", - "rev": "22061f51fe9f2f35f061f85c2b217b55dd75310d", - "type": "github" - } - }, - "json-src": { - "flake": false, - "locked": { - "lastModified": 1744360948, - "narHash": "sha256-cECvDOLxgX7Q9R3IE86Hj9JJUxraDQvhoyPDF03B2CY=", - "owner": "nlohmann", - "repo": "json", - "rev": "55f93686c01528224f448c19128836e7df245f72", - "type": "github" - }, - "original": { - "owner": "nlohmann", - "ref": "v3.12.0", - "repo": "json", - "type": "github" - } - }, - "libgit2-src": { - "flake": false, - "locked": { - "lastModified": 1749227175, - "narHash": "sha256-/xI3v7LNhpgfjv/m+sZwYDhhYvS6kQYxiiiG3+EF8Mw=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "0060d9cf5666f015b1067129bd874c6cc4c9c7ac", - "type": "github" - }, - "original": { - "owner": "libgit2", - "ref": "v1.9.1", - "repo": "libgit2", - "type": "github" - } - }, - "luajit-src": { - "flake": false, - "locked": { - "lastModified": 1763177035, - "narHash": "sha256-oYD86MqmlJpiCuEs4LwVtxvarPtz1RPWm8nJqNE0sBs=", - "owner": "SteamClientHomebrew", - "repo": "LuaJIT", - "rev": "89550023569c3e195e75e12951c067fe5591e0d2", - "type": "github" - }, - "original": { - "owner": "SteamClientHomebrew", - "ref": "v2.1", - "repo": "LuaJIT", - "type": "github" - } - }, - "luajson-src": { - "flake": false, - "locked": { - "lastModified": 1763065879, - "narHash": "sha256-5Mdp4jp+rqz2ufkBa1gMfd8nep+Um+mBdr6+Ut6yz9I=", - "owner": "SteamClientHomebrew", - "repo": "LuaJSON", - "rev": "0c1fabf07c42f3907287d1e4f729e0620c1fe6fd", - "type": "github" - }, - "original": { - "owner": "SteamClientHomebrew", - "repo": "LuaJSON", - "rev": "0c1fabf07c42f3907287d1e4f729e0620c1fe6fd", + "owner": "schembriaiden", + "repo": "helium-browser-nix-flake", "type": "github" } }, "millennium": { "inputs": { - "abseil-src": "abseil-src", - "asio-src": "asio-src", - "curl-src": "curl-src", - "fmt-src": "fmt-src", - "incbin-src": "incbin-src", - "json-src": "json-src", - "libgit2-src": "libgit2-src", - "luajit-src": "luajit-src", - "luajson-src": "luajson-src", "millennium-src": "millennium-src", - "minhook-src": "minhook-src", - "mini-src": "mini-src", - "minizip-src": "minizip-src", - "nixpkgs": "nixpkgs_4", - "re2-src": "re2-src", - "websocketpp-src": "websocketpp-src", - "zlib-src": "zlib-src" + "nixpkgs": "nixpkgs_5" }, "locked": { "dir": "packages/nix", - "lastModified": 1777567645, - "narHash": "sha256-ccIaFXZnxFBwQh3xF63CerpzqU3QHm8IM3tyQ43WPJk=", + "lastModified": 1783651774, + "narHash": "sha256-PuCRfdYK2RG6CAYbnjbF6ElkULdqw0G+bhKWeQsJTUw=", "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "fcb0e5627deecf2fc03067ee3dfb63d37e8e82d4", + "rev": "6d6df68fb43e11a73c0a8d0fd1566e4f81f873d1", "type": "github" }, "original": { "dir": "packages/nix", "owner": "SteamClientHomebrew", + "ref": "next", "repo": "Millennium", "type": "github" } @@ -400,81 +210,30 @@ "millennium-src": { "flake": false, "locked": { - "lastModified": 1770463863, - "narHash": "sha256-MceGTpXobCAh5Ll/1iTWcEf6/nHY3Ll1t06JxbYc+Co=", + "lastModified": 1783612754, + "narHash": "sha256-97yND/JauDYEdYEHzuwkUeOUwfd+BCzHpKTmibkQZgw=", "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "1bc62c94a06f25f7e8d7e269f11cd968cf576bff", + "rev": "78f1f71a63f18142289926ca435071500ac1cbad", "type": "github" }, "original": { "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "1bc62c94a06f25f7e8d7e269f11cd968cf576bff", - "type": "github" - } - }, - "minhook-src": { - "flake": false, - "locked": { - "lastModified": 1743163800, - "narHash": "sha256-0eGFfg365bb4zic1WTHMvKHbxuhhGp72/clu8OklHXs=", - "owner": "TsudaKageyu", - "repo": "minhook", - "rev": "c3fcafdc10146beb5919319d0683e44e3c30d537", - "type": "github" - }, - "original": { - "owner": "TsudaKageyu", - "ref": "v1.3.4", - "repo": "minhook", - "type": "github" - } - }, - "mini-src": { - "flake": false, - "locked": { - "lastModified": 1743356736, - "narHash": "sha256-zBFFOlECbie7+62fTGf+NP4gNmfv2Qddw3ys6xn7o9U=", - "owner": "metayeti", - "repo": "mINI", - "rev": "52b66e987cb56171dc91d96115cdf094b6e4d7a0", - "type": "github" - }, - "original": { - "owner": "metayeti", - "ref": "0.9.18", - "repo": "mINI", - "type": "github" - } - }, - "minizip-src": { - "flake": false, - "locked": { - "lastModified": 1746408966, - "narHash": "sha256-I3CZwtfJMsZYQOMdGhooUN8vssnQj6rCzv8F+rne3vg=", - "owner": "zlib-ng", - "repo": "minizip-ng", - "rev": "f3ed731e27a97e30dffe076ed5e0537daae5c1bd", - "type": "github" - }, - "original": { - "owner": "zlib-ng", - "ref": "4.0.10", - "repo": "minizip-ng", + "rev": "78f1f71a63f18142289926ca435071500ac1cbad", "type": "github" } }, "musnix": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1773185476, - "narHash": "sha256-COuJkFg669oalmEN3T61gD3gM9SfUsiGvDS9pCOphZY=", + "lastModified": 1777848538, + "narHash": "sha256-Dj51C0NWsglqRrCpdmMr2nFiYacFOid1Tor4H9yG2HY=", "owner": "musnix", "repo": "musnix", - "rev": "739e2a1f94c87d5f4c8b880a12480185cf0d7620", + "rev": "8548782f0d1d0928daa3fffde8a008f72219a3f3", "type": "github" }, "original": { @@ -495,11 +254,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1777633931, - "narHash": "sha256-306tONvDv0lhoT7Ge42ghjxPE2ndB3wTKwwtyZS2qJE=", + "lastModified": 1784043058, + "narHash": "sha256-/LXa/IHpH6zqcxrfhtUaZOPZHfk0WXi5YUTICaslMCI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "c291d31da4a27a31b08fab5a468c086888095a3f", + "rev": "24728b7da2cde86eb119a771c16b214f0751f91e", "type": "github" }, "original": { @@ -528,11 +287,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1777627080, - "narHash": "sha256-9xzxgWsZZRbiMDa6iSZfD1dZGlUvsHp2aawWM5LK6F8=", + "lastModified": 1783522755, + "narHash": "sha256-dI0HkX1djETia7cD/Y64h8BNIsSOfTRMzfNum2J6UhE=", "owner": "YaLTeR", "repo": "niri", - "rev": "5f6f131b24826a01374d5cd87b281bd7ea181537", + "rev": "0777769e719b7c9b7c980d4ea66288bfbb4da5b3", "type": "github" }, "original": { @@ -543,11 +302,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1777402031, - "narHash": "sha256-6gkfl9y3+ti0Z6dgby8/R4/DRT8sWU0I0TLCIxwWtjk=", + "lastModified": 1783368811, + "narHash": "sha256-0H8jDwR4Kegb3heaTrH1ftbgKfZVDT8JE+46uXxDy/Q=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "22a3adbe7c5c8c8a10a635d32c9ef7fc01a6e4b8", + "rev": "20d42f0ee98c9fe9f85e8d1de474f1409ed10d05", "type": "github" }, "original": { @@ -558,11 +317,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770073757, - "narHash": "sha256-Vy+G+F+3E/Tl+GMNgiHl9Pah2DgShmIUBJXmbiQPHbI=", + "lastModified": 1782918843, + "narHash": "sha256-ETYnV9U7Sr+A45dohzZdfCZKOss4qrTkO+wgNZNvEc0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "47472570b1e607482890801aeaf29bfb749884f6", + "rev": "e8273b29fe1390ec8d4603f2477357555291432e", "type": "github" }, "original": { @@ -572,13 +331,29 @@ "type": "github" } }, + "nixpkgs-darwin": { + "locked": { + "lastModified": 1783707519, + "narHash": "sha256-VJ+eK/EB7aIZ246bXjkYalr4YWQAtHRJeh15Qw2LxUs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2b35450a66cf6ee8492099a6eb1903796965d32d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-26.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { - "lastModified": 1774748309, - "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", + "lastModified": 1782614948, + "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "333c4e0545a6da976206c74db8773a1645b5870a", + "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c", "type": "github" }, "original": { @@ -589,11 +364,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1777428379, - "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=", + "lastModified": 1782847189, + "narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "755f5aa91337890c432639c60b6064bb7fe67769", + "rev": "b6018f87da91d19d0ab4cf979885689b469cdd41", "type": "github" }, "original": { @@ -605,11 +380,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1777268161, - "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", + "lastModified": 1784007870, + "narHash": "sha256-djcLt/JJphyNt4eDY9XTly+/WbCK5lqWq9lSgCmJkkQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", + "rev": "18b9261cb3294b6d2a06d03f96872827b8fe2698", "type": "github" }, "original": { @@ -637,11 +412,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1776548001, - "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", + "lastModified": 1782723713, + "narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", + "rev": "b5aa0fbd538984f6e3d201be0005b4463d8b09f8", "type": "github" }, "original": { @@ -669,15 +444,15 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1770115704, - "narHash": "sha256-KHFT9UWOF2yRPlAnSXQJh6uVcgNcWlFqqiAZ7OVlHNc=", - "owner": "nixos", + "lastModified": 1783522502, + "narHash": "sha256-iffAls3iaNTyJC2faYcUXSI+Gp02cDjYl+MygxKl2GI=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "e6eae2ee2110f3d31110d5c222cd395303343b08", + "rev": "0bb7ec54c8483066ec9d7720e780a5caa71f8612", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -685,11 +460,27 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1772198003, - "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1777268161, + "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", + "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", "type": "github" }, "original": { @@ -699,23 +490,23 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { - "lastModified": 1777428379, - "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=", + "lastModified": 1784011430, + "narHash": "sha256-lDebytrYdd47IBLwvNOD+6AGeoqZ78CIKlp70hzW280=", "owner": "nixos", "repo": "nixpkgs", - "rev": "755f5aa91337890c432639c60b6064bb7fe67769", + "rev": "8eeec934ae0dbeca3d7868c059568a65c08b2fc3", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1776683584, "narHash": "sha256-NuTLMrr10Tng72hurYG8jYQ4XKK8wnpJmOGcPiis96g=", @@ -731,13 +522,13 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { - "lastModified": 1776877367, - "narHash": "sha256-wMN1gM00sUQ2KC9CNr/XEOGdfOrl67PabIRv9AYayTo=", - "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", + "lastModified": 1783776592, + "narHash": "sha256-+GVwKnbbSmf4cWMJyRzvw8H5yFknmkLoPD5v6snqPzo=", + "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre985613.0726a0ecb6d4/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1032869.e7a3ca8092b6/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -762,14 +553,14 @@ }, "opencode": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1777636623, - "narHash": "sha256-aTjYnSF6D3oy4CY2NVxPid2JmSP9qlDNJdnz2JUuGSo=", + "lastModified": 1784050074, + "narHash": "sha256-NaYrJDe4ZhWU71l86SCKefIaMaPQ39TNGw0xqmHxyh4=", "owner": "sst", "repo": "opencode", - "rev": "16ddf5f559d8c52b23c6db7a046c3fda6a1d71f6", + "rev": "bfddf057823deaf464e72cc1e27b702517c12d39", "type": "github" }, "original": { @@ -781,45 +572,29 @@ "plugin-loader-src": { "flake": false, "locked": { - "lastModified": 1775508798, - "narHash": "sha256-cD2G3M83wCEXVMMl9YoHMLxPIvbXeESgQTkXiM+lzns=", + "lastModified": 1776972538, + "narHash": "sha256-2EvrOYQCB2Z2YXhcPnjR67KoOCvwTVW3TfLcmU3//ak=", "owner": "noahc3", "repo": "AffinityPluginLoader", - "rev": "bd93bbf9f84735d8ba6538596620bbe8d8b90efd", + "rev": "1d7956d5b791bd6a213e8b28c1e25e1f4bcc6166", "type": "github" }, "original": { "owner": "noahc3", - "ref": "v0.3.0", "repo": "AffinityPluginLoader", - "type": "github" - } - }, - "re2-src": { - "flake": false, - "locked": { - "lastModified": 1762353507, - "narHash": "sha256-0J1HVk+eR7VN0ymucW9dNlT36j16XIfCzcs1EVyEIEU=", - "owner": "google", - "repo": "re2", - "rev": "927f5d53caf8111721e734cf24724686bb745f55", - "type": "github" - }, - "original": { - "owner": "google", - "ref": "2025-11-05", - "repo": "re2", + "rev": "1d7956d5b791bd6a213e8b28c1e25e1f4bcc6166", "type": "github" } }, "root": { "inputs": { "affinity-nix": "affinity-nix", + "helium": "helium", "millennium": "millennium", "musnix": "musnix", "niri": "niri", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-unstable": "nixpkgs-unstable", "opencode": "opencode", "solaar": "solaar", @@ -829,11 +604,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1777399820, - "narHash": "sha256-S9efKWyWdEXBxItqalexMVgcWlcVH52GCu4pw3amb0w=", + "lastModified": 1782864348, + "narHash": "sha256-NVYhLbaefeIUftPlo3kS6qr0xd8eFJRodEiaHrvFKR4=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "561d1dd862573b5763064f5402511eecce69fc7a", + "rev": "0d381ca097a8e0375a19387874d952c0a230ac4f", "type": "github" }, "original": { @@ -848,14 +623,14 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils" + "utils": "utils_2" }, "locked": { - "lastModified": 1767894877, - "narHash": "sha256-DB9vEEnEYilGUaHCljMRzT1embzD7uEjJugzRJgiLos=", + "lastModified": 1783018147, + "narHash": "sha256-mqQiBqpTYNFxA/LyOdTIpvV+B1/cNOB38aYyXj3iXvY=", "owner": "Svenum", "repo": "Solaar-Flake", - "rev": "f5cac914bdeeecac7fca07e99c8fee18336f5bd5", + "rev": "1870d5bd8c5ddb54b64eb67c6c32fead1aab9276", "type": "github" }, "original": { @@ -867,15 +642,15 @@ }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_8", - "systems": "systems_2" + "nixpkgs": "nixpkgs_9", + "systems": "systems_3" }, "locked": { - "lastModified": 1777183994, - "narHash": "sha256-zahis/vVFOsWv/HeyHbU13jxnrCC+ppIg49xG+viWxg=", + "lastModified": 1783838433, + "narHash": "sha256-Zb8+v76qSPYDlUea1y30YzgdEoDjA97vRmeqfPAqwZs=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "501256c3e670ca1679501ce3839ea805df00d8ba", + "rev": "c6ab7371e40abd405313af9bddafd5f37cc94f83", "type": "github" }, "original": { @@ -914,16 +689,31 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1775636079, - "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", + "lastModified": 1780220602, + "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", + "rev": "db947814a175b7ca6ded66e21383d938df01c227", "type": "github" }, "original": { @@ -934,37 +724,38 @@ }, "utils": { "inputs": { - "flake-utils": "flake-utils" + "systems": "systems" }, "locked": { - "lastModified": 1738591040, - "narHash": "sha256-4WNeriUToshQ/L5J+dTSWC5OJIwT39SEP7V7oylndi8=", - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "rev": "afcb15b845e74ac5e998358709b2b5fe42a948d1", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "rev": "afcb15b845e74ac5e998358709b2b5fe42a948d1", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "websocketpp-src": { - "flake": false, + "utils_2": { + "inputs": { + "flake-utils": "flake-utils" + }, "locked": { - "lastModified": 1587320717, - "narHash": "sha256-9fIwouthv2GcmBe/UPvV7Xn9P2o0Kmn2hCI4jCh0hPM=", - "owner": "zaphoyd", - "repo": "websocketpp", - "rev": "56123c87598f8b1dd471be83ca841ceae07f95ba", + "lastModified": 1779563444, + "narHash": "sha256-+rEagECcF6BhWfLs8VCkPqsBuxxSSIRxMlgjXj6G8UQ=", + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "a00f6f51907b5c74d2fde086b10b19d446d15717", "type": "github" }, "original": { - "owner": "zaphoyd", - "ref": "0.8.2", - "repo": "websocketpp", + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "a00f6f51907b5c74d2fde086b10b19d446d15717", "type": "github" } }, @@ -988,11 +779,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1773622265, - "narHash": "sha256-wToKwH7IgWdGLMSIWksEDs4eumR6UbbsuPQ42r0oTXQ=", + "lastModified": 1783895132, + "narHash": "sha256-Dl0Gvrig3EpE962hzF3ETPhUztlfuRhcmlpd8ioHN54=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "a879e5e0896a326adc79c474bf457b8b99011027", + "rev": "a2b5c635d8c8c99b286967658d0d177044887eb8", "type": "github" }, "original": { @@ -1000,23 +791,6 @@ "repo": "xwayland-satellite", "type": "github" } - }, - "zlib-src": { - "flake": false, - "locked": { - "lastModified": 1754565515, - "narHash": "sha256-c2RYqHi3hj/ViBzJcYWoNib27GAbq/B1SJUfvG7CPG4=", - "owner": "zlib-ng", - "repo": "zlib-ng", - "rev": "425439062b114a0f6cf625022c41d929c7e879f9", - "type": "github" - }, - "original": { - "owner": "zlib-ng", - "ref": "2.2.5", - "repo": "zlib-ng", - "type": "github" - } } }, "root": "root", diff --git a/etc/nixos/flake.nix b/etc/nixos/flake.nix index ebb9eda..7129730 100644 --- a/etc/nixos/flake.nix +++ b/etc/nixos/flake.nix @@ -1,7 +1,7 @@ { description = "My Flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nix-flatpak.url = "github:gmodena/nix-flatpak"; niri = { @@ -17,8 +17,9 @@ affinity-nix = { url = "github:mrshmllow/affinity-nix"; }; - millennium.url = "github:SteamClientHomebrew/Millennium?dir=packages/nix"; + millennium.url = "github:SteamClientHomebrew/Millennium/next?dir=packages/nix"; spicetify-nix.url = "github:Gerg-L/spicetify-nix"; + helium.url = "github:schembriaiden/helium-browser-nix-flake"; }; outputs = { self, nixpkgs, @@ -30,7 +31,8 @@ affinity-nix, millennium, spicetify-nix, - opencode, + opencode, + helium, ... } @inputs: let @@ -65,7 +67,10 @@ ./configuration.nix ({ pkgs, ... }: { - nixpkgs.overlays = [ affinity-nix.overlays.default ]; + nixpkgs.overlays = [ + affinity-nix.overlays.default + helium.overlays.default + ]; environment.systemPackages = [ pkgs.affinity-v3 ]; }) diff --git a/etc/nixos/modules/flatpak.nix b/etc/nixos/modules/flatpak.nix index ee76854..04c162f 100644 --- a/etc/nixos/modules/flatpak.nix +++ b/etc/nixos/modules/flatpak.nix @@ -4,7 +4,7 @@ services.flatpak.packages = [ "com.github.tchx84.Flatseal" "org.pitivi.Pitivi" - "app.zen_browser.zen" + #"app.zen_browser.zen" "org.blender.Blender" "org.onlyoffice.desktopeditors" "com.rustdesk.RustDesk" diff --git a/etc/nixos/modules/nvidia.nix b/etc/nixos/modules/nvidia.nix index b0cc888..0d7027c 100644 --- a/etc/nixos/modules/nvidia.nix +++ b/etc/nixos/modules/nvidia.nix @@ -26,33 +26,23 @@ in powerManagement.enable = false; powerManagement.finegrained = false; nvidiaSettings = false; - package = config.boot.kernelPackages.nvidiaPackages.latest; - + #package = config.boot.kernelPackages.nvidiaPackages.latest; + #package = config.boot.kernelPackages.nvidiaPackages.mkDriver { - # version = "590.48.01"; - # sha256_64bit = "sha256-ueL4BpN4FDHMh/TNKRCeEz3Oy1ClDWto1LO/LWlr1ok="; - # openSha256 = "sha256-hECHfguzwduEfPo5pCDjWE/MjtRDhINVr4b1awFdP44="; + # version = "580.173.02"; + # sha256_64bit = "sha256-jY65AB4FqaimY9PV0wT+tk7yhE7hhczf2VJ4aCD0bhs="; + # openSha256 = "sha256-lhloZdf6XbaAFTZBF1DxE0Nv9VC6obY8UPf0VyfVepE="; # usePersistenced = false; # useSettings = false; #}; - - #package = config.boot.kernelPackages.nvidiaPackages.mkDriver { - # version = "580.95.05"; - # sha256_64bit = "sha256-hJ7w746EK5gGss3p8RwTA9VPGpp2lGfk5dlhsv4Rgqc="; - # sha256_aarch64 = "sha256-zLRCbpiik2fGDa+d80wqV3ZV1U1b4lRjzNQJsLLlICk="; - # openSha256 = "sha256-RFwDGQOi9jVngVONCOB5m/IYKZIeGEle7h0+0yGnBEI="; - # settingsSha256 = "sha256-F2wmUEaRrpR1Vz0TQSwVK4Fv13f3J9NJLtBe4UP2f14="; - # persistencedSha256 = "sha256-QCwxXQfG/Pa7jSTBB0xD3lsIofcerAWWAHKvWjWGQtg="; - #}; - - #package = config.boot.kernelPackages.nvidiaPackages.mkDriver { - # version = "575.64.03"; - # sha256_64bit = "sha256-S7eqhgBLLtKZx9QwoGIsXJAyfOOspPbppTHUxB06DKA="; - # openSha256 = "sha256-SAl1+XH4ghz8iix95hcuJ/EVqt6ylyzFAao0mLeMmMI="; - # usePersistenced = false; - # useSettings = false; - # }; + package = config.boot.kernelPackages.nvidiaPackages.mkDriver { + version = "610.43.02"; + sha256_64bit = "sha256-MDSgVLtM33dS/43CclZMsQVROAS/9TU4lFkBsWyndGM="; + openSha256 = "sha256-hP5NVZZ4vGsACHLmUDKq4uckpd/kn1GxCSYnnJfAuBs="; + usePersistenced = false; + useSettings = false; + }; }; }; diff --git a/etc/nixos/modules/ollama.nix b/etc/nixos/modules/ollama.nix index 444d317..03fcc65 100644 --- a/etc/nixos/modules/ollama.nix +++ b/etc/nixos/modules/ollama.nix @@ -3,7 +3,6 @@ # OLLAMA # services.ollama = { enable = true; - acceleration = "cuda"; package = pkgs-unstable.ollama-cuda; environmentVariables = { CUDA_VISIBLE_DEVICES = "0"; diff --git a/etc/nixos/modules/pkgs/msty/default.nix b/etc/nixos/modules/pkgs/msty/default.nix index 4fdeff6..0d460d9 100644 --- a/etc/nixos/modules/pkgs/msty/default.nix +++ b/etc/nixos/modules/pkgs/msty/default.nix @@ -2,7 +2,6 @@ appimageTools, fetchurl, nodejs, - nodePackages, uv, python3, makeWrapper, @@ -11,16 +10,17 @@ version = "2.6.4"; src = fetchurl { url = "https://next-assets.msty.studio/app/releases/2.6.4/linux/MstyStudio_x86_64.AppImage"; - sha256 = "sha256-tCtQdmsC2s/IXvoLcHUTy1gEt78K4nIJ6hQCbzD+mjU="; + sha256 = "sha256-cY4PL2l4+leDC/30VkmCL4KoVSC1slgqY0KGfsjUuhE="; }; appimageContents = appimageTools.extractType2 {inherit pname version src;}; + + npm = nodejs; in appimageTools.wrapType2 { inherit pname version src; nativeBuildInputs = [makeWrapper]; extraPkgs = pkgs: [ nodejs - nodePackages.npm uv python3 ]; @@ -31,6 +31,6 @@ in install -m 444 -D ${appimageContents}/MstyStudio.png \ $out/share/icons/hicolor/256x256/apps/MstyStudio.png wrapProgram $out/bin/${pname} \ - --prefix PATH : ${nodejs}/bin:${nodePackages.npm}/bin:${uv}/bin:${python3}/bin + --prefix PATH : ${nodejs}/bin:${uv}/bin:${python3}/bin ''; } diff --git a/etc/nixos/modules/pkgs/xwayland-satellite/default.nix b/etc/nixos/modules/pkgs/xwayland-satellite/default.nix index 94b56f4..4858660 100644 --- a/etc/nixos/modules/pkgs/xwayland-satellite/default.nix +++ b/etc/nixos/modules/pkgs/xwayland-satellite/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "xwayland-satellite"; - version = "0.8.0-a879e5e0896a326adc79c474bf457b8b99011027"; + version = "0.8.0-8575d0ef55d70f9b4c46b6bffb3accf912217e1e"; src = fetchFromGitHub { owner = "Supreeeme"; repo = "xwayland-satellite"; - rev = "a879e5e0896a326adc79c474bf457b8b99011027"; - hash = "sha256-wToKwH7IgWdGLMSIWksEDs4eumR6UbbsuPQ42r0oTXQ="; + rev = "8575d0ef55d70f9b4c46b6bffb3accf912217e1e"; + hash = "sha256-28696iIw8uE0ZUyFTtzhEM8xMh85clCYypMxkvUi+sc="; }; cargoHash = "sha256-jbEihJYcOwFeDiMYlOtaS8GlunvSze80iWahDj1qDrs="; diff --git a/etc/nixos/modules/programs.nix b/etc/nixos/modules/programs.nix index 049c9cc..5a7f813 100644 --- a/etc/nixos/modules/programs.nix +++ b/etc/nixos/modules/programs.nix @@ -35,7 +35,7 @@ in nixpkgs.config.permittedInsecurePackages = [ "qtwebengine-5.15.19" "mbedtls-2.28.10" - "ventoy-1.1.10" + "electron-39.8.10" #EOL package, remove once all dependencies are updated ]; # Defined Programs @@ -55,7 +55,6 @@ in zip jq libsecret - ventoy-full # FILES # @@ -77,6 +76,7 @@ in grim slurp satty + pkgs-unstable.gradia wl-clipboard obs-studio @@ -107,7 +107,7 @@ in # MEDIA EDITING # pinta - pkgs-unstable.davinci-resolve + #pkgs-unstable.davinci-resolve # MEDIA # ffmpeg @@ -118,14 +118,16 @@ in # INTERNET # pkgs-unstable._64gram element-desktop - wasistlos + karere vesktop - pkgs-unstable.mailspring + mailspring pkgs-unstable.thunderbird pkgs-unstable.protonmail-desktop teams-for-linux qbittorrent + webtorrent_desktop sunshine + helium # DEV # vscode-fhs @@ -140,13 +142,16 @@ in uv nodejs_24 dbgate + zulu8 # GAMING # mangohud lutris pkgs-unstable.protonplus gdlauncher-carbon + prismlauncher lug-helper + libxrender # stuff for older java versions # OTHERS # seahorse @@ -157,6 +162,8 @@ in gnomeExtensions.appindicator pywalfox-native linux-wallpaperengine + libsForQt5.qt5ct + kdePackages.qt6ct # UTILS # monitorets @@ -183,16 +190,16 @@ in #inputs.opencode.packages.${pkgs.system}.default # AUDIO AND DAW# - helvum + crosspipe reaper a2jmidid - bitwig-studio + #pkgs-unstable.bitwig-studio yabridge yabridgectl alsa-utils # WINE # - wineWowPackages.stable + wineWow64Packages.stable winetricks bottles @@ -210,7 +217,7 @@ in programs.gamemode.enable = true; # ISO mounting utils # - programs.cdemu.enable = true; + #programs.cdemu.enable = true; # KDE Connect programs.kdeconnect.enable = true;