From a26bfb1501bc1a0fe0f184aa3b6382d7bfba26d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Sat, 21 Mar 2026 20:11:28 +0100
Subject: [PATCH] niri: remove flake input, keyboard scripts

---
 flake.lock                   | 43 ------------------------------------
 flake.nix                    | 17 --------------
 modules/desktop.nix          |  1 +
 packages/keyboardScripts.nix | 38 -------------------------------
 4 files changed, 1 insertion(+), 98 deletions(-)
 delete mode 100644 packages/keyboardScripts.nix

diff --git a/flake.lock b/flake.lock
index b8822c8..317ebc4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,26 +1,5 @@
 {
   "nodes": {
-    "niri": {
-      "inputs": {
-        "nixpkgs": [
-          "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"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1770134715,
@@ -38,33 +17,11 @@
     },
     "root": {
       "inputs": {
-        "niri": "niri",
         "nixpkgs": "nixpkgs",
         "treefmt-nix": "treefmt-nix",
         "wrappers": "wrappers"
       }
     },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "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"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index 5813fcc..d85e465 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,8 +5,6 @@
     wrappers.inputs.nixpkgs.follows = "nixpkgs";
     treefmt-nix.url = "github:numtide/treefmt-nix";
     treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
-    niri.url = "github:niri-wm/niri";
-    niri.inputs.nixpkgs.follows = "nixpkgs";
   };
   outputs =
     inputs:
@@ -54,14 +52,6 @@
           pkgs = prev;
         };
 
-        niphas-niri-config-with =
-          overwriteSettings:
-          (import packages/niri.nix {
-            inherit (inputs) wrappers;
-            inherit overwriteSettings;
-            pkgs = final;
-          })."config.kdl".path;
-
         niphas-niri =
           (import packages/niri.nix {
             inherit (inputs) wrappers;
@@ -107,11 +97,6 @@
           '';
 
         vimv = prev.callPackage packages/vimv.nix { };
-
-        keyboardScripts = prev.callPackage packages/keyboardScripts.nix {
-          pkgs = final;
-          inherit (final) lib;
-        };
       };
 
       packages = eachSupportedSystem (
@@ -120,7 +105,6 @@
           pkgs = import inputs.nixpkgs {
             inherit system;
             overlays = [
-              inputs.niri.overlays.default
               inputs.self.overlays.default
             ];
           };
@@ -140,7 +124,6 @@
             vimv
             ;
         }
-        // pkgs.keyboardScripts
       );
 
       formatter = eachSupportedSystem (system: treefmtEval.${system}.config.build.wrapper);
diff --git a/modules/desktop.nix b/modules/desktop.nix
index aecb19d..17c5a8a 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -41,6 +41,7 @@
     pkgs.niphas-set-wallpaper
     pkgs.niphas-redshift
     pkgs.niphas-screenshot
+    pkgs.niphas-clipman
     pkgs.niphas-clipboard-watcher
     pkgs.niphas-runner
     pkgs.niphas-locker
diff --git a/packages/keyboardScripts.nix b/packages/keyboardScripts.nix
deleted file mode 100644
index a0c55a3..0000000
--- a/packages/keyboardScripts.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ pkgs, lib }:
-let
-  keyboards = {
-    german = {
-      code = "de";
-      variant = "T3";
-    };
-    russian = {
-      code = "ru";
-      variant = "phonetic_winkeys";
-    };
-    greek = {
-      code = "gr";
-      variant = "polytonic";
-    };
-  };
-
-  keyboardScripts = lib.mapAttrs' (
-    name: keyboard:
-    lib.nameValuePair "kb-${name}" (
-      pkgs.writers.writeDashBin "kb-${name}" ''
-        exec ${lib.getExe pkgs.niphas-niri} msg action load-config-file --path ${
-          pkgs.niphas-niri-config-with {
-            input = {
-              keyboard = {
-                xkb.layout = "de,${keyboard.code}";
-                xkb.variant = "T3,${keyboard.variant}";
-                xkb.options = "compose:caps,grp:ctrls_toggle";
-                numlock = null;
-              };
-            };
-          }
-        }
-      ''
-    )
-  ) keyboards;
-in
-keyboardScripts