Some vim. removing himalaya until its working again, etc.

home-cli.nix

@@ -11,8 +11,9 @@ in
     nixfmt shellcheck vale tectonic zathura # lilypond-with-fonts
     nodejs deno yarn nodePackages.typescript-language-server nodePackages.stylelint nodePackages.js-beautify nodePackages.expo-cli
     ocaml dune_2 ocamlPackages.utop ocamlPackages.ocp-indent ocamlPackages.merlin
-    rustup go cmake # racket-minimal
+    rustup go cmake
-    # ghc haskell-language-server hlint haskellPackages.hoogle
+    # racket-minimal
+    ghc haskell-language-server hlint haskellPackages.hoogle
     lua53Packages.luarocks
     ispell aspell aspellDicts.en aspellDicts.en-computers aspellDicts.en-science aspellDicts.fr aspellDicts.de aspellDicts.eo aspellDicts.es
     fontconfig iosevka iosevka-bin

home-mail.nix

@@ -16,7 +16,7 @@ in
     sort = "reverse-threads";
   };
 
-  programs.himalaya.enable = true;
+  # programs.himalaya.enable = true;
 
   programs.aerc = {
     enable = true;
@@ -64,13 +64,15 @@ in
         msmtp.enable = true;
         neomutt.enable = true;
         aerc.enable = true;
-        himalaya = {
+        # himalaya = {
-          enable = true;
+        #   enable = true;
-          settings = {
+        #   backend = "maildir";
-            sent-folder = "INBOX.Sent";
+        #   sender = "smtp";
-            draft-folder = "INBOX.Drafts";
+        #   settings = {
-          };
+        #     sent-folder = "INBOX.Sent";
-        };
+        #     draft-folder = "INBOX.Drafts";
+        #   };
+        # };
         # signature = {
         #   text = ''Dustin Swan | dustinswan.com'';
         #   showSignature = "append";

init.lua

@@ -9,11 +9,14 @@ vim.opt.mouse = 'a'
 vim.opt.ignorecase = true
 vim.opt.smartcase = true
 vim.opt.hlsearch = false
+vim.opt.expandtab = true
 vim.opt.tabstop = 2
 vim.opt.shiftwidth = 2
 vim.opt.termguicolors = true
 vim.opt.completeopt = "menu,menuone,noselect"
 vim.opt.cursorline = true
+vim.opt.cursorcolumn = true
+vim.opt.laststatus = 3 -- global status line
 
 vim.api.nvim_create_autocmd('FileType', { pattern = 'org', command = 'setlocal nowrap' })
 vim.api.nvim_create_autocmd('TextYankPost', {
@@ -301,6 +304,7 @@ wk.register({
 			g = { "<cmd>Telescope live_grep<cr>", "Grep" },
 			r = { "<cmd>Telescope oldfiles<cr>", "Recent" },
 			t = { ":Neotree<cr>", "Tree" },
+			d = { ":cd %:p:h<cr>", "Set Directory" },
 		},
 		g = {
 			name = "Git",