From 0f648a6a9025c0a413936cb644ea98ac7590311e Mon Sep 17 00:00:00 2001
From: Amneesh Singh <natto@weirdnatto.in>
Date: Thu, 24 Nov 2022 04:37:58 +0530
Subject: [PATCH] home/natto: changes

emacs: colemak related updates
pkgs: random pkgs stuff
secrets: add .gitconfig
services: misc changes
Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
---
 home/natto/config/emacs/config.org |  31 ++++++++++++-----------------
 home/natto/pkgs.nix                |  21 +++++++++++++------
 home/natto/secrets/.gitconfig.age  | Bin 1172 -> 1174 bytes
 home/natto/services.nix            |  29 +++++++++++++++++----------
 4 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/home/natto/config/emacs/config.org b/home/natto/config/emacs/config.org
index 52a4f24..a26fb1e 100644
--- a/home/natto/config/emacs/config.org
+++ b/home/natto/config/emacs/config.org
@@ -159,6 +159,8 @@ To undo and redo easily like vi
 *** Miscellaneous evil related packages
 #+begin_src emacs-lisp
 (use-package evil-terminal-cursor-changer)
+(use-package evil-anzu
+  :after evil)
 #+end_src
 
 ** Treemacs
@@ -246,6 +248,8 @@ For autocomplete
 
 ** Lang support
 #+begin_src emacs-lisp
+(use-package inform7)
+
 (use-package haskell-mode)
 
 (use-package rustic)
@@ -502,30 +506,21 @@ This returns the command to run in the terminal
 ** General
 *** Colemak translations
 #+begin_src emacs-lisp
+(use-package evil-colemak-basics
+  :init
+  (setq evil-colemak-basics-layout-mod 'mod-dh)
+  :config
+  (global-evil-colemak-basics-mode))
+#+end_src
+
+*** Misc binds
+#+begin_src emacs-lisp
 (use-package general)
 
 (setq evil-states
   '(visual normal motion))
 
 (with-eval-after-load 'general
-(general-translate-key evil-states 'global
-    "m" "h"
-    "n" "j"
-    "N" "J"
-    "e" "k"
-    "i" "l"
-    "u" "i"
-    "l" "u"
-    "k" "n"
-    "f" "e"
-    "t" "f"
-    "j" "t"
-    "K" "N"
-)
-#+end_src
-
-*** Misc binds
-#+begin_src emacs-lisp
 (general-define-key
   :states evil-states
   "M-c" 'comment-line
diff --git a/home/natto/pkgs.nix b/home/natto/pkgs.nix
index 72f7f86..4884399 100644
--- a/home/natto/pkgs.nix
+++ b/home/natto/pkgs.nix
@@ -5,8 +5,7 @@
     # A/V, codec and media stuff
     ffmpeg-full
     sox
-    pamixer
-    mpdas
+    pamixer mpdas
     mpv
     mpc_cli
     pulseaudio
@@ -62,17 +61,25 @@
     calibre
     gnome.zenity
     stalonetray
+    obs-studio
 
     # Wine and games and stuff
     wineWowPackages.stable
     master.winetricks
-    games.wine-discord-ipc-bridge
-    (games.osu-stable.overrideAttrs (_: {
-      tricks = [ "gdiplus" "dotnet48" "meiryo" ];
-    }))
     tlauncher
     lutris
     citra
+    (yuzu.overrideAttrs (_: rec {
+      version = "1245";
+      src = fetchFromGitHub {
+        owner = "yuzu-emu";
+        repo = "yuzu-mainline";
+        rev = "mainline-0-${version}";
+        sha256 = "sha256-lWXlY1KQC067MvCRUFhmr0c7KDrHDuwJOhIWMKw1f+A=";
+        fetchSubmodules = true;
+      };
+    }))
+    ryujinx
 
     # Dev shit
     rust-analyzer
@@ -95,6 +102,8 @@
         tcolorbox;
     })
     python3Packages.pygments
+    inform7
+    gnome-inform7
 
     # Misc
     teams
diff --git a/home/natto/secrets/.gitconfig.age b/home/natto/secrets/.gitconfig.age
index 703efa9bb5b62ad37ff708b7ef085a8161c0d600..63e00d09260f43e9295ce6a3cff707ffe81b6701 100644
GIT binary patch
delta 1145
zcmbQjIgN9IPJL2DvcG3uYLruDPD-I+c0ibArFp4iK&neYPDqw}n7?m+xtqU9fpbMw
zI+uH?YlfFoVu@2gU}>t0r-6rSa*$c2VP2l4k+xr2xP?h^N`;wgaFSC%B$uw8LUD11
zZc%ZfLQbByv0pk@cCuxaPr7M<iMwTRVPSceVSZLlReeQTsB5HanZ9<ehqqt3iCJ1;
zlt+Y9v9`C1OHxWvdA6fVSdMnCb5)>s0asN?x^GZmpu4wUeu`UhM4q3AQ<b+zNoh%9
zK$%fdiDhP)Q+~O-r>~Qtt9d|KPC$5iUP-x&p?j)td0BahK|WWJk6C(lp0Qz=n^%F4
zesW-_LA|ekK(?7{L2y~3V{W2<P*kRoe_l#%p`)dCW`16&OHQD_S5}sXi+^rdVM<0g
zmr+rMNxFfBerl<gS9U;pM1fOANVZ8vSeB1*Szw@Ju4#&QMpaalZ<te*rEgG%f0aeP
zk$y$CaYcTHS4h68FPCR<o=-q<fw7CWYf_P0Xnjb2eq^L`xs!3EOH@Qsc~O*WrLVV_
zkEeE}QJ!;&my4xgUX)R;dy<!_yQxcwXKF52qMxU0S!t57b7rNNXIP@Ad3Iq|d0vi1
zNojUKqG45WnrF68WJ#o7NpQGflx29Ot7Edecd)rhX@N;)NQF@*SCvb8xlgjEQ;AEc
zN4<G+VR4C1S!K9OqOo><N@j#bq;phNgpW&Fl3{UjM6r)cm43Fjxu2oGg{e`7w}(lf
zqc4|5P-s<oV6l@ys!?RJg-5u)VY<0rl7C`)Myjz%ZdqETX^?i3Pe_?%q<@H|dv2mj
zxqhl~K!ItwQ+Z;VVVWryD0wIs7n#@98|M1zrWd6q7N;r%yV@zaM02IMhnAL==zDwV
zyJZLGRFs)IdxU02n0jZphL}eM7;x$8>MBH(8s>z1WrtT~1y%(_Rr-}$L>5@4cpIhp
zxuyE#yE#T!l;mW%`IfmkmU9W7H2bvDX3tjcKgr%74j*2TlbYJdQGeL)*~Xvt59+sN
zrtHsXGX5VVJ|oWc$G(~q;`5H){2sS&MwsEfrvI^5^?q$=nDDmjY{1%=Y`LfXjP8WV
z_nQ_vgw&Qy&t%_pXx`Hv-I<PW9u|h4W;Yail(I68zg4?9HQir0BJ;;u!+F2<+~7QA
zy=VTj1qZTcs=PS!VTb3N8~1xVHPszYFV=27U7yk+B)mxE#g87IGW!WSpL7?N_U>7>
zuU{#JL-n1m?8E~rzvVk5_?vB&mT}tfdG2$mgL`$lj2849zQ(GSsB@_>!XmUS??IL6
zzVZ~wN{iYkLu=*fH`;i1Mn>p4{ad}bSLaOSX&p|5^J=TMBs@L4r*He&o6>#qyQI}w
z4p;x+aqBNid0K8hHMgJl#oLX(%S_&-Sl?RvSC!}Xj%7#185aJ$DVnK!a9OlkVSwP~
z8nFj%g8k2zPP!U*j(=srYnh0plV%z`3HYyfsi7^y!a>q(?fl5)GsBxqK1^wR_%m2I
cRb>j>;?*&H?W?{9)}A>3_Q=8&3xvGP0OYH_nE(I)

delta 1143
zcmbQnIfZkAPJMDvS!G&jT5-9vV}X%rYF?pfj+3QdUPxeONV$toL3WzIetK@Yp=pYv
zD_3!GaZX{DiFR3DL3X53qH9@xvbnd9f4QewR=QWHr%#G@cvz@qQiY#WK9{bYLUD11
zZc%ZfLQbByv0pk@xS?f=Pm+aYihp^5b7Ww4fU8HQNqu@jsc*KkS+Yq;Uba(lp`Wp9
zW<;59qK|J-Zf-?>Zg_TNnq!o)f01d14_A14ZjxoLzH?$wRz{L(dZDR_lVwzBxwnC(
zM_Os6c9dhDi)&_>n?Yp0g`vA;s#8*0NSa}gWxl^*NkK$FVg*-;nNf*>TR^C@WnivZ
zmZeKXNquROiF;bUS)`*yUZzoEl~<v&d77(9nqN**y0)XUd7)>jXK12{wsBZ^zGY+z
zS4M=hm$zwUvPW*BZ+3d6Q&_l#XJ)ojRA^S9zQ40~S#fEyMM-g#N4bA`Rfe&7rI}Z0
zu79qfcR-p~p?Rin9+yjcRIo*eOJPp9e^IDgT78ATTd}i?hhc6>nzwUArMsI+Vy=^k
zS&D~wu4hVSwt<_GwthiYxx1%XrL$pZR89a_d4#9GX_1F%xxbr{QCOy>K}AkVMz&>+
zg|Vrnd3cg{s%c_YQF*9~TVir}puc~BzqX5;ak@*sQ(-}1Wtw9!S8%Xzl96_vw?(mI
zK)pv&k+)lBkw=(|cVR(psE3<VuCHTdRdT+Wv5&q>S%|NBj(b5$a)^0ZXhum%cA05#
zS{|2wkc*MKSFTZdo|n0sK}v3!evn~-X-=qHZm~;RRGN!PrBRq?pm%tPS5{SSSdybj
zNK~m|a+rI#i?K<*d!->4D0w7D>MOa|N9m>)r6v}qDg>D;)EFq(6qj>(RwQOrMkJb4
zgcKH*M|uQTrTZoNJ64)SIhkj3>FVk#q@{XUW@TpNyF^5VnkT0_hlZMJyX53KWqK7A
zc@~$Lm6rIXMVUo8yLqN_snxz{Y~Ar!*>pviySFyK)tCD^PWycXnk(g5X0;i_)jRHZ
z+k8=Ueq)rw;r?X-EX%GXsBCHP5n=u!o80)`C}G;3#-7PSVt+ZVES}9}rg^B<^Vlt=
zHS_lC{RuzvSl3KHeX^T9(+ro?RkP;EUJ!1We9i4cV$I<@^+gGho%JzdE#F-|^8e)q
zvlrHuZ(6a=%xmJ-H_|;a%H=uS%{MxkO0L%{Sq3D1{ueKrt+FqN>35&CqGdxsrobho
zEgiRw64#WJmi&LQ_xp=ab(_-uKDc>S^MQ$7bH{o9g$cnY7hM&ay83AZtIaVlw^pad
zxJAe9nX4{}v5G%sw3FF6@g3XbSCj6DiEH1LF%-M~T$blC|F?UIcXRc%@BU0Zyx&v#
zQ~8Xen+w947Jqeq|K7S;$Vm3``kI>fqPGIOqibDW?@cbb7#nizWzs_K=#6g+ePy=?
zBo&wBB}TcQW48Hm&tTCK^Zmj*4=>nW*yMPYjo<fmUqOcAXQw%@%`foqraZlnu(9G=
Y$j6G6=RKCGMyuDjoYQjPIkQ;}05y8EH~;_u

diff --git a/home/natto/services.nix b/home/natto/services.nix
index f7ac2f3..f0d2171 100644
--- a/home/natto/services.nix
+++ b/home/natto/services.nix
@@ -51,19 +51,28 @@ in
     };
   };
 
-  systemd.user.services.mpdas = {
-    Unit = {
-      After = [ "mpd.service" ];
-      Description = "Music Player Daemon AutoScrobbler";
+  systemd.user.services = {
+    mpd-discord-rpc = {
+      Service = {
+        Restart = "on-failure";
+        RestartSec = "15s";
+      };
     };
 
-    Install.WantedBy = [ "default.target" ];
+    mpdas = {
+      Unit = {
+        After = [ "mpd.service" ];
+        Description = "Music Player Daemon AutoScrobbler";
+      };
 
-    Service = {
-      Type = "simple";
-      Restart = "on-failure";
-      RestartSec = "15s";
-      ExecStart = "${pkgs.mpdas}/bin/mpdas -c ${config.age.secrets.mpdasrc.path}";
+      Install.WantedBy = [ "default.target" ];
+
+      Service = {
+        Type = "simple";
+        Restart = "on-failure";
+        RestartSec = "15s";
+        ExecStart = "${pkgs.mpdas}/bin/mpdas -c ${config.age.secrets.mpdasrc.path}";
+      };
     };
   };
 }