From f1328a5b750ba3ad55f9c3e29cd8ea926bf4523b Mon Sep 17 00:00:00 2001
From: Timo Wilken
Date: Sun, 25 Aug 2024 11:10:02 +0200
Subject: Remove ALICE-specific configuration

---
 tw/home.scm             | 18 +-----------------
 tw/home/files/zshrc     | 11 -----------
 tw/services/desktop.scm |  5 ++---
 3 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/tw/home.scm b/tw/home.scm
index f06e762f..cbab31c5 100644
--- a/tw/home.scm
+++ b/tw/home.scm
@@ -92,23 +92,7 @@
 
 (define (environment-variables config)
   "Configure my shell environment."
-  `( ;; Work at ALICE: Nomad, Consul, Vault.
-    ;; Tokens are not defined here as they are stored in pass(1).
-    ;; Shell aliases to use tokens are defined in zshrc.
-    ("NOMAD_ADDR" . "https://alinomad.cern.ch:443")
-    ("NOMAD_CACERT" . "${XDG_CONFIG_HOME}/cern-ca-bundle.crt")
-    ("NOMAD_CLIENT_CERT" . "${XDG_CONFIG_HOME}/grid-personal-cert.pem")
-    ("NOMAD_CLIENT_KEY" . "${XDG_CONFIG_HOME}/grid-personal-key.pem")
-    ("CONSUL_HTTP_ADDR" . "https://aliconsul.cern.ch:443")
-    ("CONSUL_CACERT" . "${XDG_CONFIG_HOME}/cern-ca-bundle.crt")
-    ("CONSUL_CLIENT_CERT" . "${XDG_CONFIG_HOME}/grid-personal-cert.pem")
-    ("CONSUL_CLIENT_KEY" . "${XDG_CONFIG_HOME}/grid-personal-key.pem")
-    ("VAULT_ADDR" . "https://alivault.cern.ch:443")
-    ("VAULT_CACERT" . "${XDG_CONFIG_HOME}/cern-ca-bundle.crt")
-    ("VAULT_CLIENT_CERT" . "${XDG_CONFIG_HOME}/grid-personal-cert.pem")
-    ("VAULT_CLIENT_KEY" . "${XDG_CONFIG_HOME}/grid-personal-key.pem")
-
-    ;; Common environment everywhere.
+  `(;; Common environment everywhere.
     ;; Prepend my own binaries to $PATH. These should probably all
     ;; be managed through `home-files-service-type'.
     ("PATH" . "$HOME/.local/bin${PATH:+:}$PATH")
diff --git a/tw/home/files/zshrc b/tw/home/files/zshrc
index 8a658173..52f930cc 100644
--- a/tw/home/files/zshrc
+++ b/tw/home/files/zshrc
@@ -101,17 +101,6 @@ alias ipy='ipython3 --autoindent --automagic --pprint --no-banner --no-confirm-e
 alias rot13='caesar 13'
 alias pdsh='\pdsh -SR ssh -f 64'
 alias wget='\wget --hsts-file="${XDG_CACHE_HOME:-$HOME/.cache}/wget-hsts"'
-alias aurora='REQUESTS_CA_BUNDLE=${XDG_CONFIG_HOME:-$HOME/.config}/cern-ca-bundle.crt \aurora'
-alias aurora_admin='REQUESTS_CA_BUNDLE=${XDG_CONFIG_HOME:-$HOME/.config}/cern-ca-bundle.crt \aurora_admin'
-alias nomad='NOMAD_TOKEN=$(pass cern/ci/nomad-bootstrap-token | head -1) \nomad'
-alias nomad-pack='NOMAD_TOKEN=$(pass cern/ci/nomad-bootstrap-token | head -1) \nomad-pack'
-alias nomad-diskfree='NOMAD_TOKEN=$(pass cern/ci/nomad-bootstrap-token | head -1) \nomad-diskfree'
-alias levant='NOMAD_TOKEN=$(pass cern/ci/nomad-bootstrap-token | head -1) \levant'
-alias consul='CONSUL_HTTP_TOKEN=$(pass cern/ci/consul-bootstrap-token | head -1) \consul'
-alias vault='VAULT_TOKEN=$(pass cern/ci/vault-root-token | head -1) \vault'
-nomad-shell () {
-  nomad alloc exec "$1" sh -c 'export TERM=xterm-256color HOME=$NOMAD_TASK_DIR PS1="\\u@\\h \\w \\\$ "; cd; exec bash -i'
-}
 restic.vin () {
   if [ $# -eq 0 ]; then
     echo 'Pass the repo name as the first parameter.' >&2
diff --git a/tw/services/desktop.scm b/tw/services/desktop.scm
index 819d5fdd..61105927 100644
--- a/tw/services/desktop.scm
+++ b/tw/services/desktop.scm
@@ -64,7 +64,7 @@
   #:use-module (tw gexp)
   #:use-module ((tw packages alice) #:select (python-alibuild python-alidistlint))
   #:use-module (tw packages catppuccin)
-  #:use-module ((tw packages ci) #:select (hashicorp-consul-bin hashicorp-levant-bin hashicorp-nomad-bin hashicorp-packer-bin hashicorp-vault-bin))
+  #:use-module ((tw packages ci) #:select (hashicorp-packer-bin))
   #:use-module ((tw packages games) #:select (szio-solitaire))
   #:use-module ((tw packages mail) #:select (mutt_oauth2.py))
   #:use-module ((tw packages scanner) #:select (simple-scan/airscan))
@@ -99,8 +99,7 @@
    ;; Work
    s3cmd python-alibuild python-alidistlint actionlint modules
    python-tox python-setuptools-scm python-mypy
-   hashicorp-levant-bin hashicorp-nomad-bin
-   hashicorp-consul-bin hashicorp-vault-bin hashicorp-packer-bin
+   hashicorp-packer-bin
    ansible vinagre
 
    ;; Fonts
-- 
cgit v1.2.3