From cf252fc2625c011b0b7519f2f6b3f9046ccfc217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Sat, 21 Mar 2026 20:13:42 +0100 Subject: [PATCH] get upstream niri, remove nix-topology --- configs/keyboard/default.nix | 13 +++- flake.lock | 128 +++++++++++++++++------------------ flake.nix | 17 ++--- 3 files changed, 78 insertions(+), 80 deletions(-) diff --git a/configs/keyboard/default.nix b/configs/keyboard/default.nix index 7fc763b..c2c9c68 100644 --- a/configs/keyboard/default.nix +++ b/configs/keyboard/default.nix @@ -5,6 +5,7 @@ ... }: let + niri-config-with = settings: (pkgs.niphas-niri.passthru.configuration.apply settings).wrapper; commaSep = builtins.concatStringsSep ","; xkbOptions = [ @@ -114,7 +115,17 @@ in if [ -n "$SWAYSOCK" ]; then swaymsg -s $SWAYSOCK 'input * xkb_layout "${defaultLanguage.code},${code}"' swaymsg -s $SWAYSOCK 'input * xkb_variant "${defaultLanguage.variant},${variant}"' - swaymsg -s $SWAYSOCK 'input * xkb_options "${lib.concatStringsSep "," xkbOptions}"' + swaymsg -s $SWAYSOCK 'input * xkb_options "${commaSep xkbOptions}"' + elif [ -n "$NIRI_SOCKET" ]; then + ${lib.getExe pkgs.niphas-niri} msg action load-config-file --path ${ + (niri-config-with { + settings.input.keyboard.xkb = { + layout = "${defaultLanguage.code},${code}"; + variant = "${defaultLanguage.variant},${variant}"; + options = commaSep xkbOptions; + }; + }).passthru.configuration."config.kdl".path + } 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_layout "${defaultLanguage.code},${code}" diff --git a/flake.lock b/flake.lock index 2554f01..2bbd5fa 100644 --- a/flake.lock +++ b/flake.lock @@ -137,7 +137,7 @@ }, "buildbot-nix": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "hercules-ci-effects": "hercules-ci-effects", "nixpkgs": [ "stockholm", @@ -219,24 +219,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nur", @@ -257,7 +239,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "stockholm", @@ -279,7 +261,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -507,6 +489,7 @@ }, "niphas": { "inputs": { + "niri": "niri", "nixpkgs": [ "nixpkgs-unstable" ], @@ -514,11 +497,11 @@ "wrappers": "wrappers" }, "locked": { - "lastModified": 1773416451, - "narHash": "sha256-EZbY8AT7fmqmjW/IjYKMI3XFgDkdNqcJH7uMnzUAnMs=", + "lastModified": 1774116133, + "narHash": "sha256-lR6IPtSbw/+xME7TMCHXziis8Lxy6AAkRhRpDuVI33E=", "ref": "refs/heads/master", - "rev": "cd556263286754a37ac7d3a4a71b8699923ea37c", - "revCount": 45, + "rev": "7dd94c7b96b9f8289e0decdf8d2f75f7b652ef3e", + "revCount": 53, "type": "git", "url": "https://code.kmein.de/kfm/niphas" }, @@ -527,6 +510,28 @@ "url": "https://code.kmein.de/kfm/niphas" } }, + "niri": { + "inputs": { + "nixpkgs": [ + "niphas", + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1773130184, + "narHash": "sha256-3bwx4WqCB06yfQIGB+OgIckOkEDyKxiTD5pOo4Xz2rI=", + "owner": "niri-wm", + "repo": "niri", + "rev": "b07bde3ee82dd73115e6b949e4f3f63695da35ea", + "type": "github" + }, + "original": { + "owner": "niri-wm", + "repo": "niri", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -547,27 +552,6 @@ "type": "github" } }, - "nix-topology": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1769018862, - "narHash": "sha256-x3eMpPQhZwEDunyaUos084Hx41XwYTi2uHY4Yc4YNlk=", - "owner": "oddlama", - "repo": "nix-topology", - "rev": "a15cac71d3399a4c2d1a3482ae62040a3a0aa07f", - "type": "github" - }, - "original": { - "owner": "oddlama", - "repo": "nix-topology", - "type": "github" - } - }, "nix-writers": { "inputs": { "flake-utils": "flake-utils", @@ -621,21 +605,6 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1765674936, - "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-old": { "locked": { "lastModified": 1682600000, @@ -718,7 +687,7 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" ] @@ -830,8 +799,11 @@ "meteora": "meteora", "naersk": "naersk", "niphas": "niphas", + "niri": [ + "niphas", + "niri" + ], "nix-index-database": "nix-index-database", - "nix-topology": "nix-topology", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", "nixpkgs-old": "nixpkgs-old", @@ -868,6 +840,28 @@ "type": "github" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "niphas", + "niri", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1757989933, + "narHash": "sha256-9cpKYWWPCFhgwQTww8S94rTXgg8Q8ydFv9fXM6I8xQM=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "8249aa3442fb9b45e615a35f39eca2fe5510d7c3", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "scripts": { "inputs": { "fenix": [ @@ -923,7 +917,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_3", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" @@ -1251,11 +1245,11 @@ ] }, "locked": { - "lastModified": 1770112394, - "narHash": "sha256-H8d0WplmDeuvOM4bsHNt77T6OWiSJMaTP6UG1XyMNxA=", + "lastModified": 1772137435, + "narHash": "sha256-dqkfxxpIiIs4wdWhT4lfQi1lfA0CgIftPiYGvw0tUOk=", "owner": "Lassulus", "repo": "wrappers", - "rev": "23625835eb91d925c498780f5a37442ead1ae8e5", + "rev": "4e12f430ae705d9bbb591ca9c51cbccbee050a23", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b54446d..1946d61 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,7 @@ niphas.url = "git+https://code.kmein.de/kfm/niphas"; panoptikon.url = "git+https://code.kmein.de/kfm/panoptikon"; nixos-hardware.url = "github:NixOS/nixos-hardware"; + niri.url = "github:niri-wm/niri"; nur.url = "github:nix-community/NUR"; retiolum.url = "github:krebs/retiolum"; scripts.url = "github:kmein/scripts"; @@ -23,7 +24,6 @@ tinc-graph.url = "github:kmein/tinc-graph"; treefmt-nix.url = "github:numtide/treefmt-nix"; voidrice.url = "github:Lukesmithxyz/voidrice"; - nix-topology.url = "github:oddlama/nix-topology"; wetter.url = "github:4z3/wetter"; wrappers.url = "github:lassulus/wrappers"; llm-agents.url = "github:numtide/llm-agents.nix"; @@ -54,10 +54,11 @@ autorenkalender.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; naersk.inputs.nixpkgs.follows = "nixpkgs"; + niri.inputs.nixpkgs.follows = "nixpkgs"; fenix.inputs.nixpkgs.follows = "nixpkgs"; treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; nur.inputs.nixpkgs.follows = "nixpkgs"; - nix-topology.inputs.nixpkgs.follows = "nixpkgs"; + niphas.inputs.nixpkgs.follows = "nixpkgs-unstable"; stockholm.inputs.nixpkgs.follows = "nixpkgs"; menstruation-backend.inputs.nixpkgs.follows = "nixpkgs"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; @@ -65,7 +66,6 @@ stylix.inputs.nixpkgs.follows = "nixpkgs"; tinc-graph.inputs.nixpkgs.follows = "nixpkgs"; wetter.inputs.nixpkgs.follows = "nixpkgs"; - niphas.inputs.nixpkgs.follows = "nixpkgs-unstable"; wrappers.inputs.nixpkgs.follows = "nixpkgs"; opencrow.inputs.nixpkgs.follows = "nixpkgs"; }; @@ -82,8 +82,8 @@ menstruation-telegram, scripts, tinc-graph, - nix-topology, llm-agents, + niri, opencrow, nixpkgs-unstable, nixos-hardware, @@ -387,6 +387,7 @@ { nixpkgs.overlays = [ self.overlays.default + niri.overlays.default niphas.overlays.default panoptikon.overlays.default (final: prev: { @@ -417,7 +418,6 @@ } agenix.nixosModules.default retiolum.nixosModules.retiolum - nix-topology.nixosModules.default niphas.nixosModules.nix niphas.nixosModules.shell configs/mycelium.nix @@ -561,17 +561,10 @@ overlays = [ nur.overlays.default self.overlays.default - nix-topology.overlays.default ]; }; in { - topology = import nix-topology { - inherit pkgs; - modules = [ - { nixosConfigurations = self.nixosConfigurations; } - ]; - }; inherit (pkgs) two56color avesta