initial for workcomp angrist

Author: joelmccracken

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 ~/workstation2/#homeConfigurations.${WORKSTATION_NAME}.$(whoami).activationPackage --show-trace
+    "$(nix path-info ~/workstation2/#homeConfigurations.${WORKSTATION_NAME}.$(whoami).activationPackage)"/activate --show-trace
 }
 home_manager_flake_switch
 # flake-world equivalent to home-manager 'switch':1 ends here

bin/tangle.sh

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

bootstrap-workstation.sh

@@ -249,15 +249,15 @@ else
 fi
 
 info ensuring nix is installed
-~/workstation/lib/shell/setup/ensure_nix_installed.sh
+~/workstation2/lib/shell/setup/ensure_nix_installed.sh
 
 info finished ensuring nix is installed
 
 info setting up nix.conf
-~/workstation/lib/shell/setup/install_system_nix_conf.sh
+~/workstation2/lib/shell/setup/install_system_nix_conf.sh
 
 info restarting nix daemon
-~/workstation/lib/shell/setup/restart_nix_daemon.sh
+~/workstation2/lib/shell/setup/restart_nix_daemon.sh
 info nix daemon restarted
 
 NIX_DAEMON_PATH='/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'
@@ -268,35 +268,35 @@ set -u
 
 is_mac && {
     info installing darwin-nix
-    ~/workstation/lib/shell/setup/install_nix_darwin.sh
+    ~/workstation2/lib/shell/setup/install_nix_darwin.sh
     info finished installing darwin-nix
 }
 
 
-~/workstation/lib/shell/setup/install_home_manager.sh
+~/workstation2/lib/shell/setup/install_home_manager.sh
 
-~/workstation/lib/shell/setup/home-manager-flake-switch.sh
+~/workstation2/lib/shell/setup/home-manager-flake-switch.sh
 
 set +u
 # evaluating this with set -u will cause an unbound variable error
 source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
 set -u
 
-~/workstation/lib/shell/setup/install_doom_emacs_no_nix.sh
+~/workstation2/lib/shell/setup/install_doom_emacs_no_nix.sh
 info linking dotfiles that should be symlinked
-bash ~/workstation/lib/shell/setup/link-dotfiles.sh -f -c
+bash ~/workstation2/lib/shell/setup/link-dotfiles.sh -f -c
 info finished linking dotfiles
 info "building the 'ws' script"
-~/workstation/lib/shell/setup/build_ws_tool.sh
+~/workstation2/lib/shell/setup/build_ws_tool.sh
 
 info "running the 'ws install' process"
-~/workstation/lib/shell/setup/ws_install.sh
+~/workstation2/lib/shell/setup/ws_install.sh
 info "'ws install' process completed"
 
 info linking dotfiles that should be symlinked
-bash ~/workstation/lib/shell/setup/link-dotfiles.sh -f -c
+bash ~/workstation2/lib/shell/setup/link-dotfiles.sh -f -c
 info finished linking dotfiles
-bash ~/workstation/lib/shell/setup/initial_bitwarden_sync.sh
+bash ~/workstation2/lib/shell/setup/initial_bitwarden_sync.sh
 
 cat <<-EOF
 Success! However, there are some remaining manual set up steps required.

dotfiles/config/doom/config.el

@@ -35,7 +35,7 @@
 ;; change `org-directory'. It must be set before org loads!
 
 (setq workstation-config-path
-      (concat "~/workstation/hosts/current/config.el"))
+      (concat "~/workstation2/hosts/current/config.el"))
 
 (when (file-exists-p workstation-config-path)
   (load workstation-config-path))

dotfiles/config/doom/init.el

@@ -78,7 +78,7 @@
        vc                ; version-control and Emacs, sitting in a tree
 
        :term
-       ;;eshell            ; the elisp shell that works everywhere
+       eshell            ; the elisp shell that works everywhere
        ;;shell             ; simple shell REPL for Emacs
        ;;term              ; basic terminal emulator for Emacs
        vterm             ; the best terminal emulation in Emacs
@@ -98,6 +98,7 @@
        ;;editorconfig      ; let someone else argue about tabs vs spaces
        ;;ein               ; tame Jupyter notebooks with emacs
        (eval +overlay)     ; run code, run (also, repls)
+       ;;gist              ; interacting with github gists
        lookup              ; navigate your code and its documentation
        lsp               ; M-x vscode
        magit             ; a git porcelain for Emacs
@@ -112,7 +113,8 @@
        ;;upload            ; map local to remote projects via ssh/ftp
 
        :os
-       (:if (featurep :system 'macos) macos)  ; improve compatibility with macOS
+       ;; (:if (featurep :system 'macos) macos)  ; improve compatibility with macOS
+       (:if IS-MAC macos)  ; improve compatibility with macOS
        ;;tty               ; improve the terminal Emacs experience
 
        :lang

dotfiles/zshrc

@@ -4,9 +4,9 @@ sourceIfExists () {
     fi
 }
 
-sourceIfExists ~/workstation/lib/shell/settings.sh
-sourceIfExists ~/workstation/lib/shell/paths.sh
-sourceIfExists ~/workstation/hosts/current/zshrc.sh
+sourceIfExists ~/workstation2/lib/shell/settings.sh
+sourceIfExists ~/workstation2/lib/shell/paths.sh
+sourceIfExists ~/workstation2/hosts/current/zshrc.sh
 
 export EDITOR=emacsclient
 export GIT_EDITOR=$EDITOR
@@ -40,3 +40,5 @@ sourceIfExists /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
 sourceIfExists ~/.nix-profile/etc/profile.d/hm-session-vars.sh
 sourceIfExists ~/workstation/lib/shell/funcs.sh
 sourceIfExists ~/.ghcup/env
+
+sourceIfExists ~/workstation2/lib/shell/funcs.sh

hosts/aeglos/README.md

@@ -0,0 +1,2 @@
+my main personal workstation 
+  * [ ] 

hosts/aeglos/zshrc.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 # [[file:../../workstation.org::*aeglos/][aeglos/:2]]
-source ~/workstation/hosts/aeglos/settings.sh
+source ~/workstation2/hosts/aeglos/settings.sh
 # aeglos/:2 ends here

hosts/angrist/README.md

@@ -0,0 +1,4 @@
+my work-workstation
+
+
+

hosts/angrist/config.el

@@ -0,0 +1,2 @@
+(after! org
+  (setq org-directory "~/freckle/notes/"))

hosts/angrist/settings.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+export WORKSTATION_NAME=angrist

hosts/angrist/zshrc.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env zsh
+
+source ~/workstation2/hosts/angrist/settings.sh

lib/shell/setup/build_ws_tool.sh

@@ -2,6 +2,6 @@
 # Build WS tool
 
 # [[file:../../../workstation.org::*Build WS tool][Build WS tool:1]]
-cd  ~/workstation/wshs
+cd  ~/workstation2/wshs
 nix build --no-link -L .#"wshs:exe:bww" .#"wshs:exe:ws"
 # Build WS tool:1 ends here

lib/shell/setup/ensure_nix_installed.sh

@@ -2,8 +2,8 @@
 # Install Nix
 
 # [[file:../../../workstation.org::*Install Nix][Install Nix:1]]
-source ~/workstation/lib/shell/setup/workstation_setup_versions.sh
-source ~/workstation/lib/shell/funcs.sh
+source ~/workstation2/lib/shell/setup/workstation_setup_versions.sh
+source ~/workstation2/lib/shell/funcs.sh
 
 if which nix > /dev/null; then
     info "nix exists in path, not installing"

lib/shell/setup/home-manager-flake-switch.sh

@@ -11,7 +11,7 @@
 # [[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
 
-nix build --no-link ~/workstation/#homeConfigurations.${WORKSTATION_NAME}.$(whoami).activationPackage --show-trace
+nix build --no-link ~/workstation2/#homeConfigurations.${WORKSTATION_NAME}.$(whoami).activationPackage --show-trace
 
-"$(nix path-info ~/workstation/#homeConfigurations.${WORKSTATION_NAME}.$(whoami).activationPackage)"/activate --show-trace
+"$(nix path-info ~/workstation2/#homeConfigurations.${WORKSTATION_NAME}.$(whoami).activationPackage)"/activate --show-trace
 # flake-world equivalent to 'home-manager switch':1 ends here

lib/shell/setup/initial_bitwarden_sync.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # [[file:../../../workstation.org::*Initial Bitwarden Sync][Initial Bitwarden Sync:2]]
-source ~/workstation/lib/shell/funcs.sh
+source ~/workstation2/lib/shell/funcs.sh
 
 
 # The initial BitWarden Sync process. Requires wshs/bww executable to
@@ -17,7 +17,7 @@ function initial_bitwarden_sync() {
         if [ ! -d ~/secrets ]; then
             mkdir ~/secrets;
         fi
-        cd  ~/workstation/wshs
+        cd  ~/workstation2/wshs
         # overwriting anything that was previously in the file
         echo "${WS_BW_MASTER_PASS}" > ~/secrets/bw_pass
         bw login --apikey

lib/shell/setup/install_doom_emacs_no_nix.sh

@@ -2,7 +2,7 @@
 # Install doom emacs without nix
 
 # [[file:../../../workstation.org::*Install doom emacs without nix][Install doom emacs without nix:1]]
-source ~/workstation/lib/shell/foundation.sh
+source ~/workstation2/lib/shell/foundation.sh
 
 {
     cd $WORKSTATION_EMACS_CONFIG_DIR

lib/shell/setup/install_nix_darwin.sh

@@ -2,12 +2,12 @@
 # Install nix-darwin
 
 # [[file:../../../workstation.org::*Install nix-darwin][Install nix-darwin:1]]
-source ~/workstation/lib/shell/foundation.sh
-source ~/workstation/lib/shell/setup/workstation_setup_versions.sh
+source ~/workstation2/lib/shell/foundation.sh
+source ~/workstation2/lib/shell/setup/workstation_setup_versions.sh
 
 cd $WORKSTATION_DIR
 nix-build https://github.com/LnL7/nix-darwin/archive/${WORKSTATION_NIX_DARWIN_VERSION}.tar.gz -A installer
 ./result/bin/darwin-installer
 
-source ~/workstation/lib/shell/setup/nix-darwin-rebuild-flake.sh
+source ~/workstation2/lib/shell/setup/nix-darwin-rebuild-flake.sh
 # Install nix-darwin:1 ends here

lib/shell/setup/link-dotfiles.sh

@@ -2,7 +2,7 @@
 # Linking dotfiles
 
 # [[file:../../../workstation.org::*Linking dotfiles][Linking dotfiles:1]]
-source ~/workstation/lib/shell/funcs.sh
+source ~/workstation2/lib/shell/funcs.sh
 
 export FORCE=false;
 export VERBOSE=false;
@@ -34,7 +34,7 @@ function check () {
 
 function ln_helper() {
     dest=~/$2$1
-    src=~/workstation/dotfiles/$1
+    src=~/workstation2/dotfiles/$1
     curr=$(readlink -f "$dest")
 
     if [ -L "$dest" ] && [ "$curr" = "$src" ]; then
@@ -59,7 +59,7 @@ function ln_norm() {
 }
 
 function ln_dotfile_n() {
-    src=~/workstation/dotfiles/$1
+    src=~/workstation2/dotfiles/$1
     dest=~/.$1
     destdir=$(dirname $dest)
 

lib/shell/setup/restart_nix_daemon.sh

@@ -4,7 +4,7 @@
 # file.
 
 # [[file:../../../workstation.org::*restart nix daemons][restart nix daemons:1]]
-source ~/workstation/lib/shell/funcs.sh
+source ~/workstation2/lib/shell/funcs.sh
 function restart_nix_daemon_linux() {
     sudo systemctl restart nix-daemon.service;
 }

lib/shell/setup/ws_install.sh

@@ -2,6 +2,6 @@
 # Run WS install
 
 # [[file:../../../workstation.org::*Run WS install][Run WS install:1]]
-cd  ~/workstation/wshs
+cd  ~/workstation2/wshs
 $(nix path-info .#"wshs:exe:ws")/bin/ws install -m "$WORKSTATION_NAME";
 # Run WS install:1 ends here

test/ci.sh

@@ -33,5 +33,5 @@ fi
 
 echo INSTALL PROCESS COMPLETE, TESTING
 
-bash ~/workstation/test/test.sh
+bash ~/workstation2/test/test.sh
 # The environment setup script:1 ends here

test/test.sh

@@ -15,7 +15,7 @@ set +u
 source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
 set -u
 
-source ~/workstation/lib/shell/foundation.sh
+source ~/workstation2/lib/shell/foundation.sh
 
 function find_emacs_init() {
   init_file="";