From 969eb05a7a9605d4bc4b8265eb6a932f79391afa Mon Sep 17 00:00:00 2001
From: Amneesh Singh <natto@weirdnatto.in>
Date: Mon, 23 Jan 2023 15:43:52 +0530
Subject: [PATCH] home/natto: add fcitx and misc changes

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
---
 .gitattributes                     |  1 +
 home/default.nix                   |  1 +
 home/natto/config/emacs/config.org |  2 ++
 home/natto/config/xmonad/xmonad.hs | 10 +++++-----
 home/natto/emacs.nix               |  2 +-
 home/natto/pkgs.nix                | 10 +---------
 home/natto/stuff.nix               | 17 +++++++++++++++++
 7 files changed, 28 insertions(+), 15 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..d17f1fb
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+flake.lock linguist-generated
diff --git a/home/default.nix b/home/default.nix
index 7b7cc83..f2facf1 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -5,6 +5,7 @@
       modules = [
         ./natto
         ./modules/secret.nix
+        inputs.hyprland.homeManagerModules.default
       ];
       pkgs = self.legacyPackages.x86_64-linux;
       extraSpecialArgs = {
diff --git a/home/natto/config/emacs/config.org b/home/natto/config/emacs/config.org
index 8a3d743..2846f4c 100644
--- a/home/natto/config/emacs/config.org
+++ b/home/natto/config/emacs/config.org
@@ -263,6 +263,8 @@ For autocomplete
 
 (use-package rustic)
 
+(use-package wgsl-mode)
+
 (use-package nix-mode
   :mode "\\.nix\\'")
 (add-to-list 'lsp-language-id-configuration '(nix-mode . "nix"))
diff --git a/home/natto/config/xmonad/xmonad.hs b/home/natto/config/xmonad/xmonad.hs
index afc1f0d..db5b048 100644
--- a/home/natto/config/xmonad/xmonad.hs
+++ b/home/natto/config/xmonad/xmonad.hs
@@ -28,7 +28,7 @@ urgentWinColor = "#dc322f"
 miscColor = inactiveWinColor
 
 myBorderWidth = 2
-myTerminal = "/usr/bin/env st"
+myTerminal = "st"
 myFocusFollowsMouse = True
 myNormalBorderColor = bgColor
 myModMask = mod4Mask
@@ -57,9 +57,6 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
   , ((modMask, xK_d),
      spawn "dmenu_run -l 20")
 
-  , ((shiftMask .|. mod1Mask, xK_v),
-     spawn "clipmenu")
-
   , ((modMask, xK_s),
      spawn "dmenu_websearch")
   
@@ -111,7 +108,7 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
      spawn "light -U 5")
 
   , ((modMask .|. shiftMask, xK_F1),
-     spawn "setxkbmap us-colemak")
+     spawn "setxkbmap us colemak_dh")
 
   , ((modMask .|. shiftMask, xK_F2),
      spawn "setxkbmap us basic")
@@ -122,6 +119,9 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
   , ((modMask .|. shiftMask, xK_F4),
      spawn "setxkbmap in guru")
 
+  , ((modMask .|. shiftMask, xK_F5),
+     spawn "setxkbmap colemak dhz")
+
   , ((modMask, xK_space),
      sendMessage NextLayout)
 
diff --git a/home/natto/emacs.nix b/home/natto/emacs.nix
index 34f6857..56d066a 100644
--- a/home/natto/emacs.nix
+++ b/home/natto/emacs.nix
@@ -3,7 +3,7 @@ let
   mymacs = config: # with inputs.emacs-overlay.packages.${pkgs.system}; already resolved with overlay
     with pkgs; emacsWithPackagesFromUsePackage {
       inherit config;
-      package = emacsNativeComp;
+      package = emacsGit;
       alwaysEnsure = true;
       alwaysTangle = true;
       extraEmacsPackages = epkgs: with epkgs; [
diff --git a/home/natto/pkgs.nix b/home/natto/pkgs.nix
index aadc0fb..56a7126 100644
--- a/home/natto/pkgs.nix
+++ b/home/natto/pkgs.nix
@@ -4,7 +4,6 @@
 
     # A/V, codec and media stuff
     ffmpeg-full
-    sox
     pamixer
     mpdas
     mpv
@@ -12,9 +11,7 @@
     pulseaudio
     pavucontrol
     spotify
-    noisetorch
     imagemagick
-    (qjackctl.override { jackSession = true; })
 
     # Utils
     rage
@@ -30,7 +27,6 @@
     xorg.xmodmap
     p7zip
     unrar
-    glxinfo
     sxiv
     vim
     jmtpfs
@@ -39,9 +35,9 @@
     (inputs.nbfc.packages.${pkgs.system}.nbfc-client-c)
     (flake.packages.${pkgs.system}.customscripts)
     translate-shell
-    w3m
     powertop
     cachix
+    undervolt
 
     # GUI utils
     (xfce.thunar.override {
@@ -66,17 +62,13 @@
     arc-theme
     arc-icon-theme
     authy
-    calibre
     gnome.zenity
     stalonetray
-    obs-studio
 
     # Wine and games and stuff
     steam
     wineWowPackages.stable
     winetricks
-    citra
-    yuzu
     #   (inputs.nix-gaming.packages.${pkgs.system}.osu-stable)
     (flake.packages.${pkgs.system}.tlauncher)
     mangohud
diff --git a/home/natto/stuff.nix b/home/natto/stuff.nix
index 3697f38..09ec5bb 100644
--- a/home/natto/stuff.nix
+++ b/home/natto/stuff.nix
@@ -9,7 +9,16 @@
       LV2_PATH = lib.makeSearchPath "lib/lv2" (with pkgs; [ calf ]);
       TERM = "st-24bits";
       QT_QPA_PLATFORMTHEME = "gtk2";
+      QT_X11_NO_MITSHM = "1";
+      HM_CONF_DIR = "/etc/nixos";
     };
+
+    shellAliases = rec {
+      ec = "emacsclient";
+      ecc = ec + " -c";
+      ecnw = ec + " -nw";
+    };
+
     file = with config; {
       stalonetray = {
         source = ./config/stalonetrayrc;
@@ -35,4 +44,12 @@
       };
     };
   };
+  i18n = {
+    inputMethod = {
+      #   enabled = "fcitx5";
+      #  fcitx5.addons = with pkgs; [ fcitx5-m17n fcitx5-mozc ];
+      enabled = "fcitx";
+      fcitx.engines = with pkgs.fcitx-engines; [ m17n mozc ];
+    };
+  };
 }