kfm/niveum
1
0
Fork 0
mirror of https://github.com/kmein/niveum synced 2026-03-23 05:11:08 +01:00
Code Releases Activity

niri: simplify keyboard setup

Browse Source
This commit is contained in:
Kierán Meinhardt
2026-03-22 08:29:45 +01:00
parent fde5e535d6
commit ef9dc9f526
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
configs/keyboard/default.nix
View File

@@ -5,7 +5,7 @@
... ...
}: }:
let let
niri-config-with = settings: (pkgs.niphas-niri.passthru.configuration.apply settings).wrapper; niri-config-with = settings: pkgs.niphas-niri.passthru.configuration.apply settings;
commaSep = builtins.concatStringsSep ","; commaSep = builtins.concatStringsSep ",";
xkbOptions = [ xkbOptions = [
@@ -119,12 +119,14 @@ in
elif [ -n "$NIRI_SOCKET" ]; then elif [ -n "$NIRI_SOCKET" ]; then
${lib.getExe pkgs.niphas-niri} msg action load-config-file --path ${ ${lib.getExe pkgs.niphas-niri} msg action load-config-file --path ${
(niri-config-with { (niri-config-with {
settings.input.keyboard.xkb = { settings.input = lib.recursiveUpdate pkgs.niphas-niri.configuration.settings.input {
layout = "${defaultLanguage.code},${code}"; keyboard.xkb = {
variant = "${defaultLanguage.variant},${variant}"; layout = "${defaultLanguage.code},${code}";
options = commaSep xkbOptions; variant = "${defaultLanguage.variant},${variant}";
options = commaSep xkbOptions;
};
}; };
}).passthru.configuration."config.kdl".path })."config.kdl".path
} }
elif [ -n "$HYPRLAND_INSTANCE_SIGNATURE" ]; then elif [ -n "$HYPRLAND_INSTANCE_SIGNATURE" ]; then
hyprctl keyword input:kb_variant "" # otherwise we end up with an invalid combination for a short while hyprctl keyword input:kb_variant "" # otherwise we end up with an invalid combination for a short while

16
flake.lock generated
View File

@@ -489,7 +489,6 @@
}, },
"niphas": { "niphas": {
"inputs": { "inputs": {
"niri": "niri",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs-unstable"
], ],
@@ -497,11 +496,11 @@
"wrappers": "wrappers" "wrappers": "wrappers"
}, },
"locked": { "locked": {
"lastModified": 1774116133, "lastModified": 1774129923,
"narHash": "sha256-lR6IPtSbw/+xME7TMCHXziis8Lxy6AAkRhRpDuVI33E=", "narHash": "sha256-JQlqnMzQb8YxyVFAjRE5Ftcyo45X9xnUbuI1lfRa5GQ=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "7dd94c7b96b9f8289e0decdf8d2f75f7b652ef3e", "rev": "e1d45bcf0b2783528d8276a6cd9452bcf410b803",
"revCount": 53, "revCount": 56,
"type": "git", "type": "git",
"url": "https://code.kmein.de/kfm/niphas" "url": "https://code.kmein.de/kfm/niphas"
}, },
@@ -513,7 +512,6 @@
"niri": { "niri": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"niphas",
"nixpkgs" "nixpkgs"
], ],
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
@@ -799,10 +797,7 @@
"meteora": "meteora", "meteora": "meteora",
"naersk": "naersk", "naersk": "naersk",
"niphas": "niphas", "niphas": "niphas",
"niri": [ "niri": "niri",
"niphas",
"niri"
],
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
@@ -843,7 +838,6 @@
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"niphas",
"niri", "niri",
"nixpkgs" "nixpkgs"
] ]