Bump

README.md

@@ -1,3 +1,30 @@
+## Applying changes
+
+### NixOS server
+
+```sh
+./apply.sh
+# or manually:
+nixos-rebuild switch --flake /root/petersweb-infra/nixos#mainframe
+```
+
+### Linux desktop / laptop or Mac
+
+Clone this repo, then set up once per machine:
+
+**Git aliases** (`git co` etc.):
+```sh
+git config --global include.path ~/path/to/petersweb-infra/nixos/gitconfig
+```
+
+**Zsh aliases** (`gco`, `u`/`uu` etc.) — symlink into place, then source from `~/.zshrc`:
+```sh
+ln -s ~/path/to/petersweb-infra/nixos/aliases.zsh ~/.zsh_aliases
+echo 'source ~/.zsh_aliases' >> ~/.zshrc
+```
+
+---
+
 This is the Nix server infrastructure for Quine Global. You will find it
 contains some Nginx configuration, some shell and terminal configuration,
 and system config.

nixos/aliases.zsh

@@ -0,0 +1,10 @@
+alias gco='git checkout'
+alias gb='git branch'
+alias gs='git status'
+alias gpcb='git push origin $(git rev-parse --abbrev-ref HEAD)'
+
+alias u='cd ..'
+alias uu='cd ../..'
+alias uuu='cd ../../..'
+alias uuuu='cd ../../../..'
+alias uuuuu='cd ../../../../..'

nixos/linux.nix

@@ -298,7 +298,7 @@ in {
 
       "hyper-quineglobal-com" = {
         autoStart = true;
-        image = "forge.quinefoundation.com/ironmagma/hyper-quineglobal-com@sha256:2a3d4e6e75ee7ee2e6b5d8151748e53f8c1aa752172a4caf58c33a40524941de";
+        image = "forge.quinefoundation.com/ironmagma/hyper-quineglobal-com@sha256:877d76a78cff3182d1a827f241bb8414eb6f629e2089d59884faad3824ce219c";
         volumes = [];
         environment = {};
         ports = ["3013:8081"];

nixos/system/home/shared.nix

@@ -152,15 +152,6 @@ in {
       ];
 
       shellAliases = {
-        u = "cd ..";
-        uu = "cd ../..";
-        uuu = "cd ../../..";
-        uuuu = "cd ../../../..";
-        uuuuu = "cd ../../../../..";
-        gs = "git status";
-        gco = "git checkout";
-        gb = "git branch";
-        gpcb = "git push origin $(git rev-parse --abbrev-ref HEAD)";
         gc = "nix-collect-garbage --delete-old";
         refresh = "source ~/.zshrc";
         show_path = "echo $PATH | tr ':' '\n'";
@@ -171,6 +162,7 @@ in {
       '';
 
       initExtra = ''
+        ${builtins.readFile ../../aliases.zsh}
         bindkey '^p' history-search-backward
         bindkey '^n' history-search-forward
         bindkey '^e' end-of-line