home/natto: generic updates

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>

home/natto/config/emacs/config.org

@@ -192,7 +192,7 @@ To get colemak-dh bindings in evil mode
 *** Configure treemacs
 #+begin_src emacs-lisp
 (use-package treemacs
-  :atfer cfrs
+  :after cfrs
   :config
   (treemacs-filewatch-mode 1)
   (treemacs-display-current-project-exclusively)
@@ -289,40 +289,40 @@ For autocomplete
 
 ** Treesitter
 #+begin_src emacs-lisp
-(use-package tree-sitter-langs)
-(use-package tree-sitter
-  :after tree-sitter-langs
-  :config
-  (global-tree-sitter-mode)
-  :init 
-  (add-to-list 'tree-sitter-major-mode-language-alist '(fundamental-mode . bash))
-  (add-hook 'tree-sitter-after-on-hook #'tree-sitter-hl-mode))
+;(use-package tree-sitter-langs)
+;(use-package tree-sitter
+; :after tree-sitter-langs
+;  :config
+;  (global-tree-sitter-mode)
+; :init 
+;  (add-to-list 'tree-sitter-major-mode-language-alist '(fundamental-mode . bash))
+;  (add-hook 'tree-sitter-after-on-hook #'tree-sitter-hl-mode))
 #+end_src
 
 ** Lang support
 #+begin_src emacs-lisp
-(use-package haskell-mode)
+;(use-package haskell-mode)
 
-(use-package rustic)
+;(use-package rustic)
 
-(use-package nix-mode
-  :mode "\\.nix\\'")
-(add-to-list 'lsp-language-id-configuration '(nix-mode . "nix"))
-(lsp-register-client
- (make-lsp-client :new-connection (lsp-stdio-connection '("rnix-lsp"))
-                  :major-modes '(nix-mode)
-                  :server-id 'nix))
+;(use-package nix-mode
+;  :mode "\\.nix\\'")
+;(add-to-list 'lsp-language-id-configuration '(nix-mode . "nix"))
+;(lsp-register-client
+; (make-lsp-client :new-connection (lsp-stdio-connection '("rnix-lsp"))
+;                  :major-modes '(nix-mode)
+;                  :server-id 'nix))
 
 
-(use-package hcl-mode
-  :mod 
-  "\\.hcl\\'"
-  "\\.nomad\\'")
+;(use-package hcl-mode
+;  :mod 
+;  "\\.hcl\\'"
+;  "\\.nomad\\'")
 #+end_src
 
 ** Magit
 #+begin_src emacs-lisp
-(use-package magit)
+; (use-package magit)
 #+end_src
 
 * VTerm
@@ -330,6 +330,8 @@ For autocomplete
 #+begin_src emacs-lisp
 (use-package vterm
   :config
+  (evil-define-key 'normal vterm-mode-map (kbd "p") 'vterm-yank)
+  (evil-define-key 'insert vterm-mode-map (kbd "C-y") 'vterm-yank)
   (setq vterm-timer-delay 0.005))
 
 (use-package vterm-toggle 

home/natto/config/xmonad/xmobar.hs

@@ -17,11 +17,10 @@ config :: Config
 config =
   defaultConfig
     {
-      --font = "xft:Fira Mono:style=Regular:antialias=true:pixelsize,Font Awesome 5 Brands:pixelsize=16,Font Awesome 5 Free:pixelsize=16:style=Solid,Lohit Devanagari:style=Regular:pixelsize=16,Lohit Gurmukhi:style=Regular:pixelsize=16,Noto Sans CJK JP:style=Regular:pixelsize=16,Noto Sans CJK KR:style=Regular:pixelsize=16,Noto Sans CJK SC:style=Regular:pixelsize=16",
-      font = "xft:Fira Mono:style=Regular:antialias=true:pixelsize,Font Awesome 5 Brands:pixelsize=16,Font Awesome 5 Free:pixelsize=16:style=Solid,Lohit Devanagari:style=Regular:pixelsize=16,Lohit Gurmukhi:style=Regular:pixelsize=16,HanaMinA:style=Regular:pixelsize=16,HanaMinB:style=Regular:pixelsize=16",
+      font = "xft:Fira Mono:style=Regular:antialias=true:pixelsize,Font Awesome 6 Brands:pixelsize=16,Font Awesome 6 Free:pixelsize=16:style=Solid,Lohit Devanagari:style=Regular:pixelsize=16,Lohit Gurmukhi:style=Regular:pixelsize=16,Noto Sans CJK JP:style=Regular:pixelsize=16,Noto Sans CJK KR:style=Regular:pixelsize=16,Noto Sans CJK SC:style=Regular:pixelsize=16",
       additionalFonts =
-        [ "xft:Font Awesome 5 Free:pixelsize=15:style=Solid",
-          "xft:Font Awesome 5 Brands:pixelsize=15"
+        [ "xft:Font Awesome 6 Free:pixelsize=15:style=Solid",
+          "xft:Font Awesome 6 Brands:pixelsize=15"
         ],
       position = Static { xpos = 0, ypos = 0, height = 23, width = 1920 },
       bgColor = bg,

home/natto/pkgs.nix

@@ -9,10 +9,17 @@
     mpdas
     pavucontrol
     unstable.anup
-    xfce.thunar
+    (xfce.thunar.override {
+      thunarPlugins = with xfce; [
+        thunar-media-tags-plugin
+        thunar-volman
+        thunar-archive-plugin
+      ];
+    })
     xfce.xfconf
     xfce.tumbler
     master.discord
+    master.discord-canary
     mpd_discord_richpresence
     sox
     qbittorrent

home/natto/services.nix

@@ -8,7 +8,7 @@ in
       enable = true;
       package = pkgs.mymacs ./config/emacs/config.org;
       defaultEditor = {
-        enable = true;
+        enable = false;
         editor = "emacsclient";
       };
       copyConfigFiles = {