snapshot: Fr 18. Jul 10:41:14 CEST 2025

2 files changed, 4 insertions, 44 deletions

diff --git a/srv/hadante/colemak.nix b/srv/hadante/colemak.nix
index 48136d5..f13923e 100644
--- a/srv/hadante/colemak.nix
+++ b/srv/hadante/colemak.nix
@@ -1,48 +1,9 @@
 { pkgs, ... }:
 {
   config = {
-    nixpkgs.config.packageOverrides = super: rec {
-      xorg = super.xorg // rec {
-        xkeyboardconfig_colemak_mods = super.xorg.xkeyboardconfig.overrideAttrs (old: rec {
-          kbdTricks = pkgs.fetchFromGitHub {
-            owner = "DreymaR";
-            repo = "BigBagKbdTrixXKB";
-            rev = "d01cfc801fea7118001482b7b2c4184b3aac960e";
-            sha256 = "";
-          };
-
-          postFixup = ''
-            bash ${kbdTricks}/install-dreymar-xmod.sh -nsoc $out/etc/X11 5caw ro us
-          '';
-        });
-
-        # xorgserver = super.xorg.xorgserver.overrideAttrs (old: {
-        #   configureFlags = old.configureFlags ++ [
-        #     "--with-xkb-bin-directory=${xkbcomp}/bin"
-        #     "--with-xkb-path=${xkeyboardconfig_colemak_mods}/share/X11/xkb"
-        #   ];
-        # });
-
-        # setxkbmap = super.xorg.setxkbmap.overrideAttrs (old: {
-        #   postInstall = ''
-        #     mkdir -p $out/share
-        #     ln -sfn ${xkeyboardconfig_colemak_mods}/etc/X11 $out/share/X11
-        #   '';
-        # });
-
-        # xkbcomp = super.xorg.xkbcomp.overrideAttrs (old: {
-        #   configureFlags = old.configureFlags ++ [
-        #     "--with-xkb-config-root=${xkeyboardconfig_colemak_mods}/share/X11/xkb"
-        #   ];
-        # });
-
-      }; # xorg
-
-      xkbvalidate = super.xkbvalidate.override {
-        libxkbcommon = super.libxkbcommon.override {
-          xkeyboard_config = xorg.xkeyboardconfig_colemak_mods;
-        };
-      };
-    }; # packageOverrides
+    environment.systemPackages = with pkgs; [
+      libgnomekbd
+      choose-sway-keyboard
+    ];
   };
 }
diff --git a/srv/hadante/configuration.nix b/srv/hadante/configuration.nix
index 075f4b4..d8685c4 100644
--- a/srv/hadante/configuration.nix
+++ b/srv/hadante/configuration.nix
@@ -351,7 +351,6 @@ in
 
         foot
         ente-auth
-        choose-sway-keyboard
       ]
     );
     system.stateVersion = "25.05";