feat: add xwayland-satellite
Niri doesn't come with xwayland support, so we provide
xwayland-satellite to have native-like X windows in wayland
There is a bug with this and xwayland 24 which means that steam big
picture mode cannot display. Unfortunately, there is a bug in xwayland
23 which causes some games to be unable to launch
You also need to disable "Enable GPU accelerated rendering in web
views", which thankfully you can do with this patch (as the settings are
not a webview)
Change-Id: I6c1d417e433abda269cfb08b210c55ae688af2b0
Reviewed-on: https://git.clicks.codes/c/Chimera/NixFiles/+/717
Tested-by: Skyler Grey <minion@clicks.codes>
Reviewed-by: Samuel Shuert <coded@clicks.codes>
diff --git a/flake.lock b/flake.lock
index be4222b..4eaa3c1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -164,11 +164,11 @@
"pre-commit-hooks": "pre-commit-hooks_3"
},
"locked": {
- "lastModified": 1719760654,
- "narHash": "sha256-L3VIJ9182wsYJqP27xO5qiWwfK+a00x0JHiy8ns3NQE=",
+ "lastModified": 1723311214,
+ "narHash": "sha256-xdGZQBEa1AC2us/sY3igS/CucWY6jErXsAvCFRhB2LI=",
"owner": "nix-community",
"repo": "crate2nix",
- "rev": "a6ca1e58132bab26fc08572f22a34bbb86f4d91d",
+ "rev": "236f6addfd452a48be805819e3216af79e988fd5",
"type": "github"
},
"original": {
@@ -327,11 +327,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1722013871,
- "narHash": "sha256-SLLwhhHdVP6dc2DHlMKaGogpm4vSKrVh6Ygmq2M2mhI=",
+ "lastModified": 1724086605,
+ "narHash": "sha256-kZm8GJfEt8Na5JyNfjXCIUKiMOAbWDNsCejh2OeF7r8=",
"owner": "nix-community",
"repo": "emacs-overlay",
- "rev": "3ef26454ce6b554b28ec5061b20844e976841e07",
+ "rev": "d153d9f118d71fa8f4d3204639b4fd32d793ab57",
"type": "github"
},
"original": {
@@ -359,11 +359,11 @@
"firefox-sidebery-gnome": {
"flake": false,
"locked": {
- "lastModified": 1721276923,
- "narHash": "sha256-HJKuwVvi+yGv+8n9Ez4EwaJA0B79JRss9J30vpgy/GI=",
+ "lastModified": 1723137499,
+ "narHash": "sha256-MOE9NeU2i6Ws1GhGmppMnjOHkNLl2MQMJmGhaMzdoJM=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
- "rev": "cc70ec20e2775df7cd2bccdd20dcdecc3e0a733b",
+ "rev": "fb5b578a4f49ae8705e5fea0419242ed1b8dba70",
"type": "github"
},
"original": {
@@ -525,11 +525,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
- "lastModified": 1719994518,
- "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
+ "lastModified": 1722555600,
+ "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
+ "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
"type": "github"
},
"original": {
@@ -813,11 +813,11 @@
]
},
"locked": {
- "lastModified": 1721996913,
- "narHash": "sha256-eqbhEBObarS6WsI0J1PVACQ8fXeq9OmSS0+iXBegoOI=",
+ "lastModified": 1723986931,
+ "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "bc2b96acda50229bc99925dde5c8e561e90b0b00",
+ "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
"type": "github"
},
"original": {
@@ -878,11 +878,11 @@
]
},
"locked": {
- "lastModified": 1720695775,
- "narHash": "sha256-8Oqzl9QPjEe/n8y0R2tC6+2v/H6xBgABHXOJwxmnBg0=",
+ "lastModified": 1723511483,
+ "narHash": "sha256-rT/OkVXKkns2YvyF1nFvl+8Gc3sld1c1sXPtGkbqaDY=",
"ref": "refs/heads/main",
- "rev": "d70318fb946a0e720dfdd1fb10b0645c14e2a02a",
- "revCount": 94,
+ "rev": "cecf70b77539c1a593f60ec9d0305b5e537ab6a9",
+ "revCount": 106,
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
},
@@ -909,11 +909,11 @@
"xwayland-satellite": "xwayland-satellite"
},
"locked": {
- "lastModified": 1722003992,
- "narHash": "sha256-uUCNruPFFyi+tCh5uIq7p8TlqU/fDMwZubGqpHgQjIk=",
+ "lastModified": 1724093646,
+ "narHash": "sha256-IPbL6lcaE9hARjGwpcWKFoNdLZRWry4lhK8629rFWSE=",
"owner": "sodiboo",
"repo": "niri-flake",
- "rev": "a81151e3efec22780dabfeef881fbd10c5c04d84",
+ "rev": "e979c921c3d799672b333780d8582c0aeca7da85",
"type": "github"
},
"original": {
@@ -925,16 +925,16 @@
"niri-stable": {
"flake": false,
"locked": {
- "lastModified": 1719642458,
- "narHash": "sha256-EdlOGL9RdO77HnZxv2UpPwrJdFH8qPrPSRtkBBV167s=",
+ "lastModified": 1723290956,
+ "narHash": "sha256-13xynDWoOqogUKZTf6lz267hEQGdCE+BE6acs2G3j8k=",
"owner": "YaLTeR",
"repo": "niri",
- "rev": "e7c201abba6fedaa57001639810af3b6bd9b852e",
+ "rev": "9063a5dbdc0d4470dc1e13ce5749838e32af6a44",
"type": "github"
},
"original": {
"owner": "YaLTeR",
- "ref": "v0.1.7",
+ "ref": "v0.1.8",
"repo": "niri",
"type": "github"
}
@@ -946,11 +946,11 @@
]
},
"locked": {
- "lastModified": 1721531260,
- "narHash": "sha256-O72uxk4gYFQDwNkoBioyrR3GK9EReZmexCStBaORMW8=",
+ "lastModified": 1723950649,
+ "narHash": "sha256-dHMkGjwwCGj0c2MKyCjRXVBXq2Sz3TWbbM23AS7/5Hc=",
"owner": "nix-community",
"repo": "nix-index-database",
- "rev": "b6db9fd8dc59bb2ccb403f76d16ba8bbc1d5263d",
+ "rev": "392828aafbed62a6ea6ccab13728df2e67481805",
"type": "github"
},
"original": {
@@ -1009,11 +1009,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1722017959,
- "narHash": "sha256-vkv3MtjRtJdqeWMLH874ngbC6/5wUYzsdw0pb96ZLRc=",
+ "lastModified": 1724067415,
+ "narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=",
"owner": "nixos",
"repo": "nixos-hardware",
- "rev": "0b4d40f95a68ef0a6785f6b938ac8c1383321dbf",
+ "rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2",
"type": "github"
},
"original": {
@@ -1025,11 +1025,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1721924956,
- "narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=",
+ "lastModified": 1723637854,
+ "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "5ad6a14c6bf098e98800b091668718c336effc95",
+ "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
"type": "github"
},
"original": {
@@ -1041,23 +1041,23 @@
},
"nixpkgs-lib": {
"locked": {
- "lastModified": 1719876945,
- "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=",
+ "lastModified": 1722555339,
+ "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
"type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
+ "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
},
"original": {
"type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
+ "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
}
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1721949857,
- "narHash": "sha256-DID446r8KsmJhbCzx4el8d9SnPiE8qa6+eEQOJ40vR0=",
+ "lastModified": 1723938990,
+ "narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a1cc729dcbc31d9b0d11d86dc7436163548a9665",
+ "rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890",
"type": "github"
},
"original": {
@@ -1083,6 +1083,22 @@
"type": "github"
}
},
+ "nixpkgs-xwayland-23": {
+ "locked": {
+ "lastModified": 1716361217,
+ "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f",
+ "type": "github"
+ }
+ },
"nixpkgs_2": {
"locked": {
"lastModified": 1700612854,
@@ -1173,11 +1189,11 @@
},
"nixpkgs_8": {
"locked": {
- "lastModified": 1721924956,
- "narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=",
+ "lastModified": 1723991338,
+ "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "5ad6a14c6bf098e98800b091668718c336effc95",
+ "rev": "8a3354191c0d7144db9756a74755672387b702ba",
"type": "github"
},
"original": {
@@ -1205,11 +1221,11 @@
},
"nur": {
"locked": {
- "lastModified": 1722023086,
- "narHash": "sha256-hOTXyWW5XIcyCRz0VEyVteIlvi+0U07EDg8Vpfz9mAo=",
+ "lastModified": 1724096795,
+ "narHash": "sha256-CuxtEo3rpFtil5zDNbnlufBiHtEtAjIvFbMx6RCut3I=",
"owner": "nix-community",
"repo": "nur",
- "rev": "6a1e672f89e718eebe36b89742ca75ac1850f49e",
+ "rev": "67458d4148e0f04d520a5ace007d3281e4898899",
"type": "github"
},
"original": {
@@ -1343,10 +1359,12 @@
"nix-index-database": "nix-index-database",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_8",
+ "nixpkgs-xwayland-23": "nixpkgs-xwayland-23",
"nur": "nur",
"snowfall-lib": "snowfall-lib",
"sops-nix": "sops-nix",
- "templates": "templates"
+ "templates": "templates",
+ "xwayland-satellite": "xwayland-satellite_2"
}
},
"rust-overlay": {
@@ -1403,11 +1421,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
- "lastModified": 1721688883,
- "narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=",
+ "lastModified": 1723501126,
+ "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "aff2f88277dabe695de4773682842c34a0b7fd54",
+ "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
"type": "github"
},
"original": {
@@ -1584,11 +1602,27 @@
"xwayland-satellite": {
"flake": false,
"locked": {
- "lastModified": 1721687061,
- "narHash": "sha256-zk62B0tIf2SRNCeQnXxatq2gvjtaJ8xp3Hp9RB43xs0=",
+ "lastModified": 1723095288,
+ "narHash": "sha256-cUlTHg/F0tUpjS/uAIYKwrIRaKwuzdyFo3IiST6E7Fc=",
"owner": "Supreeeme",
"repo": "xwayland-satellite",
- "rev": "8892570093948de16a50e06b1a7d6890405de7a1",
+ "rev": "95afa163a60167cd97bf6afa870bc117a1be3d03",
+ "type": "github"
+ },
+ "original": {
+ "owner": "Supreeeme",
+ "repo": "xwayland-satellite",
+ "type": "github"
+ }
+ },
+ "xwayland-satellite_2": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1723095288,
+ "narHash": "sha256-cUlTHg/F0tUpjS/uAIYKwrIRaKwuzdyFo3IiST6E7Fc=",
+ "owner": "Supreeeme",
+ "repo": "xwayland-satellite",
+ "rev": "95afa163a60167cd97bf6afa870bc117a1be3d03",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 583cbbf..b069c9f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,13 +36,8 @@
inputs.nixpkgs.follows = "nixpkgs";
};
- lix = {
- url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
- flake = false;
- };
lix-module = {
- url = "git+https://git.lix.systems/lix-project/nixos-module";
- inputs.lix.follows = "lix";
+ url = "git+https://git.lix.systems/lix-project/nixos-module?ref=refs/tags/2.91.0";
inputs.nixpkgs.follows = "nixpkgs";
};
diff --git a/modules/home/git/default.nix b/modules/home/git/default.nix
index ecbb140..63a12da 100644
--- a/modules/home/git/default.nix
+++ b/modules/home/git/default.nix
@@ -115,12 +115,13 @@
programs.git = {
enable = true;
- delta = {
- enable = config.chimera.git.delta.enable;
- options.light = lib.mkIf config.chimera.theme.catppuccin.enable (
- config.chimera.theme.catppuccin.style == "Latte"
- );
- };
+ delta = lib.mkIf config.chimera.git.delta.enable (lib.warn "Delta is currently disabled due to the build being broken in upstream nixpkgs" {});
+ # {
+ # enable = config.chimera.git.delta.enable;
+ # options.light = lib.mkIf config.chimera.theme.catppuccin.enable (
+ # config.chimera.theme.catppuccin.style == "Latte"
+ # );
+ # };
extraConfig = {
init.defaultBranch = "main";
diff --git a/modules/home/users/minion/default.nix b/modules/home/users/minion/default.nix
index 4ec136d..5260535 100644
--- a/modules/home/users/minion/default.nix
+++ b/modules/home/users/minion/default.nix
@@ -20,7 +20,6 @@
chimera.shell.rebuildFlakePath = "/home/${config.home.username}/Code/chimera/config";
home.packages = [
- pkgs.logseq
];
programs.git.includes =
diff --git a/modules/home/wayland/niri/default.nix b/modules/home/wayland/niri/default.nix
index dd436d1..cdace11 100644
--- a/modules/home/wayland/niri/default.nix
+++ b/modules/home/wayland/niri/default.nix
@@ -5,65 +5,74 @@
system,
lib,
...
-}: {
+}:
+{
options.chimera.niri = {
enable = lib.mkEnableOption "Use Niri as your window manager";
+ xwayland.enable = lib.mkOption {
+ type = lib.types.bool;
+ default = true;
+ description = "Enable xwayland-satellite to run X apps in niri";
+ };
monitors = lib.mkOption {
- type = lib.types.attrsOf (lib.types.submodule {
- options = {
- enable = lib.mkOption {
- type = lib.types.bool;
- default = true;
- description = "Enable this monitor";
- };
- mode = lib.mkOption {
- type = lib.types.nullOr (lib.types.submodule {
- options = {
- width = lib.mkOption {
- type = lib.types.int;
- };
- height = lib.mkOption {
- type = lib.types.int;
- };
- refresh = lib.mkOption {
- type = lib.types.nullOr lib.types.float;
- default = null;
- };
- };
- });
- default = null;
- };
- position = lib.mkOption {
- type = lib.types.nullOr (lib.types.submodule {
- options = {
- x = lib.mkOption {
- type = lib.types.int;
- };
- y = lib.mkOption {
- type = lib.types.int;
- };
- };
- });
- default = null;
- };
- scale = lib.mkOption {
- type = lib.types.float;
- default = 1.;
- };
- transform = {
- flipped = lib.mkOption {
+ type = lib.types.attrsOf (
+ lib.types.submodule {
+ options = {
+ enable = lib.mkOption {
type = lib.types.bool;
- default = false;
+ default = true;
+ description = "Enable this monitor";
};
- rotation = lib.mkOption {
- type = lib.types.enum [ 0 90 180 270 ];
- default = 0;
+ mode = lib.mkOption {
+ type = lib.types.nullOr (
+ lib.types.submodule {
+ options = {
+ width = lib.mkOption { type = lib.types.int; };
+ height = lib.mkOption { type = lib.types.int; };
+ refresh = lib.mkOption {
+ type = lib.types.nullOr lib.types.float;
+ default = null;
+ };
+ };
+ }
+ );
+ default = null;
};
+ position = lib.mkOption {
+ type = lib.types.nullOr (
+ lib.types.submodule {
+ options = {
+ x = lib.mkOption { type = lib.types.int; };
+ y = lib.mkOption { type = lib.types.int; };
+ };
+ }
+ );
+ default = null;
+ };
+ scale = lib.mkOption {
+ type = lib.types.float;
+ default = 1.0;
+ };
+ transform = {
+ flipped = lib.mkOption {
+ type = lib.types.bool;
+ default = false;
+ };
+ rotation = lib.mkOption {
+ type = lib.types.enum [
+ 0
+ 90
+ 180
+ 270
+ ];
+ default = 0;
+ };
+ };
+ variable-refresh-rate = lib.mkEnableOption "Enable Variable Refresh Rate (AMD FreeSync / Nvidia G-Sync)";
};
- variable-refresh-rate = lib.mkEnableOption "Enable Variable Refresh Rate (AMD FreeSync / Nvidia G-Sync)";
- };
- });
+ }
+ );
description = "Atribute set of monitors";
default = { };
};
@@ -84,46 +93,63 @@
config = lib.mkIf config.chimera.niri.enable {
chimera.wayland.enable = true;
- programs.bash.profileExtra = lib.mkIf config.chimera.shell.bash.enable (lib.mkBefore ''
- if [ -z $WAYLAND_DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
- exec ${pkgs.systemd}/bin/systemd-cat -t niri ${pkgs.dbus}/bin/dbus-run-session ${config.programs.niri.package}/bin/niri --session
- fi
- '');
+ programs.bash.profileExtra = lib.mkIf config.chimera.shell.bash.enable (
+ lib.mkBefore ''
+ if [ -z $WAYLAND_DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
+ exec ${pkgs.systemd}/bin/systemd-cat -t niri ${pkgs.dbus}/bin/dbus-run-session ${config.programs.niri.package}/bin/niri --session
+ fi
+ ''
+ );
- programs.zsh.profileExtra = lib.mkIf config.chimera.shell.zsh.enable (lib.mkBefore ''
- if [ -z $WAYLAND_DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
- exec ${pkgs.systemd}/bin/systemd-cat -t niri ${pkgs.dbus}/bin/dbus-run-session ${config.programs.niri.package}/bin/niri --session
- fi
- '');
+ programs.zsh.profileExtra = lib.mkIf config.chimera.shell.zsh.enable (
+ lib.mkBefore ''
+ if [ -z $WAYLAND_DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
+ exec ${pkgs.systemd}/bin/systemd-cat -t niri ${pkgs.dbus}/bin/dbus-run-session ${config.programs.niri.package}/bin/niri --session
+ fi
+ ''
+ );
- home.sessionVariables.NIXOS_OZONE_WL = "1";
+ programs.niri =
+ let
+ mod = "Super";
+ mod1 = "Alt";
+ terminal = "${pkgs.kitty}/bin/kitty";
+ menu = (
+ if config.chimera.runner.anyrun.enable then
+ "${inputs.anyrun.packages.${system}.anyrun}/bin/anyrun"
+ else
+ ""
+ );
- programs.niri = let
- mod = "Super";
- mod1 = "Alt";
- terminal = "${pkgs.kitty}/bin/kitty";
- menu = (if config.chimera.runner.anyrun.enable then "${inputs.anyrun.packages.${system}.anyrun}/bin/anyrun" else "");
-
- lock = ''${pkgs.swaylock}/bin/swaylock -i ${config.chimera.theme.wallpaper} -s fill'';
- in {
- enable = true;
- package = pkgs.niri-stable;
- settings = {
- input.keyboard = {
- track-layout = "window";
- repeat-delay = 200;
- repeat-rate = 25;
- xkb = {
- layout = config.chimera.input.keyboard.layout;
- variant = config.chimera.input.keyboard.variant;
+ lock = ''${pkgs.swaylock}/bin/swaylock -i ${config.chimera.theme.wallpaper} -s fill'';
+ in
+ {
+ enable = true;
+ package = pkgs.niri-stable;
+ settings = {
+ environment = {
+ NIXOS_OZONE_WL = "1";
+ DISPLAY = lib.mkIf config.chimera.niri.xwayland.enable ":0";
};
- };
+
+ input.keyboard = {
+ track-layout = "window";
+ repeat-delay = 200;
+ repeat-rate = 25;
+ xkb = {
+ layout = config.chimera.input.keyboard.layout;
+ variant = config.chimera.input.keyboard.variant;
+ };
+ };
input.mouse.natural-scroll = config.chimera.input.mouse.scrolling.natural;
input.touchpad.natural-scroll = config.chimera.input.touchpad.scrolling.natural;
input.warp-mouse-to-focus = true;
- input.focus-follows-mouse = true;
+ input.focus-follows-mouse = {
+ enable = true;
+ max-scroll-amount = "0%";
+ };
input.power-key-handling.enable = false;
@@ -283,6 +309,9 @@
{
command = [ "${pkgs.swaybg}/bin/swaybg" "-i" "${config.chimera.theme.wallpaper}" "-m" "fill" ];
}
+ {
+ command = [ "${pkgs.xwayland-satellite}/bin/xwayland-satellite" ];
+ }
] ++ config.chimera.niri.startupCommands;
};
};