From 58486e77e4b491203a76fe567c5e77f1aac10d5b Mon Sep 17 00:00:00 2001 From: 0x1d Date: Wed, 9 Sep 2026 23:52:00 +0200 Subject: [PATCH] chore: upgrade nixos to 26.05 yep --- os/flake.lock | 42 ++++++++++++++++++++++++++++++------------ os/flake.nix | 29 ++++++++++++++++++++++++++--- os/system/i18n.nix | 15 +++++++++++++++ os/system/packages.nix | 19 ++++++++++++------- 4 files changed, 83 insertions(+), 22 deletions(-) diff --git a/os/flake.lock b/os/flake.lock index 8361968..1020caa 100644 --- a/os/flake.lock +++ b/os/flake.lock @@ -7,43 +7,43 @@ ] }, "locked": { - "lastModified": 1765605144, - "narHash": "sha256-RM2xs+1HdHxesjOelxoA3eSvXShC8pmBvtyTke4Ango=", + "lastModified": 1788642154, + "narHash": "sha256-sPpQFVaFTDqO/4vvCAhuAhqTgqN/ygu+9eJcs5eB0js=", "owner": "nix-community", "repo": "home-manager", - "rev": "90b62096f099b73043a747348c11dbfcfbdea949", + "rev": "fd0956c99c41ae3c13a73a638f1f7e963aebc4ab", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-26.05", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1765608474, - "narHash": "sha256-9Wx53UK0z8Di5iesJID0tS1dRKwGxI4i7tsSanOHhF0=", + "lastModified": 1788921488, + "narHash": "sha256-8+xWRxEkD6l217cIUdRxfeUGS9lQX0hVtUuNVsBaDzk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "28bb483c11a1214a73f9fd2d9928a6e2ea86ec71", + "rev": "6aefcda9401be8acc2b74244fb3b37520ea1f0a8", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1761656231, - "narHash": "sha256-EiED5k6gXTWoAIS8yQqi5mAX6ojnzpHwAQTS3ykeYMg=", + "lastModified": 1788922888, + "narHash": "sha256-QMX3uerxnW2R5dHcWpIQILHDltOZnon3x3Spq7EzBFI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e99366c665bdd53b7b500ccdc5226675cfc51f45", + "rev": "a391f95d4557d685fd8e5dc0d4b1f9271aa2f342", "type": "github" }, "original": { @@ -57,7 +57,25 @@ "inputs": { "home-manager": "home-manager", "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs-unstable": "nixpkgs-unstable", + "xrlinuxdriver": "xrlinuxdriver" + } + }, + "xrlinuxdriver": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1785031522, + "narHash": "sha256-wRKz0bj269JlmruPY0nQPWx1GJayFVOVSeT6MYistsM=", + "path": "/home/master/src/breezy-desktop-nix", + "type": "path" + }, + "original": { + "path": "/home/master/src/breezy-desktop-nix", + "type": "path" } } }, diff --git a/os/flake.nix b/os/flake.nix index fa952fd..9e892c4 100644 --- a/os/flake.nix +++ b/os/flake.nix @@ -2,13 +2,33 @@ description = "flake for nixos"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; - home-manager.url = "github:nix-community/home-manager/release-25.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; + home-manager.url = "github:nix-community/home-manager/release-26.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + # XRLinuxDriver from https://github.com/wheaney/XRLinuxDriver/pull/80 + xrlinuxdriver.url = "path:/home/master/src/breezy-desktop-nix"; + xrlinuxdriver.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, nixpkgs, nixpkgs-unstable, home-manager }: { + outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, xrlinuxdriver }: + let + breezyPkgs = system: xrlinuxdriver.packages.${system}; + breezyModule = { gnome ? false }: + { pkgs, ... }: + let + bp = breezyPkgs pkgs.system; + in { + imports = [ xrlinuxdriver.nixosModules.default ]; + services.breezy-desktop = { + enable = true; + xrlinuxdriver = bp.xrlinuxdriver; + breezy-gnome = bp.breezy-gnome; + breezy-desktop-ui = bp.breezy-desktop-ui; + gnome.enable = gnome; + }; + }; + in { nixosConfigurations = { gnome = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -21,6 +41,7 @@ ./system/desktop/gnome.nix ./users/demo.nix ./users/master.nix + (breezyModule { gnome = true; }) ]; specialArgs = { inherit nixpkgs-unstable; }; }; @@ -35,6 +56,7 @@ ./system/desktop/plasma.nix ./users/demo.nix ./users/master.nix + (breezyModule { }) ]; specialArgs = { inherit nixpkgs-unstable; }; }; @@ -49,6 +71,7 @@ ./system/desktop/hyprland.nix ./users/demo.nix ./users/master.nix + (breezyModule { }) ]; specialArgs = { inherit nixpkgs-unstable; }; }; diff --git a/os/system/i18n.nix b/os/system/i18n.nix index bf5296b..5145e7e 100644 --- a/os/system/i18n.nix +++ b/os/system/i18n.nix @@ -2,5 +2,20 @@ time.timeZone = "Europe/Zurich"; i18n.defaultLocale = "en_US.UTF-8"; + i18n.extraLocaleSettings = { + LC_ADDRESS = "de_CH.UTF-8"; + LC_IDENTIFICATION = "de_CH.UTF-8"; + LC_MEASUREMENT = "de_CH.UTF-8"; + LC_MONETARY = "de_CH.UTF-8"; + LC_NAME = "de_CH.UTF-8"; + LC_NUMERIC = "de_CH.UTF-8"; + LC_PAPER = "de_CH.UTF-8"; + LC_TELEPHONE = "de_CH.UTF-8"; + LC_TIME = "de_CH.UTF-8"; + }; + i18n.supportedLocales = [ + "en_US.UTF-8/UTF-8" + "de_CH.UTF-8/UTF-8" + ]; console.keyMap = "sg"; } diff --git a/os/system/packages.nix b/os/system/packages.nix index 575ec61..714795e 100644 --- a/os/system/packages.nix +++ b/os/system/packages.nix @@ -64,7 +64,11 @@ in { platformio avrdude #python314 - python312 + # Wrap so buildEnv does not pick up python312's broken passthru.doc (uncached on 26.05) + (symlinkJoin { + name = python312.name; + paths = [ python312 ]; + }) esptool wireguard-tools protonvpn-gui @@ -77,6 +81,7 @@ in { ffmpeg unstable.golangci-lint unstable.terraform + unstable.opencode ]; fonts.packages = with pkgs; [ @@ -103,10 +108,10 @@ in { RuntimeDirectorySize = "20G"; }; }; - systemd.sleep.extraConfig = '' - AllowSuspend=yes - AllowHibernation=yes - AllowHybridSleep=yes - AllowSuspendThenHibernate=yes - ''; + systemd.sleep.settings.Sleep = { + AllowSuspend = "yes"; + AllowHibernation = "yes"; + AllowHybridSleep = "yes"; + AllowSuspendThenHibernate = "yes"; + }; }