Compare commits

...

3 Commits

Author SHA1 Message Date
Noah Masur
251dce68bb remove mitm ssl instructions 2023-02-20 20:13:52 -05:00
Noah Masur
448c97665b move public-keys to root directory 2023-02-20 20:02:21 -05:00
Noah Masur
86aa02aae4 rename patches directory to overlays 2023-02-20 20:00:54 -05:00
9 changed files with 13 additions and 25 deletions

View File

@ -63,7 +63,7 @@ the WSL configuration:
```
nix-shell -p nixVersions.stable
sudo nixos-rebuild switch --flake github:nmasur/dotfiles#wsl
sudo nixos-rebuild switch --flake github:nmasur/dotfiles#flame
```
You should also download the
@ -90,17 +90,7 @@ 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#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
darwin-rebuild switch --flake github:nmasur/dotfiles#lookingglass
```
---

View File

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

View File

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

View File

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

View File

@ -20,16 +20,6 @@
};
};
# 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 = [{

7
overlays/calibre-web.nix Normal file
View File

@ -0,0 +1,7 @@
# 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 ];
});
}