initial for workcomp angrist

.github/workflows/test.yml

@@ -14,8 +14,14 @@
 # [[file:../../workstation.org::*Github Actions CI][Github Actions CI:1]]
 name: CI
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 on:
+  pull_request:
   push:
+    branches: main
   schedule:
   - cron: '0 0 * * *'  # every day at midnight
 
@@ -24,17 +30,20 @@ jobs:
     strategy:
       matrix:
         os:
+        # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
         - macos-13 # x86
         - macos-latest # aarch
         - ubuntu-latest
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
-
-    - name: Run a one-line script
-      env:
-        BW_CLIENTID: ${{ secrets.BW_CLIENTID }}
-        BW_CLIENTSECRET: ${{ secrets.BW_CLIENTSECRET }}
-        WS_BW_MASTER_PASS: ${{ secrets.WS_BW_MASTER_PASS }}
-      run: ./test/ci.sh
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          # ref: ${{ github.sha }}
+      - run: ./test/ci.sh
+        env:
+          WORKSTATION_VERSION: ${{ github.event.pull_request.head.sha }}
+          BW_CLIENTID: ${{ secrets.BW_CLIENTID }}
+          BW_CLIENTSECRET: ${{ secrets.BW_CLIENTSECRET }}
+          WS_BW_MASTER_PASS: ${{ secrets.WS_BW_MASTER_PASS }}
 # Github Actions CI:1 ends here

.github/workflows/ws_tool.yaml

@@ -0,0 +1,59 @@
+name: WS Tool
+
+on:
+  pull_request:
+  push:
+    branches: main
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        os:
+        # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
+        - macos-13 # x86
+        - macos-latest # aarch
+        - ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          ref: ${{ github.event.pull_request.head.ref }}
+      - run: ws_tool/test/bats/bin/bats ws_tool/test
+        env:
+          WORKSTATION_VERSION: ${{ github.event.pull_request.head.sha }}
+          BW_CLIENTID: ${{ secrets.BW_CLIENTID }}
+          BW_CLIENTSECRET: ${{ secrets.BW_CLIENTSECRET }}
+          WS_BW_MASTER_PASS: ${{ secrets.WS_BW_MASTER_PASS }}
+
+  full-setup:
+    strategy:
+      matrix:
+        os:
+        # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
+        - macos-13 # x86
+        - macos-latest # aarch
+        - ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          ref: ${{ github.event.pull_request.head.sha }}
+      - run: bash ws_tool/test/ci_full_setup.bash
+        env:
+          WORKSTATION_VERSION: ${{ github.event.pull_request.head.sha }}
+          BW_CLIENTID: ${{ secrets.BW_CLIENTID }}
+          BW_CLIENTSECRET: ${{ secrets.BW_CLIENTSECRET }}
+          WS_BW_MASTER_PASS: ${{ secrets.WS_BW_MASTER_PASS }}

.gitmodules

@@ -1,9 +1,9 @@
 [submodule "test/bats"]
-	path = test/bats
+	path = ws_tool/test/bats
 	url = https://github.com/bats-core/bats-core.git
 [submodule "test/test_helper/bats-support"]
-	path = test/test_helper/bats-support
+	path = ws_tool/test/test_helper/bats-support
 	url = https://github.com/bats-core/bats-support.git
 [submodule "test/test_helper/bats-assert"]
-	path = test/test_helper/bats-assert
+	path = ws_tool/test/test_helper/bats-assert
 	url = https://github.com/bats-core/bats-assert.git

bin/cron-5.sh

@@ -15,9 +15,13 @@ main() {
     # env
 
     echo "updating EF"
-    ~/workstation/bin/update-ef-on-server.sh
+    # TODO this maybe could be better
+    # script to generate this file with pointers to specific workstation dirs
+    # perhaps have $HOME/.config/workstation/ standard location as well/instead?
+    source $HOME/workstation/hosts/current/zshrc.sh
+    $HOME/workstation/bin/update-ef-on-server.sh
 
     echo "FINISHED $(date)"
 }
 
-main >> ~/workstation/var/log/cron 2>&1
+main >> $HOME/workstation/var/log/cron 2>&1

bin/get-workstation-dir.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+cd "$(dirname "$BASH_SOURCE[0])")"
+cd ../
+echo -n "$(pwd)"

bin/home-manager-flake-switch.sh

@@ -11,8 +11,8 @@
 # [[file:../workstation.org::*flake-world equivalent to home-manager 'switch'][flake-world equivalent to home-manager 'switch':1]]
 set -u # error in case WORKSTATION_NAME is not set
 function home_manager_flake_switch() {
-    nix build --no-link ~/workstation/#homeConfigurations.${WORKSTATION_NAME}.$(whoami).activationPackage --show-trace
-    "$(nix path-info ~/workstation/#homeConfigurations.${WORKSTATION_NAME}.$(whoami).activationPackage)"/activate --show-trace
+    nix build --no-link ${WORKSTATION_DIR}/#homeConfigurations.${WORKSTATION_NAME}.$(whoami).activationPackage --show-trace
+    "$(nix path-info ${WORKSTATION_DIR}/#homeConfigurations.${WORKSTATION_NAME}.$(whoami).activationPackage)"/activate --show-trace
 }
 home_manager_flake_switch
 # flake-world equivalent to home-manager 'switch':1 ends here

bin/ssh-belthronding

@@ -1,4 +1,20 @@
 #!/usr/bin/env bash
+set -x
+# BELTHRONDING=137.184.110.5
+BELTHRONDING=belthronding.wildkraken.monster
+
+reset_command(){
+  cat <<-EOF
+    reset;
+    ssh -t -o ConnectTimeout=10 joel@"$BELTHRONDING" "$@";
+    reset;
+    echo belthronding ssh exited and terminal reset, args "$@"
+EOF
+}
+
+ssh_with_resets() {
+  exec bash -c "$(reset_command)"
+}
 
 # run a command on cloud workstation
-ssh [email protected] "$@"
+ssh_with_resets "$@"

bin/sudopw

@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+# Passwordless sudo
+# Occasionally, sudo is extremely annoying. Having to type "sudo" in the middle of a nix-darwin rebuild really interrupts the flow. So here are a couple of scripts
+# to toggle passwordless sudo.
+
+# [[file:../workstation.org::*Passwordless sudo][Passwordless sudo:1]]
+set -euo pipefail
+
+sudo_file=/etc/sudoers.d/sudo-file
+
+usage() {
+  echo 'usage: sudopw <--pw|--no-pw> ';
+  echo '         - enable/disable passwordless sudo';
+  echo '       must be run with sudo.';
+  exit 1
+}
+
+mk_sudoer_file(){
+  local modifier="$1" file
+  file="$(mktemp -d "${TMPDIR:-/tmp}/sudoerd-file.XXXXXXXXX")/file"
+
+  cat > $file <<-EOF
+	$SUDO_USER  ALL=(ALL) ${modifier}ALL
+EOF
+  visudo -c "$file" > /dev/null
+  echo "$file";
+}
+
+no_pw() {
+  put_sudo_file 'NOPASSWD: '
+}
+
+yes_pw() {
+  put_sudo_file ''
+}
+
+put_sudo_file() {
+  local param="$1"
+  local tmpfile
+  tmpfile="$(mk_sudoer_file "$param")"
+
+  mv "$tmpfile" "$sudo_file"
+}
+
+
+if (( $# != 1 )) || [[ -z "${SUDO_USER:-}" ]]; then
+  usage
+fi
+
+case "$1" in
+  (--pw) yes_pw;;
+  (--no-pw) no_pw;;
+  (*) usage;;
+esac

bin/tangle.sh

@@ -5,6 +5,6 @@
 
 
 # [[file:../workstation.org::*Makefile][Makefile:2]]
-source ~/workstation/lib/shell/foundation.sh
+source ${WORKSTATION_DIR}/lib/shell/foundation.sh
 $WORKSTATION_EMACS_CONFIG_DIR/bin/doomscript lib/emacs/tangle-file.el
 # Makefile:2 ends here

bin/workstation-doctor.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+# TODO idea for basic workstation sanity checking framework
+# can KISS instead of making things too complicated
+
+
+# check settings for current workstation, are
+# workstation_name and workstation_dir set? is link at hosts/current?
+# is there anything else that needs to be done? can I move anything from test script to here, and also
+# invoke this script within the test scripty?
+#
+# check emacs works
+# check secrets setup
+# - use a dummy secrete + some sha for checking w.r.t real secrets setup correctly
+# - check workstation origin for newer version?
+# - see other notes about what to do here, have thought about doing this a million times
+# - check somehow if pending migration to run?
+# - check if nix stuff needs to be rebuilt?
+# - maybe keep some of this stuff in ~/.config
+#
+#
+#
+# see here for more ideas https://unix.stackexchange.com/questions/312988/understanding-home-configuration-file-locations-config-and-local-sha#313001
+#
+# can replace var directory
+#
+# add standard sanity checking in front of all workstaiton scripts, and have standard bypass
+# infra if I want to run script anyway.
+# TODO run git diff in ~ and $WORKSTATION_DIR to check for any stray changes.
+# TODO someday run reddup also
+# TODO someday have this script run automatically and have action items output in
+#      notable spots (bitbar, shell input notice)