wip

flake.nix

@@ -50,14 +50,16 @@
           modules =
             [
               nix-index-database.homeModules.default
-              "${modules}"
+              "${modules}/base.nix"
+              "${modules}/desktop.nix"
+              "${modules}/shibumi.nix"
+              "${modules}/shibumi-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
+#+BEGIN_SRC nix :tangle target/base.nix
-  {
+  {lib, ...}: {
-    imports = [
+    imports = lib.filter
-      ./base_options.nix
+      (n: lib.strings.hasSuffix ".nix" n)
-      ./sbcl.nix
+      (lib.filesystem.listFilesRecursive ./base);
-      ./crypto.nix
-      ./rust-reimpls.nix
-      ./ledger.nix
-      ./nil.nix
-      ./magic-wormhole.nix
-      ./desktop-packages.nix
-      ./shibumi.nix
-      ./slack.nix
-    ];
   }
 #+END_SRC
 
-#+BEGIN_SRC nix :tangle target/base_options.nix
+#+BEGIN_SRC nix :tangle target/desktop.nix
-  {lib, ...}:
+  {lib, ...}: {
-  with lib;
+    imports = lib.filter
-  {
+      (n: lib.strings.hasSuffix ".nix" n)
-    options = {
+      (lib.filesystem.listFilesRecursive ./desktop);
-      jfrikker.desktop.enable = mkEnableOption "desktop tools";
+  }
-      jfrikker.shibumi.enable = mkEnableOption "shibumi-specific tools";
+#+END_SRC
-    };
+
+#+BEGIN_SRC nix :tangle target/shibumi.nix
+  {lib, ...}: {
+    imports = lib.filter
+      (n: lib.strings.hasSuffix ".nix" n)
+      (lib.filesystem.listFilesRecursive ./shibumi);
+  }
+#+END_SRC
+
+#+BEGIN_SRC nix :tangle target/shibumi-desktop.nix
+  {lib, ...}: {
+    imports = lib.filter
+      (n: lib.strings.hasSuffix ".nix" n)
+      (lib.filesystem.listFilesRecursive ./shibumi-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,7 +155,7 @@ 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; [
@@ -163,10 +167,9 @@ between them. Once installed, the actual command is ~wormhole~.
 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.
 
- #+BEGIN_SRC nix :tangle target/shibumi.nix
+ #+BEGIN_SRC nix :tangle target/shibumi/other-packages.nix
-   {lib, pkgs, kube, config, ...}:
+   {pkgs, kube, ...}:
    {
-     config = lib.mkIf config.jfrikker.shibumi.enable {
      home.packages = with pkgs; [
        aws-iam-authenticator
        awscli2
@@ -175,16 +178,16 @@ are still Shibumi-specific; ideally I'd find another way to install them.
        mariadb.client
        openssh
      ];
-     };
+
+    fonts.fontconfig.enable = true;
    }
 #+END_SRC
 
 These programs require a full desktop environment:
 
-#+BEGIN_SRC nix :tangle target/desktop-packages.nix
+#+BEGIN_SRC nix :tangle target/desktop/desktop-packages.nix
-  {lib, pkgs, config, ...}:
+  {pkgs, ...}:
   {
-    config = lib.mkIf config.jfrikker.desktop.enable {
     home.packages = with pkgs; [
       google-chrome
       nerd-fonts.jetbrains-mono
@@ -195,20 +198,15 @@ These programs require a full desktop environment:
       proton-pass
       wireshark
     ];
-
-      fonts.fontconfig.enable = true;
-    };
   }
 #+END_SRC
 
-#+BEGIN_SRC nix :tangle target/slack.nix
+#+BEGIN_SRC nix :tangle target/shibumi-desktop/desktop-packages.nix
-  {lib, pkgs, config, ...}:
+  {pkgs, ...}:
   {
-    config = lib.mkIf (config.jfrikker.shibumi.enable && config.jfrikker.desktop.enable) {
     home.packages = with pkgs; [
       slack
     ];
-    };
   }
 #+END_SRC
 
@@ -915,6 +913,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...).