finally use xserver.extraLayouts correctly

hosts/personal/common/colemak-dh

@@ -1,11 +1,8 @@
-xkb_keymap {
-	xkb_keycodes  { include "evdev+aliases(qwerty)"	};
-	xkb_types     { include "complete"	};
-	xkb_compat    { include "complete"	};
-	xkb_symbols   
-  {
-      include "pc+us(colemak)+inet(evdev)+terminate(ctrl_alt_bksp)"	
-      key <TLDE> { [        grave,   asciitilde,      dead_tilde,       asciitilde ] };
+default partial alphanumeric_keys modifier_keys
+xkb_symbols "basic" {
+    name[Group1] = "English (US Colemak-DH)";
+
+    key <TLDE> { [        grave,   asciitilde,      dead_tilde,       asciitilde ] };
     key <AE01> { [            1,       exclam,      exclamdown,      onesuperior ] };
     key <AE02> { [            2,           at,       masculine,      twosuperior ] };
     key <AE03> { [            3,   numbersign,     ordfeminine,    threesuperior ] };
@@ -56,7 +53,12 @@ xkb_keymap {
     key <LSGT> { [        minus,   underscore,          endash,           emdash ] };
     key <SPCE> { [        space,        space,           space,     nobreakspace ] };
     include "level3(ralt_switch)"
-		};
-
-	xkb_geometry  { include "pc(pc104)"	};
+};
+    
+partial alphanumeric_keys
+xkb_symbols "ganda-dh" {
+    include "us-colemak(basic)"
+    name[Group1] = "English (US Ganda-DH)";
+    key <CAPS> { [    BackSpace,    BackSpace,       BackSpace,        BackSpace ] };
+    include "level3(ralt_switch)"
 };

hosts/personal/common/xorg.nix

@@ -12,9 +12,9 @@
       enable = true;
       libinput= {
         enable = true;
- #       mouse = {
- #         accelSpeed = "0";
- #       };
+        mouse = {
+          accelSpeed = "0";
+        };
         touchpad = {
           middleEmulation = false;
           clickMethod = "buttonareas";
@@ -28,15 +28,17 @@
         }; 
 #       sessionCommands = "${pkgs.xorg.xkbcomp}/bin/xkbcomp ${compiledLayout} $DISPLAY";
       };
-#      extraLayouts = {
-#        colemak-dh = {
-#          description = "Colemak with MOD-dh";
-#          languages = [ "eng" ];
-#          symbolsFile = ./colemak-dh;
-#        };
-#      };
-      layout = "us";
-      xkbVariant = "colemak";
+      extraLayouts = {
+        us-colemak = {
+          description = "Colemak with MOD-dh";
+          languages = [ "eng" ];
+          symbolsFile = ./colemak-dh;
+        };
+      };
+      layout = "us-colemak";
+      xkbVariant = "basic";
+      autoRepeatDelay = 320;
+      autoRepeatInterval = 30;
     };
   };
 }

hosts/personal/satori/boot.nix

@@ -24,6 +24,6 @@
         configurationName = "nixbruh";
       };
     };
-    kernelParams = [ "nvidia-drm.modeset=1" "intel_pstate=active"]; 
+    kernelParams = [ "nvidia-drm.modeset=1" "intel_pstate=active" ]; 
   };
 }

hosts/personal/satori/pkgs.nix

@@ -69,6 +69,7 @@
     };
     dconf.enable = true;
     adb.enable = true;
+    light.enable = true;
   };
   nix = {
     package = pkgs.nixUnstable;

hosts/personal/satori/services.nix

@@ -51,7 +51,10 @@
         ];
       };
     };
-
+    btrfs.autoScrub.enable = true;
+    udev.extraRules = ''
+      ACTION=="add|change", KERNEL=="sda", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="bfq"
+    '';
   };
   systemd.services = {
     tor.wantedBy = lib.mkForce [];

hosts/personal/satori/stuff.nix

@@ -32,6 +32,12 @@
     isNormalUser = true;
     shell = pkgs.zsh;
     home = "/home/natto";
-    extraGroups = [ "wheel" "adbusers" ];
+    extraGroups = [ "wheel" "adbusers" "video" ];
+  };
+  i18n.inputMethod = {
+ #   enabled = "fcitx5";
+ #  fcitx5.addons = with pkgs; [ fcitx5-m17n fcitx5-mozc ];
+    enabled = "fcitx";
+    fcitx.engines = with pkgs.fcitx-engines; [ m17n mozc ];
   };
 }