From ee5cd59841865ceb0b09a86a46327912b4985d7d Mon Sep 17 00:00:00 2001
From: natto1784 <singh.amneesh1784@gmail.com>
Date: Thu, 17 Jun 2021 18:47:38 +0530
Subject: [PATCH] finally use xserver.extraLayouts correctly

---
 colemak-dh.xkm                                | Bin 0 -> 13088 bytes
 home/config/xmonad/xmobar.hs                  |   7 +++--
 home/config/xmonad/xmonad.hs                  |  17 ++++++++++++
 home/natto.nix                                |   3 +-
 home/stuff/gtk.nix                            |  19 -------------
 .../common/{colemak-dh.xkb => colemak-dh}     |  24 ++++++++--------
 hosts/personal/common/xorg.nix                |  26 ++++++++++--------
 hosts/personal/satori/boot.nix                |   2 +-
 hosts/personal/satori/pkgs.nix                |   1 +
 hosts/personal/satori/services.nix            |   5 +++-
 hosts/personal/satori/stuff.nix               |   8 +++++-
 overlays/customscripts/src/up                 |   2 +-
 overlays/customscripts/src/x0                 |   2 +-
 13 files changed, 65 insertions(+), 51 deletions(-)
 create mode 100644 colemak-dh.xkm
 delete mode 100644 home/stuff/gtk.nix
 rename hosts/personal/common/{colemak-dh.xkb => colemak-dh} (90%)

diff --git a/colemak-dh.xkm b/colemak-dh.xkm
new file mode 100644
index 0000000000000000000000000000000000000000..d08701a9f3185fe0c9321f6bc375c69db224b322
GIT binary patch
literal 13088
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
Cw$Jha

literal 0
HcmV?d00001

diff --git a/home/config/xmonad/xmobar.hs b/home/config/xmonad/xmobar.hs
index e9c03be..db66213 100644
--- a/home/config/xmonad/xmobar.hs
+++ b/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 MPD ["-t", "<fn=1>\xf001</fn> <statei><title>", "--", "-P", ">>: ", "-Z", "||: ", "-S", "Stopped", "-h", "127.0.0.1", "-p", "6600"] 10,
+        Run Date "<fn=1>\xf073 </fn> %a - %b, %_d ║ %H:%M:%S " "date" 100,
+        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>"
 }
 
diff --git a/home/config/xmonad/xmonad.hs b/home/config/xmonad/xmonad.hs
index ba5a470..b568cb3 100644
--- a/home/config/xmonad/xmonad.hs
+++ b/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)
 
diff --git a/home/natto.nix b/home/natto.nix
index cd7c5a4..d511e0b 100644
--- a/home/natto.nix
+++ b/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 = {
diff --git a/home/stuff/gtk.nix b/home/stuff/gtk.nix
deleted file mode 100644
index a40e931..0000000
--- a/home/stuff/gtk.nix
+++ /dev/null
@@ -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"
-      ];
-    };*/
-  };
-}
diff --git a/hosts/personal/common/colemak-dh.xkb b/hosts/personal/common/colemak-dh
similarity index 90%
rename from hosts/personal/common/colemak-dh.xkb
rename to hosts/personal/common/colemak-dh
index da76fd6..fe29f72 100644
--- a/hosts/personal/common/colemak-dh.xkb
+++ b/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)"
 };
diff --git a/hosts/personal/common/xorg.nix b/hosts/personal/common/xorg.nix
index 16c46c3..513ed3d 100644
--- a/hosts/personal/common/xorg.nix
+++ b/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;
     };
   };
 }
diff --git a/hosts/personal/satori/boot.nix b/hosts/personal/satori/boot.nix
index df9c3df..8212a8f 100644
--- a/hosts/personal/satori/boot.nix
+++ b/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" ]; 
   };
 }
diff --git a/hosts/personal/satori/pkgs.nix b/hosts/personal/satori/pkgs.nix
index 11c5944..aba50c4 100644
--- a/hosts/personal/satori/pkgs.nix
+++ b/hosts/personal/satori/pkgs.nix
@@ -69,6 +69,7 @@
     };
     dconf.enable = true;
     adb.enable = true;
+    light.enable = true;
   };
   nix = {
     package = pkgs.nixUnstable;
diff --git a/hosts/personal/satori/services.nix b/hosts/personal/satori/services.nix
index c6f9dcf..629f448 100644
--- a/hosts/personal/satori/services.nix
+++ b/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 [];
diff --git a/hosts/personal/satori/stuff.nix b/hosts/personal/satori/stuff.nix
index de94070..00c04b9 100644
--- a/hosts/personal/satori/stuff.nix
+++ b/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 ];
   };
 }
diff --git a/overlays/customscripts/src/up b/overlays/customscripts/src/up
index 9462c2e..1d6cde4 100644
--- a/overlays/customscripts/src/up
+++ b/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
diff --git a/overlays/customscripts/src/x0 b/overlays/customscripts/src/x0
index 0557292..21faf75 100644
--- a/overlays/customscripts/src/x0
+++ b/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