Merge branch 'textmate' of github.com:jeff-hykin/fornix

Author: jeff-hykin

.gitignore

@@ -1,9 +1,7 @@
 # 
 # Custom
 # 
-\.idea
-**/*.dont-sync
-**/*.dont-sync.*
+*.vsix
 
 
 # 

commands/project/publish

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 vsce publish --pat "$1" && echo "published on VSCE"
-ovsx publish -p "$2" && echo "published on OVSX"
+ovsx publish -p "$2" && echo "published on OVSX"

commands/shell

@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i bash -p bash_5 -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/a7ecde854aee5c4c7cd6177f54a99d2c1ff28a31.tar.gz
+#! nix-shell -i bash -p bash_5 -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/ce6aa13369b667ac2542593170993504932eb836.tar.gz
 
 # the comments above^ are special
 #   they tell the system to process this using nix-shell
@@ -85,9 +85,9 @@ if [[ -n "$FORNIX_ARGS" ]]
 then
     # FIXME: I think the single quotes need to be escaped from the arguments (need to iterate over them, escape each one with single quotes)
     # run single command
-    HOME="$FORNIX_HOME" nix-shell --pure --show-trace --run "zsh -c '$FORNIX_ARGS'" "$__temp_var__nix_shell_file"
+    HOME="$FORNIX_HOME" nix-shell --pure --show-trace --run "zsh -c '$FORNIX_ARGS'" "$__temp_var__nix_shell_file" -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/a7ecde854aee5c4c7cd6177f54a99d2c1ff28a31.tar.gz --keep __FORNIX_NIX_SETTINGS_PATH --keep __FORNIX_NIX_MAIN_CODE_PATH --keep __FORNIX_NIX_PACKAGES_FILE_PATH --keep __FORNIX_NIX_PATH_EXPORT_FILE --keep __FORNIX_NIX_COMMANDS --keep FORNIX_FOLDER
 else
-    HOME="$FORNIX_HOME" nix-shell --pure --show-trace --command "zsh" "$__temp_var__nix_shell_file"
+    HOME="$FORNIX_HOME" nix-shell --pure --show-trace --command "zsh" "$__temp_var__nix_shell_file" -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/a7ecde854aee5c4c7cd6177f54a99d2c1ff28a31.tar.gz --keep __FORNIX_NIX_SETTINGS_PATH --keep __FORNIX_NIX_MAIN_CODE_PATH --keep __FORNIX_NIX_PACKAGES_FILE_PATH --keep __FORNIX_NIX_PATH_EXPORT_FILE --keep __FORNIX_NIX_COMMANDS --keep FORNIX_FOLDER
 fi
 if [ "$FORNIX_DEBUG" = "true" ]; then
     echo "exited the nix-shell environment"

documentation/SETUP.md

@@ -5,7 +5,7 @@
 - (Don't git clone)
 - Run this: `repo=https://github.com/jeff-hykin/better-cpp-syntax setup_or_copy=setup branch=master eval "$(curl -fsSL git.io/JE2Zm || wget -qO- git.io/JE2Zm)"`
 - If you're on Windows, run it inside WSL (Ubuntu 20.04 preferably)
-- If you're a responsible human being and therefore don't want run a sketchy internet script, props to you 👍. Take a look at the explaination below and you'll be able to run the commands yourself.
+- If you're a responsible human being and therefore don't want run a sketchy internet script, props to you 👍. Take a look at the "What is that `eval` command doing?" section at the bottom and you'll be able to run the commands yourself.
 
 ### If the above instructions didn't make sense
 
@@ -20,13 +20,13 @@
 - Windows users
     - Get [WSL](https://youtu.be/av0UQy6g2FA?t=91) (Windows Subsystem for Linux) or [WSL2](https://www.omgubuntu.co.uk/how-to-install-wsl2-on-windows-10)<br>
         - If you're not familiar with WSL, I'd recommend [watching a quick thing on it like this one](https://youtu.be/av0UQy6g2FA?t=91)
-        - Ubuntu 20.04 for WSL is preferred (same as in that linked video), but Ubuntu 21.04 or similar should work.
-        - [WSL2](https://www.omgubuntu.co.uk/how-to-install-wsl2-on-windows-10) (released August 2020) is needed if you want to use your GPU.<br>
+        - Ubuntu 20.04 for WSL is preferred (same as in that linked video), but Ubuntu 22.04 or similar should work.
+        - [WSL2](https://www.omgubuntu.co.uk/how-to-install-wsl2-on-windows-10) (just released August 2020) is needed if you want to use your GPU.<br>
     - Once WSL is installed (and you have a terminal logged into WSL) follow the Mac/Linux instructions.
     - (tip: when accessing WSL, you probably want to use the VS Code terminal, or the [open source windows terminal](https://github.com/microsoft/terminal) instead of CMD)
 
 After you've finished working and close the terminal, you can always return to project environment by doing
-- `cd wherever-you-put-the-project`
+- `cd WHEREVER_YOU_PUT_THE_PROJECT`
 - `commands/start`
 
 <!-- 
@@ -51,7 +51,7 @@ Altertive instructions if GUI is needed (matplotlib, tkinter, qt, etc)
 
 ### What is that `eval` command doing?
 
-1. Installing nix [manual install instructions here](https://nixos.org/guides/install-nix.html)
+1. Installing nix [manual install instructions here](https://nixos.org/download.html)
 2. Installing `git` (using nix) if you don't already have git
 3. It clones the repository
 4. It `cd`'s inside of the repo

documentation/setup.md

@@ -5,7 +5,7 @@
 - (Don't git clone)
 - Run this: `repo=https://github.com/jeff-hykin/better-cpp-syntax setup_or_copy=setup branch=master eval "$(curl -fsSL git.io/JE2Zm || wget -qO- git.io/JE2Zm)"`
 - If you're on Windows, run it inside WSL (Ubuntu 20.04 preferably)
-- If you're a responsible human being and therefore don't want run a sketchy internet script, props to you 👍. Take a look at the explaination below and you'll be able to run the commands yourself.
+- If you're a responsible human being and therefore don't want run a sketchy internet script, props to you 👍. Take a look at the "What is that `eval` command doing?" section at the bottom and you'll be able to run the commands yourself.
 
 ### If the above instructions didn't make sense
 
@@ -20,13 +20,13 @@
 - Windows users
     - Get [WSL](https://youtu.be/av0UQy6g2FA?t=91) (Windows Subsystem for Linux) or [WSL2](https://www.omgubuntu.co.uk/how-to-install-wsl2-on-windows-10)<br>
         - If you're not familiar with WSL, I'd recommend [watching a quick thing on it like this one](https://youtu.be/av0UQy6g2FA?t=91)
-        - Ubuntu 20.04 for WSL is preferred (same as in that linked video), but Ubuntu 21.04 or similar should work.
-        - [WSL2](https://www.omgubuntu.co.uk/how-to-install-wsl2-on-windows-10) (released August 2020) is needed if you want to use your GPU.<br>
+        - Ubuntu 20.04 for WSL is preferred (same as in that linked video), but Ubuntu 22.04 or similar should work.
+        - [WSL2](https://www.omgubuntu.co.uk/how-to-install-wsl2-on-windows-10) (just released August 2020) is needed if you want to use your GPU.<br>
     - Once WSL is installed (and you have a terminal logged into WSL) follow the Mac/Linux instructions.
     - (tip: when accessing WSL, you probably want to use the VS Code terminal, or the [open source windows terminal](https://github.com/microsoft/terminal) instead of CMD)
 
 After you've finished working and close the terminal, you can always return to project environment by doing
-- `cd wherever-you-put-the-project`
+- `cd WHEREVER_YOU_PUT_THE_PROJECT`
 - `commands/start`
 
 <!-- 
@@ -51,7 +51,7 @@ Altertive instructions if GUI is needed (matplotlib, tkinter, qt, etc)
 
 ### What is that `eval` command doing?
 
-1. Installing nix [manual install instructions here](https://nixos.org/guides/install-nix.html)
+1. Installing nix [manual install instructions here](https://nixos.org/download.html)
 2. Installing `git` (using nix) if you don't already have git
 3. It clones the repository
 4. It `cd`'s inside of the repo

package.json

@@ -59,6 +59,8 @@
         "textmate-bailout": "^1.1.0",
         "textmate-tester": "1.1.9",
         "vsce": "^1.99.0",
-        "yargs": "^17.1.1"
+        "yargs": "^17.5.1",
+        "ovsx": "^0.5.1",
+        "textmate-tester": "^1.1.2"
     }
 }