Merge task files

diff --git a/files/pc/tasks.py b/files/pc/tasks.py
index ef2caee7ed436028ccfd44829ec1c349280df94a..6e145b8c0f478d8eaeff121519afca600b032c18 100644 (file)
--- a/files/pc/tasks.py
+++ b/files/pc/tasks.py
@@ -1,5 +1,3 @@
-
-
 # This file is meant to sit in ~ for use from all shells.
 from invoke import task
 
@@ -8,8 +6,12 @@ import os
 
 HOME = os.path.expanduser('~')
 TODAY = dt.now().strftime('%Y.%m.%d')
-
 KIDS_ALLOWANCE_URL=os.environ.get('KIDS_ALLOWANCE_URL')
+PAYROLL = os.environ.get('PAYROLL')
+BUDGET_URL = os.environ.get('BUDGET_URL')
+CU_URL = os.environ.get('CU_URL')
+SCHOOL = f"{HOME}/School"
+PAYROLL = f"{HOME}/Nanny.Payroll"
 
 def browse(c, url):
     c.run(f"librefox {url}", asynchronous=True)
@@ -28,37 +30,109 @@ def debug(c):
     result = c.run('which minetest')
     print(result.ok)
 
-PAYROLL = f"{HOME}/Nanny.Payroll"
 
 @task
-def folder_payroll(c):
-    code(c, f"{HOME}/Nanny.Payroll")
+def fix_mouse(c):
+    c.run('xinput --disable 18')
+    c.run('xinput --enable 18')
+
+
+@task
+def fix_invoke_complete(c):
+    c.run('invoke --print-completion-script bash > ~/.invoke-complete.sh')
+
+@task
+def temp(c):
+    c.run('sensors')
+
+
+
+def term(c, path):
+    c.run(f'konsole --separate --workdir {path}', asynchronous=True)
+
+def browse(c, url):
+    c.run(f"librewolf {url}", asynchronous=True)
+
+
+def code(c, path):
+    c.run(f"codium {path}")
+
+
+def folder(c, path):
+    c.run(f'dolphin {path}', asynchronous=True)
+    # c.run(f"nemo {path}")
+
+
+@task
+def debug(c):
+    result = c.run('which minetest')
+    print(result.ok)
+
 
 @task
-def folder_allowance(c):
+def allowance(c):
     browse(c, KIDS_ALLOWANCE_URL)
 
 
-@task(folder_payroll)
+@task
 def payroll(c):
 
+    allowance(c)
+
     # For copying the latest file in
     folder(c, f"{HOME}/pixel7adocuments")
-    folder(c, f"{HOME}/Nanny.Payroll/data/payroll_inbox")
+    folder(c, f"{PAYROLL}/data/payroll_inbox")
+
+    # For editing files
+    folder_payroll(c)
+    payroll_jupyter(c)
+
+@task
+def payroll_jupyter(c):
 
     # For running the payroll scripts
-    c.run(f"cd {PAYROLL};{HOME}/envs/jupyter/bin/jupyter lab")
+    c.run(f"cd {PAYROLL};{HOME}/envs/jupyter/bin/jupyter-lab")
 
 @task
-def fix_mouse(c):
-    c.run('xinput --disable 18')
-    c.run('xinput --enable 18')
+def folder_payroll(c):
+    code(c, f"{PAYROLL}")
 
 
+@task()
+def screenshare(c):
+    browse(c, 'https://app.screego.net/#/')
+    c.run('dino')
+
 @task
-def fix_invoke_complete(c):
-    c.run('invoke --print-completion-script bash > ~/.invoke-complete.sh')
+def show_free_space(c):
+    c.run('df -h | grep G')  # We only care about disks measured in G
+
+@task()
+def free_disk_space(c, ruthless=False):
+    show_free_space(c)
+    c.run('podman container cleanup --all --rm')
+    # Dolphin Trash ...should regenerate
+    c.run(f'sudo rm -rf {HOME}/.local/share/Trash')
+    # c.run(f'rm {HOME}/Downloads/*.iso')
+    c.run('sudo apt-get autoclean') # Remove useless apt cache
+    if ruthless:
+        c.run(f'rm -rf {HOME}/Downloads/*')
+        c.run('sudo apt-get clean') # Remove all apt cache
+    show_free_space(c)
 
 @task
-def temp(c):
-    c.run('sensors')
+def assign_school(c):
+    term(c, f'{SCHOOL}')
+
+@task
+def mod_luanti(c):
+    print("https://rubenwardy.com/minetest_modding_book/en/quality/luacheck.html")
+    term(c, f'{HOME}/.var/app/net.minetest.Minetest/.minetest')
+
+
+@task
+def budget(c):
+    browse(c, BUDGET_URL)
+    browse(c, CU_URL)
+
+

diff --git a/files/tab/tasks.py b/files/tab/tasks.py
deleted file mode 100644 (file)
index b099140..0000000
--- a/files/tab/tasks.py
+++ /dev/null
@@ -1,108 +0,0 @@
-# This file is meant to sit in ~ for use from all shells.
-from invoke import task
-
-from datetime import datetime as dt
-import os
-
-HOME = os.path.expanduser('~')
-TODAY = dt.now().strftime('%Y.%m.%d')
-
-KIDS_ALLOWANCE_URL=os.environ.get('KIDS_CASH_URL')
-PAYROLL = os.environ.get('PAYROLL')
-BUDGET_URL = os.environ.get('BUDGET_URL')
-CU_URL = os.environ.get('CU_URL')
-
-def term(c, path):
-    c.run(f'konsole --separate --workdir {path}', asynchronous=True)
-
-def browse(c, url):
-    c.run(f"librewolf {url}", asynchronous=True)
-
-
-def code(c, path):
-    c.run(f"codium {path}")
-
-
-def folder(c, path):
-    c.run(f'dolphin {path}', asynchronous=True)
-    # c.run(f"nemo {path}")
-
-
-@task
-def debug(c):
-    result = c.run('which minetest')
-    print(result.ok)
-
-
-@task
-def allowance(c):
-    browse(c, KIDS_ALLOWANCE_URL)
-
-
-
-@task
-def payroll(c):
-
-    allowance(c)
-
-    # For copying the latest file in
-    folder(c, f"{HOME}/pixel7adocuments")
-    folder(c, f"{PAYROLL}/data/payroll_inbox")
-
-    # For editing files
-    code(c, f"{PAYROLL}")
-
-    payroll_jupyter(c)
-
-@task
-def payroll_jupyter(c):
-
-    # For running the payroll scripts
-    c.run(f"cd {PAYROLL};{HOME}/envs/jupyter/bin/jupyter-lab")
-
-
-@task()
-def screenshare(c):
-
-    browse(c, 'https://app.screego.net/#/')
-    c.run('dino')
-
-@task
-def show_free_space(c):
-    c.run('df -h | grep G')  # We only care about disks measured in G
-
-@task()
-def free_disk_space(c, ruthless=False):
-    show_free_space(c)
-    c.run('podman container cleanup --all --rm')
-    # Dolphin Trash ...should regenerate
-    c.run(f'sudo rm -rf {HOME}/.local/share/Trash')
-    # c.run(f'rm {HOME}/Downloads/*.iso')
-    c.run('sudo apt-get autoclean') # Remove useless apt cache
-    if ruthless:
-        c.run(f'rm -rf {HOME}/Downloads/*')
-        c.run('sudo apt-get clean') # Remove all apt cache
-    show_free_space(c)
-
-
-
-
-SCHOOL = f"{HOME}/School"
-
-@task
-def assign_school(c):
-    term(c, f'{SCHOOL}')
-    # c.run(f"cd {SCHOOL};{HOME}/envs/jupyter/bin/jupyter lab", asynchronous=True)
-
-
-@task
-def mod_luanti(c):
-    print("https://rubenwardy.com/minetest_modding_book/en/quality/luacheck.html")
-    term(c, f'{HOME}/.var/app/net.minetest.Minetest/.minetest')
-
-
-@task
-def budget(c):
-    browse(c, BUDGET_URL)
-    browse(c, CU_URL)
-