no evil

flake.nix

@@ -41,7 +41,7 @@
             '';
         };
     in {
-      homeConfigurations.shibumi =
+      homeConfigurations.redbook =
         let pkgs = import nixpkgs { system = "aarch64-darwin"; config.allowUnfree = true; };
             modules = modules-for-system pkgs;
         in home-manager.lib.homeManagerConfiguration {
@@ -50,14 +50,16 @@
           modules =
             [
               nix-index-database.homeModules.default
-              "${modules}"
+              "${modules}/base.nix"
+              "${modules}/desktop.nix"
+              "${modules}/redbook.nix"
+              "${modules}/redbook-desktop.nix"
             ] ++
             [{
               home.stateVersion = "22.05";
               home.username = "jfrikker";
               home.homeDirectory = "/Users/jfrikker";
               home.packages = [ pkgs.pinentry_mac ];
-              jfrikker.desktop.enable = true;
             }];
 
           extraSpecialArgs = { kube = kube.packages.aarch64-darwin.default; };

home.org

@@ -1,32 +1,36 @@
 #+PROPERTY: header-args :mkdirp yes
 #+PROPERTY: header-args:elisp :lexical t
-* Base
+* Categories
 
-#+BEGIN_SRC nix :tangle target/default.nix
-  {
-    imports = [
-      ./base_options.nix
-      ./sbcl.nix
-      ./crypto.nix
-      ./rust-reimpls.nix
-      ./ledger.nix
-      ./nil.nix
-      ./magic-wormhole.nix
-      ./desktop-packages.nix
-      ./shibumi.nix
-      ./slack.nix
-    ];
+#+BEGIN_SRC nix :tangle target/base.nix
+  {lib, ...}: {
+    imports = lib.filter
+      (n: lib.strings.hasSuffix ".nix" n)
+      (lib.filesystem.listFilesRecursive ./base);
   }
 #+END_SRC
 
-#+BEGIN_SRC nix :tangle target/base_options.nix
-  {lib, ...}:
-  with lib;
-  {
-    options = {
-      jfrikker.desktop.enable = mkEnableOption "desktop tools";
-      jfrikker.shibumi.enable = mkEnableOption "shibumi-specific tools";
-    };
+#+BEGIN_SRC nix :tangle target/desktop.nix
+  {lib, ...}: {
+    imports = lib.filter
+      (n: lib.strings.hasSuffix ".nix" n)
+      (lib.filesystem.listFilesRecursive ./desktop);
+  }
+#+END_SRC
+
+#+BEGIN_SRC nix :tangle target/redbook.nix
+  {lib, ...}: {
+    imports = lib.filter
+      (n: lib.strings.hasSuffix ".nix" n)
+      (lib.filesystem.listFilesRecursive ./redbook);
+  }
+#+END_SRC
+
+#+BEGIN_SRC nix :tangle target/redbook-desktop.nix
+  {lib, ...}: {
+    imports = lib.filter
+      (n: lib.strings.hasSuffix ".nix" n)
+      (lib.filesystem.listFilesRecursive ./redbook-desktop);
   }
 #+END_SRC
 
@@ -41,7 +45,7 @@ in a ~nix~ devshell I think I'd also like to use it for scripting / exploratory
 so I'm installing it globally with a useful set of libraries. I should curate this somewhat
 carefully so it doesn't get carried away...
 
-#+BEGIN_SRC nix :tangle target/sbcl.nix
+#+BEGIN_SRC nix :tangle target/base/sbcl.nix
   {pkgs, ...}:
   {
     home.packages = with pkgs; [
@@ -92,7 +96,7 @@ the name implies, allows generating and storing ~age~ keys on a Yubikey. ~rage~
 ~age~ when using ~age.el~, because it supports ~pinentry~. That allows it to prompt for yubikey pins
 using a dialog, rather than a command line prompt.
 
-#+BEGIN_SRC nix :tangle target/crypto.nix
+#+BEGIN_SRC nix :tangle target/base/crypto.nix
   {pkgs, ...}:
   {
     home.packages = with pkgs; [
@@ -112,7 +116,7 @@ tools. They boost better speed, or simply more streamlined features.
 | ~ripgrep~ | ~grep~   |
 | ~xh~      | ~curl~   |
 
-#+BEGIN_SRC nix :tangle target/rust-reimpls.nix
+#+BEGIN_SRC nix :tangle target/base/rust-reimpls.nix
   {pkgs, ...}:
   {
     home.packages = with pkgs; [
@@ -127,7 +131,7 @@ tools. They boost better speed, or simply more streamlined features.
 
 [[https://ledger-cli.org/][~ledger~]] is how I manage my budget. It's a plain-text accounting tool that's really awesome.
 
-#+BEGIN_SRC nix :tangle target/ledger.nix
+#+BEGIN_SRC nix :tangle target/base/ledger.nix
   {pkgs, ...}:
   {
     home.packages = with pkgs; [
@@ -138,7 +142,7 @@ tools. They boost better speed, or simply more streamlined features.
 
 ~nil~ is an LSP server for nix files.
 
-#+BEGIN_SRC nix :tangle target/nil.nix
+#+BEGIN_SRC nix :tangle target/base/nil.nix
   {pkgs, ...}:
   {
     home.packages = with pkgs; [
@@ -151,64 +155,59 @@ tools. They boost better speed, or simply more streamlined features.
 computers in the world, assuming that you have an out-of-band way to communicate a passphrase
 between them. Once installed, the actual command is ~wormhole~.
 
-#+begin_src nix :tangle target/magic-wormhole.nix
+#+begin_src nix :tangle target/base/magic-wormhole.nix
   {pkgs, ...}:
   {
     home.packages = with pkgs; [
-      magic-wormhole
+      magic-wormhole   
     ];
   }
 #+end_src
 
 These are the other programs I have installed globally. A few (like ~awscli~, ~mysql-client~, etc.)
-are still Shibumi-specific; ideally I'd find another way to install them.
+are still Redbook-specific; ideally I'd find another way to install them.
 
- #+BEGIN_SRC nix :tangle target/shibumi.nix
-   {lib, pkgs, kube, config, ...}:
+ #+BEGIN_SRC nix :tangle target/redbook/other-packages.nix
+   {pkgs, kube, ...}:
    {
-     config = lib.mkIf config.jfrikker.shibumi.enable {
-       home.packages = with pkgs; [
-         aws-iam-authenticator
-         awscli2
-         kube
-         kubectl
-         mariadb.client
-         openssh
-       ];
-     };
+     home.packages = with pkgs; [
+       aws-iam-authenticator
+       awscli2
+       kube
+       kubectl
+       mariadb.client
+       openssh
+     ];
+
+    fonts.fontconfig.enable = true;
    }
 #+END_SRC
 
 These programs require a full desktop environment:
 
-#+BEGIN_SRC nix :tangle target/desktop-packages.nix
-  {lib, pkgs, config, ...}:
+#+BEGIN_SRC nix :tangle target/desktop/desktop-packages.nix
+  {pkgs, ...}:
   {
-    config = lib.mkIf config.jfrikker.desktop.enable {
-      home.packages = with pkgs; [
-        google-chrome
-        nerd-fonts.jetbrains-mono
-        (iosevka-bin.override { variant = "Aile"; })
-        (iosevka-bin.override { variant = "Etoile"; })
-        (iosevka-bin.override { variant = "SGr-IosevkaTerm"; })
-        keymapp
-        proton-pass
-        wireshark
-      ];
-
-      fonts.fontconfig.enable = true;
-    };
+    home.packages = with pkgs; [
+      google-chrome
+      nerd-fonts.jetbrains-mono
+      nerd-fonts.symbols-only
+      (iosevka-bin.override { variant = "Aile"; })
+      (iosevka-bin.override { variant = "Etoile"; })
+      (iosevka-bin.override { variant = "SGr-IosevkaTerm"; })
+      keymapp
+      proton-pass
+      wireshark
+    ];
   }
 #+END_SRC
 
-#+BEGIN_SRC nix :tangle target/slack.nix
-  {lib, pkgs, config, ...}:
+#+BEGIN_SRC nix :tangle target/redbook-desktop/desktop-packages.nix
+  {pkgs, ...}:
   {
-    config = lib.mkIf (config.jfrikker.shibumi.enable && config.jfrikker.desktop.enable) {
-      home.packages = with pkgs; [
-        slack
-      ];
-    };
+    home.packages = with pkgs; [
+      slack
+    ];
   }
 #+END_SRC
 
@@ -315,7 +314,8 @@ We all know what ~git~ does.
     programs.git = {
       enable = true;
       settings.user.name = "Joe Frikker";
-      settings.user.email = "joe.frikker@shibumi.com";
+      settings.user.email = "joe@redbookcattle.com";
+      settings.github.user = "joe@redbookcattle.com";
     };
 
     programs.delta = {
@@ -915,6 +915,7 @@ Use variable-width fonts in text buffers. ~mixed-pitch-mode~ keeps most code blo
 
   (add-hook 'yaml-ts-mode-hook 'no-mixed-pitch)
   (add-hook 'mhtml-mode 'no-mixed-pitch)
+  (add-hook 'nxml-mode 'no-mixed-pitch)
 #+END_SRC
 
 A basic ace-window setup. Allows switching between windows quickly (although avy can do the same...).
@@ -1052,9 +1053,9 @@ This configuration affects general text editing, across all modes. First, some p
         avy
         edit-indirect
         embark
-        evil
-        evil-collection
-        evil-org
+        # evil
+        # evil-collection
+        # evil-org
         string-inflection
       ];
       extraConfig = builtins.readFile ./emacs-editing.el;
@@ -1074,17 +1075,17 @@ cancel them more frequently). In the end, I opted for Devil mode. It avoids modi
 its own devil-mode-only repeat maps that don't interfere when using normal modifier key sequences.
 
  #+BEGIN_SRC elisp
-  (setopt evil-want-keybinding nil)
-  (require 'evil)
-  (evil-mode 1)
-  (require 'evil-collection)
-  (evil-collection-init)
+   ;; (setopt evil-want-keybinding nil)
+   ;; (require 'evil)
+   ;; (evil-mode 1)
+   ;; (require 'evil-collection)
+   ;; (evil-collection-init)
 
-  (require 'evil-org)
-  (add-hook 'org-mode-hook 'evil-org-mode)
-  (evil-org-set-key-theme '(navigation insert textobjects additional calendar))
-  (require 'evil-org-agenda)
-  (evil-org-agenda-set-keys) 
+   ;; (require 'evil-org)
+   ;; (add-hook 'org-mode-hook 'evil-org-mode)
+   ;; (evil-org-set-key-theme '(navigation insert textobjects additional calendar))
+   ;; (require 'evil-org-agenda)
+   ;; (evil-org-agenda-set-keys) 
 #+END_SRC
 
 Avy allows jumping to any place on the screen with just a few keystrokes. I've stolen most of these
@@ -1162,7 +1163,7 @@ Just "silently" wrap when searching at the bottom of a document.
           ];
           ignoreCompilationError = true;
         })
-        lispyville
+        # lispyville
         lua-mode
         nix-mode
         rust-mode
@@ -1340,18 +1341,18 @@ for completion. That makes it really annoying to use; don't use yasnippet with e
 #+BEGIN_SRC elisp
   (setopt inferior-lisp-program "sbcl")
 
-  (setopt lispy-compat '(god-mode edebug))
+  ;; (setopt lispy-compat '(god-mode edebug))
   (add-hook 'emacs-lisp-mode-hook (lambda () (lispy-mode 1)))
   (add-hook 'lisp-mode-hook (lambda () (lispy-mode 1)))
-  (with-eval-after-load 'lispy
-    (require 'lispyville)
-    (add-hook 'lispy-mode-hook #'lispyville-mode)
-    (bind-keys :map lispy-mode-map
-               ("i" . (lambda ()
-                        (interactive)
-                        (if (and (featurep 'god-mode) god-global-mode)
-                            (god-mode-all -1)
-                          (special-lispy-tab))))))
+  ;; (with-eval-after-load 'lispy
+  ;;   (require 'lispyville)
+  ;;   (add-hook 'lispy-mode-hook #'lispyville-mode)
+  ;;   (bind-keys :map lispy-mode-map
+  ;;              ("i" . (lambda ()
+  ;;                       (interactive)
+  ;;                       (if (and (featurep 'god-mode) god-global-mode)
+  ;;                           (god-mode-all -1)
+  ;;                         (special-lispy-tab))))))
 #+END_SRC
 
 *** Typescript