finally use xserver.extraLayouts correctly

home/config/xmonad/xmobar.hs

@@ -15,13 +15,14 @@ Config {
         Run Memory ["-t","<fn=1>\xf538</fn> <usedratio>%","-H","12288","-L","6144","-h","#D3869B","-l","#8EC07C","-n","#EBDBB2"] 20,
         Run BatteryP ["BAT1","BAT0","BAT2"] ["-t", "<acstatus>", "-L", "10", "-H", "80", "-l", "#D3869B", "-h", "#8EC07C", "-n", "#EBDBB2", "--", "-O", "Charging", "-o", "<left>%", "-a", "notify-send -u critical 'Battery running out!'", "-A", "5", "--lows", "<fn=1>\xf243</fn> ", "--mediums", "<fn=1>\xf242</fn> ", "--highs", "<fn=1>\xf240</fn> "] 300,
         Run Network "wlp0s20f3" ["-t","<fn=1>\xf1eb</fn> <fc=#fabd2f><rx>/<tx></fc>"] 10,
-        Run Date "<fn=1>\xf073 </fn>%a - %b, %_d ║%l:%M:%S " "date" 100,
+        Run Date "<fn=1>\xf073 </fn> %a - %b, %_d ║ %H:%M:%S " "date" 100,
-        Run MPD ["-t", "<fn=1>\xf001</fn> <statei><title>", "--", "-P", ">>: ", "-Z", "||: ", "-S", "Stopped", "-h", "127.0.0.1", "-p", "6600"] 10,
+        Run MPD ["-t", "<statei><title>", "--", "-P", ">>: ", "-Z", "||: ", "-S", "Stopped", "-h", "127.0.0.1", "-p", "6600"] 10,
+ --       Run Com "playerctl" ["--player", "playerctld", "metadata", "--format", "{{status}}: {{title}}"] "" 10,
         Run Com "pamixer" ["--get-volume"] "" 600,
         Run UnsafeStdinReader
     ],
     sepChar = "*",
     alignSep = "--",
-    template = "<action=`dmenu_run` button=1><icon=/home/natto/.xmonad/lib/nixos.xpm/></action> *UnsafeStdinReader* ║ *mpd* -- *multicpu* ║ *memory* ║ *wlp0s20f3* ║ *battery* ║ <fn=1></fn> <fc=#83a598>*pamixer*%</fc> ║ <fc=#ebdbb2>*date*</fc>"
+    template = "<action=`dmenu_run` button=1><icon=/home/natto/.xmonad/lib/nixos.xpm/></action> *UnsafeStdinReader* ║ <fn=1></fn> *mpd* -- *multicpu* ║ *memory* ║ *wlp0s20f3* ║ *battery* ║ <fn=1></fn> <fc=#83a598>*pamixer*%</fc> ║ <fc=#ebdbb2>*date*</fc>"
 }
 

home/config/xmonad/xmonad.hs

@@ -12,6 +12,7 @@ import XMonad.Layout.ThreeColumns
 import XMonad.Layout.ResizableTile
 import XMonad.Hooks.ManageDocks
 import XMonad.Util.Run (spawnPipe)
+import Graphics.X11.ExtraTypes.XF86
 import qualified XMonad.StackSet as W
 import qualified Data.Map        as M
 
@@ -76,6 +77,22 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
   , ((modMask .|. shiftMask, xK_q),
      kill)
 
+  , ((modMask .|. mod1Mask, xK_0), spawn "light -A 5")
+
+  , ((modMask .|. mod1Mask, xK_9), spawn "light -U 5")
+
+  , ((modMask .|. shiftMask, xK_F1),
+     spawn "setxkbmap us-colemak")
+
+  , ((modMask .|. shiftMask, xK_F2),
+     spawn "setxkbmap us basic")
+
+  , ((modMask .|. shiftMask, xK_F3),
+     spawn "setxkbmap in deva")
+
+  , ((modMask .|. shiftMask, xK_F4),
+     spawn "setxkbmap in guru")
+
   , ((modMask, xK_space),
      sendMessage NextLayout)
 

home/natto.nix

@@ -8,7 +8,6 @@ in
     ./stuff/xsession.nix
     ./stuff/secret.nix
     ./stuff/services.nix
-    ./stuff/gtk.nix
   ];
   nixpkgs = {
     config = {
@@ -77,6 +76,8 @@ in
       neofetch 
       xmobar
       xdotool
+      arc-theme
+      arc-icon-theme
     ];
 
     file = {

home/stuff/gtk.nix

@@ -1,19 +0,0 @@
-{config, pkgs,...}:
-{
-  gtk = {
-    enable = true;
-    iconTheme = {
-      name = "Gruvbox-Material-Dark";
-      package = pkgs.gruvbox-icons;
-    };
-    theme = {
-      name = "Equilux";
-      package = pkgs.equilux-theme;
-    };
- /*   gtk3 = {
-      bookmarks = [
-        "folder:///mnt/Stuff/Memes/Discord"
-      ];
-    };*/
-  };
-}

hosts/personal/common/colemak-dh

@@ -1,11 +1,8 @@
-xkb_keymap {
+default partial alphanumeric_keys modifier_keys
-	xkb_keycodes  { include "evdev+aliases(qwerty)"	};
+xkb_symbols "basic" {
-	xkb_types     { include "complete"	};
+    name[Group1] = "English (US Colemak-DH)";
-	xkb_compat    { include "complete"	};
+
-	xkb_symbols   
+    key <TLDE> { [        grave,   asciitilde,      dead_tilde,       asciitilde ] };
-  {
-      include "pc+us(colemak)+inet(evdev)+terminate(ctrl_alt_bksp)"	
-      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 = {
+        mouse = {
- #         accelSpeed = "0";
+          accelSpeed = "0";
- #       };
+        };
         touchpad = {
           middleEmulation = false;
           clickMethod = "buttonareas";
@@ -28,15 +28,17 @@
         }; 
 #       sessionCommands = "${pkgs.xorg.xkbcomp}/bin/xkbcomp ${compiledLayout} $DISPLAY";
       };
-#      extraLayouts = {
+      extraLayouts = {
-#        colemak-dh = {
+        us-colemak = {
-#          description = "Colemak with MOD-dh";
+          description = "Colemak with MOD-dh";
-#          languages = [ "eng" ];
+          languages = [ "eng" ];
-#          symbolsFile = ./colemak-dh;
+          symbolsFile = ./colemak-dh;
-#        };
+        };
-#      };
+      };
-      layout = "us";
+      layout = "us-colemak";
-      xkbVariant = "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 ];
   };
 }

overlays/customscripts/src/up

@@ -1,6 +1,6 @@
 #!/usr/bin/env nix-shell
 #! nix-shell -i bash -p curl
 for x in $@; do
-  curl -F file=@"$x" --header "key: $FILEHOST_KEY" https://f.weirdnatto.in
+  curl -F "file=@\"$x\"" --header "key: $FILEHOST_KEY" https://f.weirdnatto.in
   echo " "
 done

overlays/customscripts/src/x0

@@ -1,6 +1,6 @@
 #!/usr/bin/env nix-shell
 #! nix-shell -i bash -p curl
 for x in $@; do
-  curl -F file=@"$x" https://x0.at/
+  curl -F "file=@\"$x\"" https://x0.at/
   echo " "
 done