From 03d6a1dae0d21c95fe8b935c4475975f4fd6a7b2 Mon Sep 17 00:00:00 2001
From: Dylan Donahue <donahue.dyl@northeastern.edu>
Date: Thu, 29 Aug 2024 21:03:13 -0400
Subject: [PATCH] poop

---
 alias.conf       |  2 --
 aliases.txt      |  6 +++++-
 requirements.txt |  2 --
 setup.py         | 20 ++++++++++----------
 4 files changed, 15 insertions(+), 15 deletions(-)
 delete mode 100644 alias.conf

diff --git a/alias.conf b/alias.conf
deleted file mode 100644
index 8162eda..0000000
--- a/alias.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-alias build ="python build.py"
-
diff --git a/aliases.txt b/aliases.txt
index 0ab328d..f8ad5ea 100644
--- a/aliases.txt
+++ b/aliases.txt
@@ -1 +1,5 @@
-build="docker-compose run --rm ner-gcc-arm make"
+build="docker compose run --rm ner-gcc-arm make"
+flash="probe-rs run --chip STM32F405RGTx ./build/*.elf"
+cerbcon="sudo usbip attach -r 192.168.100.12 -b 1-1.3"
+shepcon="sudo usbip attach -r 192.168.100.12 -b 1-1.4" 
+peyton="echo \" Shut the fuck up Peyton, fucking hell\" "
diff --git a/requirements.txt b/requirements.txt
index a3fac95..107e5ea 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,2 @@
 distro
 pre-commit
-docker
-docker-compose
diff --git a/setup.py b/setup.py
index 2199569..5ebc2ad 100644
--- a/setup.py
+++ b/setup.py
@@ -29,8 +29,8 @@ def check_docker_and_rust():
     if os_type == 'Windows':
         print("Windows OS detected. If on windows, you must be using cmd (not powershell!)") 
         answer = input("Are you using CMD? (yes/no): ").strip().lower()
-   	if 'y' not in answer:
-	sys.exit(1)  
+        if 'y' not in answer:
+	        sys.exit(1)  
 
 def docker_pull(image_url):
     print("Pulling Docker image...")
@@ -52,7 +52,7 @@ def load_aliases(venv_path, aliases_file):
             activate_file.write('\n# Aliases\n')
             for alias in aliases:
                 alias_name, alias_command = alias.strip().split('=', 1)
-		alias_command = alias_command.strip('"')
+                alias_command = alias_command.strip('"')
                 if os_type == 'Windows':
                     # Assuming CMD
                     activate_file.write(f'doskey {alias_name}={alias_command}\n')
@@ -147,7 +147,7 @@ def main():
     # Step 1: pull image
     answer = input("Would you like to pull the docker image? (yes/no)")
     if 'y' in answer:    
-        image_url = "docker pull ghcr.io/northeastern-electric-racing/embedded-base:main"
+        image_url = "ghcr.io/northeastern-electric-racing/embedded-base:main"
         docker_pull(image_url)
 
     os_type = platform.system()
@@ -171,16 +171,16 @@ def main():
         answer = input("Would you like to install all python packages in the venv? (yes/no)")
         if 'y' in answer:
         # Use the venv's Python
-        venv_python = os.path.join(venv_path, 'Scripts', 'python') if os_type == "Windows" else os.path.join(venv_path, 'bin', 'python')
+            venv_python = os.path.join(venv_path, 'Scripts', 'python') if os_type == "Windows" else os.path.join(venv_path, 'bin', 'python')
 
         # Step 4: Install all Python packages from requirements.txt
 
-        install_cython_and_wheel(venv_python)
-        install_pyyaml_no_build_isolation(venv_python)
-        install_requirements(venv_python)
+            #install_cython_and_wheel(venv_python)
+            #install_pyyaml_no_build_isolation(venv_python)
+            install_requirements(venv_python)
 
-        # Step 4: Run pre-commit install
-        install_precommit(venv_python)
+        # Step 5: Run pre-commit install
+            install_precommit(venv_python)
 
     answer = input("Would you like to install probe-rs? (do this manually if on a weird linux ditro!) (yes/no)")
     if 'y' in answer: