From f4c33db7019198c9c231e9645b17d08f386e8622 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Wed, 30 Sep 2026 17:41:59 +0200 Subject: [PATCH] Rolled back XWayland-Satellite --- flake.lock | 17 +++++++++++++++++ flake.nix | 1 + .../features/desktop/rice/niri.nix | 2 +- .../hosts/framework16/configuration.nix | 2 ++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 32844d8..603cd1e 100644 --- a/flake.lock +++ b/flake.lock @@ -448,6 +448,22 @@ "type": "github" } }, + "nixpkgs-xwayland": { + "locked": { + "lastModified": 1784933936, + "narHash": "sha256-aXd3owhUbLPacJQZGCHrWwvwJEiugqdw5lmMmaC+mF4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d1fd431204ae887f025570443e84cc2d64b9fd4d", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d1fd431204ae887f025570443e84cc2d64b9fd4d", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": [ @@ -536,6 +552,7 @@ "nix-darwin": "nix-darwin", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", + "nixpkgs-xwayland": "nixpkgs-xwayland", "nixvim": "nixvim", "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix", diff --git a/flake.nix b/flake.nix index ba3124d..2dd7f04 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,7 @@ inputs = { # System nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-xwayland.url = "github:nixos/nixpkgs/d1fd431204ae887f025570443e84cc2d64b9fd4d"; nixos-hardware = { url = "github:NixOS/nixos-hardware/master"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules_dentritic/features/desktop/rice/niri.nix b/modules_dentritic/features/desktop/rice/niri.nix index c3e1884..3a46786 100644 --- a/modules_dentritic/features/desktop/rice/niri.nix +++ b/modules_dentritic/features/desktop/rice/niri.nix @@ -111,7 +111,7 @@ "Mod+Shift+P".power-off-monitors = {}; }; - xwayland-satellite.path = lib.getExe pkgs.xwayland-satellite; + xwayland-satellite.path = lib.getExe inputs.nixpkgs-xwayland.legacyPackages.x86_64-linux.xwayland-satellite; }; }; }; diff --git a/modules_dentritic/hosts/framework16/configuration.nix b/modules_dentritic/hosts/framework16/configuration.nix index 72252b5..71e6d16 100644 --- a/modules_dentritic/hosts/framework16/configuration.nix +++ b/modules_dentritic/hosts/framework16/configuration.nix @@ -20,6 +20,8 @@ #self.nixosModules.distrobox ]; + time.timeZone = "Europe/Paris"; + networking = { hostName = "framework"; networkmanager = {