From b33f401593f3ab1b13bc5e0197d16f3e2cb8be07 Mon Sep 17 00:00:00 2001 From: Philip Peterson Date: Thu, 28 May 2026 22:58:50 -0800 Subject: [PATCH] Bump --- README.md | 27 +++++++++++++++++++++++++++ nixos/aliases.zsh | 10 ++++++++++ nixos/linux.nix | 2 +- nixos/system/home/shared.nix | 10 +--------- 4 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 nixos/aliases.zsh diff --git a/README.md b/README.md index a3cb3bb..73642ec 100644 --- a/README.md +++ b/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. diff --git a/nixos/aliases.zsh b/nixos/aliases.zsh new file mode 100644 index 0000000..f211745 --- /dev/null +++ b/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 ../../../../..' diff --git a/nixos/linux.nix b/nixos/linux.nix index c683ee6..fd9e684 100644 --- a/nixos/linux.nix +++ b/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"]; diff --git a/nixos/system/home/shared.nix b/nixos/system/home/shared.nix index b65ff3b..dfe506a 100644 --- a/nixos/system/home/shared.nix +++ b/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