README.md

@@ -63,7 +63,7 @@ the WSL configuration:
 
 ```
 nix-shell -p nixVersions.stable
-sudo nixos-rebuild switch --flake github:nmasur/dotfiles#flame
+sudo nixos-rebuild switch --flake github:nmasur/dotfiles#wsl
 ```
 
 You should also download the
@@ -90,7 +90,17 @@ nix-build https://github.com/LnL7/nix-darwin/archive/master.tar.gz -A installer
 Then switch to the macOS configuration:
 
 ```bash
-darwin-rebuild switch --flake github:nmasur/dotfiles#lookingglass
+darwin-rebuild switch --flake github:nmasur/dotfiles#macbook
+```
+
+### Dealing with corporate MITM SSL certificates:
+
+```bash
+# Get the certificates
+openssl s_client -showcerts -verify 5 -connect cache.nixos.org:443 < /dev/null
+
+# Paste them in here
+sudo nvim $NIX_SSL_CERT_FILE
 ```
 
 ---

apps/encrypt-secret.nix

@@ -11,7 +11,7 @@
     tmpfile=$(mktemp)
     echo "''${secret}" > ''${tmpfile}
     ${pkgs.age}/bin/age --encrypt --armor --recipients-file ${
-      builtins.toString ../public-keys
+      builtins.toString ../hosts/public-keys
     } $tmpfile
     rm $tmpfile
   '');

apps/reencrypt-secrets.nix

@@ -17,7 +17,7 @@
         --identity ~/.ssh/id_ed25519 $encryptedfile > $tmpfile
       echo "Encrypting ''${encryptedfile}..."
       ${pkgs.age}/bin/age --encrypt --armor --recipients-file ${
-        builtins.toString ../public-keys
+        builtins.toString ../hosts/public-keys
       } $tmpfile > $encryptedfile
       rm $tmpfile
     done

flake.nix

@@ -112,8 +112,7 @@
       overlays = [
         inputs.nur.overlay
         inputs.nix2vim.overlay
-        (import ./overlays/neovim-plugins.nix inputs)
+        (import ./modules/neovim/plugins-overlay.nix inputs)
-        (import ./overlays/calibre-web.nix)
       ];
 
       # System types to support.

nixos/services/calibre.nix

@@ -20,6 +20,16 @@
       };
     };
 
+    # Fix: https://github.com/janeczku/calibre-web/issues/2422
+    nixpkgs.overlays = [
+      (final: prev: {
+        calibre-web = prev.calibre-web.overrideAttrs (old: {
+          patches = (old.patches or [ ])
+            ++ [ ../../patches/calibre-web-cloudflare.patch ];
+        });
+      })
+    ];
+
     caddy.routes = [{
       match = [{ host = [ config.bookServer ]; }];
       handle = [{

overlays/calibre-web.nix

@@ -1,7 +0,0 @@
-# Fix: https://github.com/janeczku/calibre-web/issues/2422
-
-final: prev: {
-  calibre-web = prev.calibre-web.overrideAttrs (old: {
-    patches = (old.patches or [ ]) ++ [ ./calibre-web-cloudflare.patch ];
-  });
-}