8 files changed, 29 insertions, 37 deletions
diff --git a/common/.config/emacs/languages.el.org b/common/.config/emacs/languages.el.org
index 4544563..1763def 100644
--- a/common/.config/emacs/languages.el.org
+++ b/common/.config/emacs/languages.el.org
@@ -174,6 +174,13 @@ Use CDLaTeX for environment and macro insertion.
     (add-hook 'LaTeX-mode-hook #'turn-on-cdlatex))
 #+end_src
 
+Use =latex-preview-pane= to see the PDF automatically.
+#+begin_src emacs-lisp
+  (use-package latex-preview-pane
+    :config
+    (latex-preview-pane-enable))
+#+end_src
+
 * YAML
 Install YAML support and run =eglot= on YAML files.
 #+begin_src emacs-lisp
diff --git a/common/.config/emacs/tools.el.org b/common/.config/emacs/tools.el.org
index 43fc6d0..2a96499 100644
--- a/common/.config/emacs/tools.el.org
+++ b/common/.config/emacs/tools.el.org
@@ -1,28 +1,5 @@
 #+title: Emacs Tool Setup
 
-* Vi Keybindings
-Use =vi= keybindings with =evil=. Set the undo system to =undo-fu=. Wrapped lines can be moved between with =j= and =k=.
-#+begin_src emacs-lisp
-  (use-package evil
-    :init
-    (setq evil-want-keybinding nil)
-    :config
-    (evil-mode)
-    (evil-global-set-key 'motion "j" 'evil-next-visual-line)
-    (evil-global-set-key 'motion "k" 'evil-previous-visual-line)
-    (evil-global-set-key 'motion (kbd "RET") nil)
-    :custom
-    (evil-undo-system 'undo-fu))
-#+end_src
-
-Use =evil-collection= to include =vi= keybindings in extra modes.
-#+begin_src emacs-lisp
-  (use-package evil-collection
-    :after evil
-    :config
-    (evil-collection-init))
-#+end_src
-
 * Undo
 Better undo with =undo-fu=.
 #+begin_src emacs-lisp
@@ -158,6 +135,12 @@ Use =eshell= as an integrated shell.
   (global-set-key (kbd "C-c e") 'eshell)
 #+end_src
 
+Use =vterm= when it works better than =eshell=.
+#+begin_src emacs-lisp
+  (use-package vterm)
+  (global-set-key (kbd "C-c v") 'vterm)
+#+end_src
+
 * Language Servers
 Add =eglot= keybindings.
 #+begin_src emacs-lisp
diff --git a/common/.flake/home/programs/neovim.nix.org b/common/.flake/home/programs/neovim.nix.org
index 350eded..b67e7b6 100644
--- a/common/.flake/home/programs/neovim.nix.org
+++ b/common/.flake/home/programs/neovim.nix.org
@@ -1,7 +1,7 @@
 #+title: Neovim Settings
 
 Create a simple Neovim configuration.
-#+begin_src nix :tangle ~/.flake/home/programs/neovim.nix :mkdirp yes
+#+begin_src nix
   { config, pkgs, ... }:
 
   {
diff --git a/common/.flake/home/programs/zsh.nix.org b/common/.flake/home/programs/zsh.nix.org
index 79795d0..bb23f88 100644
--- a/common/.flake/home/programs/zsh.nix.org
+++ b/common/.flake/home/programs/zsh.nix.org
@@ -23,7 +23,7 @@ Enable auto-suggestions.
 
 Use =vi= keybindings.
 #+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes
-      defaultKeymap = "viins";
+      defaultKeymap = "emacs";
 #+end_src
 
 Append to the history and ignore duplicates.
diff --git a/common/.flake/system/yabai.nix.org b/common/.flake/system/yabai.nix.org
index 4cdbf5e..8409cd8 100644
--- a/common/.flake/system/yabai.nix.org
+++ b/common/.flake/system/yabai.nix.org
@@ -10,11 +10,11 @@
       config = {
         layout = "bsp";
         auto_balance = "on";
-        top_padding = 10;
-        bottom_padding = 10;
-        left_padding = 10;
-        right_padding = 10;
-        window_gap = 10;
+        top_padding = 0;
+        bottom_padding = 0;
+        left_padding = 0;
+        right_padding = 0;
+        window_gap = 0;
         window_shadow = "float";
         focus_follows_mouse = "autoraise";
         mouse_follows_focus = "on";
@@ -26,6 +26,7 @@
       extraConfig = ''
         yabai -m rule --add app="^System Settings$" manage=off
         yabai -m rule --add app="^Calculator$" manage=off
+        yabai -m rule --add app="^mpv" manage=off
       '';
     };
   }
diff --git a/macos.local/.flake/home/programs/core.nix.org b/macos.local/.flake/home/programs/core.nix.org
index b423cfe..9602758 100644
--- a/macos.local/.flake/home/programs/core.nix.org
+++ b/macos.local/.flake/home/programs/core.nix.org
@@ -14,7 +14,6 @@
     ];
 
     home.packages = with pkgs; [
-      aspell
       bash-language-server
       choose-gui
       clang-tools
diff --git a/macos.local/.flake/home/programs/emacs/core.nix.org b/macos.local/.flake/home/programs/emacs/core.nix.org
index c3b781d..f4cdb95 100644
--- a/macos.local/.flake/home/programs/emacs/core.nix.org
+++ b/macos.local/.flake/home/programs/emacs/core.nix.org
@@ -13,9 +13,5 @@
       "./.config/emacs/tools.el".source = ./tools.el;
       "./.config/emacs/languages.el".source = ./languages.el;
     };
-    programs.emacs = {
-      # enable = true;
-      # package = pkgs.emacs-macport;
-    };
   }
 #+end_src
diff --git a/macos.local/.flake/system/core.nix.org b/macos.local/.flake/system/core.nix.org
index 2cd455a..3f942a3 100644
--- a/macos.local/.flake/system/core.nix.org
+++ b/macos.local/.flake/system/core.nix.org
@@ -5,15 +5,21 @@ This file imports various system configuration components in addition to enablin
 #+begin_src nix
   { config, pkgs, ... }:
 
-  {
+  let
+    inherit (pkgs) aspellWithDicts;
+
+    myaspell = aspellWithDicts (d: [d.en d.en-computers d.en-science]);
+  in {
+   nixpkgs.config.allowUnfree = true;
+
     imports = [
       ./skhd.nix
       ./yabai.nix
     ];
 
     environment.systemPackages = with pkgs; [
-      emacs-macport
       gnupg
+      myaspell
       neovim
       skhd
     ];