machineconfig 1.8__py3-none-any.whl → 1.91__py3-none-any.whl

machineconfig/scripts/python/repos.py

@@ -1,10 +1,14 @@
 
 """Repos
+
+# TODO use gh api user --jq '.login' to get the username and use it to clone the repos.
+in the event that username@github.com is not mentioned in the remote url.
+
 """
 
 from rich import print as pprint
 from machineconfig.utils.utils import write_shell_script, CONFIG_PATH, DEFAULTS_PATH
-from crocodile.file_management import P, install_n_import, Read, Save
+from crocodile.file_management import P, Read, Save
 from crocodile.core import randstr
 import argparse
 from dataclasses import dataclass
@@ -27,7 +31,7 @@ class RepoRecord:
     version: dict[str, str]
 
 
-def git_action(path: P, action: GitAction, mess: Optional[str] = None, r: bool = False) -> str:
+def git_action(path: P, action: GitAction, mess: Optional[str] = None, r: bool=False) -> str:
     from git.exc import InvalidGitRepositoryError
     from git.repo import Repo
     try:
@@ -53,7 +57,7 @@ git add .; git commit -am "{mess}"
         action_name = "pull" if action == GitAction.pull else "push"
         cmds = [f'echo "pulling from {remote.url}" ; git {action_name} {remote.name} {repo.active_branch.name}' for remote in repo.remotes]
         program += '\n' + '\n'.join(cmds) + '\n'
-    program = program + f'''
+    program = program + '''
 echo ""; echo ""
 '''
     return program
@@ -64,41 +68,40 @@ def main():
     # POSITIONAL
     parser.add_argument("directory", help="folder containing repos to record a json out of OR a specs json file to follow.", default="")
     # FLAGS
-    parser.add_argument("--push", help=f"push", action="store_true")
-    parser.add_argument("--pull", help=f"pull", action="store_true")
-    parser.add_argument("--commit", help=f"commit", action="store_true")
-    parser.add_argument("--all", help=f"pull, commit and push", action="store_true")
-    parser.add_argument("--record", help=f"record respos", action="store_true")
-    parser.add_argument("--clone", help=f"clone repos from record", action="store_true")
-    parser.add_argument("--checkout", help=f"Check out to versions prvided in this json file", action="store_true")
+    parser.add_argument("--push", help="push", action="store_true")
+    parser.add_argument("--pull", help="pull", action="store_true")
+    parser.add_argument("--commit", help="commit", action="store_true")
+    parser.add_argument("--all", help="pull, commit and push", action="store_true")
+    parser.add_argument("--record", help="record respos", action="store_true")
+    parser.add_argument("--clone", help="clone repos from record", action="store_true")
+    parser.add_argument("--checkout", help="Check out to versions prvided in this json file", action="store_true")
     parser.add_argument("--checkout_to_branch", help="Checkout to the main branch", action="store_true")
-    parser.add_argument("--recursive", "-r", help=f"recursive flag", action="store_true")
+    parser.add_argument("--recursive", "-r", help="recursive flag", action="store_true")
     # OPTIONAL
-    parser.add_argument("--cloud", "-c", help=f"cloud", default=None)
+    parser.add_argument("--cloud", "-c", help="cloud", default=None)
     args = parser.parse_args()
 
     if args.directory == "": repos_root = P.home().joinpath("code")  # it is a positional argument, can never be empty.
     else: repos_root = P(args.directory).expanduser().absolute()
-    _ = install_n_import("git", "gitpython")
 
     program = ""
     if args.record:
         res = record_repos(repos_root=str(repos_root))
-        pprint(f"Recorded repositories:\n", res)
+        pprint("Recorded repositories:\n", res)
         save_path = CONFIG_PATH.joinpath("repos").joinpath(repos_root.rel2home()).joinpath("repos.json")
         # Save.pickle(obj=res, path=save_path)
-        Save.json(obj=res, path=save_path)
+        Save.json(obj=res, path=save_path, indent=4)
         pprint(f"Result pickled at {P(save_path)}")
         if args.cloud is not None: P(save_path).to_cloud(rel2home=True, cloud=args.cloud)
-        program += f"""\necho '>>>>>>>>> Finished Recording'\n"""
+        program += """\necho '>>>>>>>>> Finished Recording'\n"""
     elif args.clone or args.checkout or args.checkout_to_branch:
         # preferred_remote = input("Enter preferred remote to use (default: None): ") or ""
-        program += f"""\necho '>>>>>>>>> Cloning Repos'\n"""
+        program += """\necho '>>>>>>>>> Cloning Repos'\n"""
         if not repos_root.exists() or repos_root.stem != 'repos.json':  # user didn't pass absolute path to pickle file, but rather expected it to be in the default save location
             repos_root = CONFIG_PATH.joinpath("repos").joinpath(repos_root.rel2home()).joinpath("repos.json")
             if not repos_root.exists():
                 if args.cloud is None:
-                    cloud: str = Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
+                    cloud: str=Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
                     print(f"⚠️ Using default cloud: {cloud}")
                 else:
                     cloud = args.cloud
@@ -118,7 +121,7 @@ def main():
     write_shell_script(program, "Script to update repos")
 
 
-def record_repos(repos_root: str, r: bool = True) -> list[dict[str, Any]]:
+def record_repos(repos_root: str, r: bool=True) -> list[dict[str, Any]]:
     path_obj = P(repos_root).expanduser().absolute()
     if path_obj.is_file(): return []
     search_res = path_obj.search("*", files=False)
@@ -131,7 +134,7 @@ def record_repos(repos_root: str, r: bool = True) -> list[dict[str, Any]]:
     return res
 
 
-def record_a_repo(path: P, search_parent_directories: bool = False, preferred_remote: Optional[str] = None):
+def record_a_repo(path: P, search_parent_directories: bool=False, preferred_remote: Optional[str] = None):
     from git.repo import Repo
     repo = Repo(path, search_parent_directories=search_parent_directories)  # get list of remotes using git python
     repo_root = P(repo.working_dir).absolute()
@@ -156,7 +159,7 @@ def record_a_repo(path: P, search_parent_directories: bool = False, preferred_re
     return res
 
 
-def install_repos(specs_path: str, clone: bool = True, checkout_to_recorded_commit: bool = False, checkout_to_branch: bool = False, editable_install: bool = False, preferred_remote: Optional[str] = None):
+def install_repos(specs_path: str, clone: bool=True, checkout_to_recorded_commit: bool=False, checkout_to_branch: bool=False, editable_install: bool=False, preferred_remote: Optional[str] = None):
     program = ""
     path_obj = P(specs_path).expanduser().absolute()
     repos: list[dict[str, Any]] = Read.json(path_obj)
@@ -168,7 +171,7 @@ def install_repos(specs_path: str, clone: bool = True, checkout_to_recorded_comm
                     if preferred_remote is not None:
                         if preferred_remote in repo["remotes"]:
                             remote_name = preferred_remote
-                            remote_url: str = repo["remotes"][preferred_remote]
+                            remote_url = repo["remotes"][preferred_remote]
                         else:
                             print(f"⚠️ `{preferred_remote=}` not found in {repo['remotes']}.")
                             # preferred_remote = None
@@ -185,7 +188,7 @@ def install_repos(specs_path: str, clone: bool = True, checkout_to_recorded_comm
                 program += f"\ncd {parent_dir.collapseuser().as_posix()}/{repo['name']}; git checkout {repo['current_branch']}"
                 break
             if editable_install and idx == 0:
-                program += f"\ncd {parent_dir.collapseuser().as_posix()}/{repo['name']}; pip install -e ."
+                program += f"\ncd {parent_dir.collapseuser().as_posix()}/{repo['name']}; uv pip install -e ."
         program += "\n"
     pprint(program)
     return program

machineconfig/scripts/python/scheduler.py

@@ -45,7 +45,7 @@ def main_parse():
         print(f"✅ Task {task_name} created in {task_root}. Head there and edit the config.ini file & task.py file.")
         return None
 
-    main(root=root.str, ignore_conditions=args.ignore_conditions)
+    main(root=root.to_str(), ignore_conditions=args.ignore_conditions)
 
 
 if __name__ == "__main__":

machineconfig/scripts/python/start_slidev.py

@@ -16,7 +16,7 @@ PORT_DEFAULT = 3030
 SLIDEV_REPO = CONFIG_PATH.joinpath(".cache/slidev")
 if not SLIDEV_REPO.joinpath("components").exists():
     # assert slidev is installed first
-    Terminal(stderr=subprocess.PIPE, stdin=subprocess.PIPE, stdout=subprocess.PIPE).run(f"cd {SLIDEV_REPO.parent};npm init slidev")
+    Terminal(stderr=subprocess.PIPE, stdin=subprocess.PIPE, stdout=subprocess.PIPE).run(f"cd {SLIDEV_REPO.parent};npm init slidev@latest")
 
 
 def jupyter_to_markdown(file: P):
@@ -55,10 +55,11 @@ def main() -> None:
     parser = argparse.ArgumentParser()
     parser.add_argument("-d", "--directory", default=None, help="Directory of the report")
     parser.add_argument("-j", "--jupyter-file", default=None, help="Jupyter notebook file to convert to slides. If not provided, slides.md is used.")
-    parser.add_argument("--port", default=PORT_DEFAULT, help=f"Port to serve the report, default to {PORT_DEFAULT}")
+    # parser.add_argument("--port", default=PORT_DEFAULT, help=f"Port to serve the report, default to {PORT_DEFAULT}")
     args = parser.parse_args()
 
-    port = args.port
+    # port = args.port
+    port = PORT_DEFAULT
 
     if args.jupyter_file is not None:
         report_dir = jupyter_to_markdown(P(args.jupyter_file))
@@ -95,7 +96,12 @@ def main() -> None:
     print(f"Presentation is served at http://{platform.node()}:{port}")
     print(f"Presentation is served at http://localhost:{port}")
     print(f"Presentation is served at http://{local_ip_v4}:{port}")
-    program: str = f"cd {SLIDEV_REPO}; slidev --port {port} --remote 0.0.0.0; cd {P.cwd()}"
+    # This version requires a globally installed cli of slidev, which is not recommended.
+    # program: str=f"cd {SLIDEV_REPO}; slidev --port {port} --remote 0.0.0.0; cd {P.cwd()}"
+
+    # The recommended approach is do `npm init slidev@latest` in the directory where you want to create the presentation
+    # Then you can do the following:
+    program = "npm run dev slides.md -- --remote"
     PROGRAM_PATH.write_text(program)
     print_code(program, lexer="bash")
 

machineconfig/scripts/python/start_terminals.py

@@ -2,14 +2,14 @@
 """Script to start terminals on windows and wsl
 """
 
-from machineconfig.utils.utils import PROGRAM_PATH, display_options, install_n_import, get_ssh_hosts, platform
+from machineconfig.utils.utils import PROGRAM_PATH, display_options, get_ssh_hosts, platform
 from itertools import cycle
 from typing import Literal
 
 
 COLOR_SCHEMES = ["Campbell", "Campbell Powershell", "Solarized Dark", "Ubuntu-ColorScheme", "Retro"]
 THEMES_ITER = cycle(COLOR_SCHEMES)
-INIT_COMMANDS = ["ls", "lf", "cpufetch", "neofetch", "btm"]
+INIT_COMMANDS = ["ls", "lf", "cpufetch", "fastfetch", "btm"]
 INIT_COMMANDS_ITER = cycle(INIT_COMMANDS)
 SIZE_ITER = cycle([0.6, 0.4, 0.3])
 ORIENTATION = ["vertical", "horizontal"]
@@ -22,14 +22,14 @@ THIS_MACHINE_HOSTNAME = platform.node()
 THIS_MACHINE_HOSTNAME_WSL = f"{THIS_MACHINE_HOSTNAME}wsl"
 
 
-def main_windows_and_wsl(window: int, hosts: list[str], orientation: ORIENTATION_TYPE = "vertical", mprocs: bool = False):
+def main_windows_and_wsl(window: int, hosts: list[str], orientation: ORIENTATION_TYPE = "vertical", mprocs: bool=False):
     orientation_oposite = "horizontal" if orientation == "vertical" else "vertical"
     orientation_swap                = "up" if orientation         == "horizontal" else "left"
     orientation_opposite_move_focus = "up" if orientation_oposite == "horizontal" else "left"
     orientation_opposite_move_focus_other = "down" if orientation_oposite == "horizontal" else "right"
     sleep = 3
     sep = f"\nsleep {sleep}; wt --window {window}"  # or '`;'
-    ssh_cmd = f"-t 'mprocs'" if mprocs else ''  # 'wsl_ssh_windows_port_forwarding.ps1'
+    ssh_cmd = "-t 'mprocs'" if mprocs else ''  # 'wsl_ssh_windows_port_forwarding.ps1'
     split_per_machine = 1 / len(hosts)
     size = 0.3
     known_hosts = get_ssh_hosts()
@@ -89,7 +89,8 @@ def main():
         cmd = main_windows_and_wsl(window=args.window, hosts=hosts, orientation="vertical" if args.vertical else "horizontal")
 
     print(cmd)
-    install_n_import("clipboard").copy(cmd)
+    # import clipboard
+    # install_n_import("clipboard").copy(cmd)
     PROGRAM_PATH.write_text(cmd)
 
 

machineconfig/scripts/python/wifi_conn.py

@@ -1,50 +1,44 @@
-
 """Wifi connect
+
+sudo apt-get install network-manager
+
 """
 
 import argparse
 import configparser
 from pathlib import Path
-# import random
-# import string
 import os
-
+import platform
+import subprocess
 
 def create_new_connection(name: str, ssid: str, password: str):
-    config = """<?xml version=\"1.0\"?>
-<WLANProfile xmlns="http://www.microsoft.com/networking/WLAN/profile/v1">
-    <name>""" + name + """</name>
-    <SSIDConfig>
-        <SSID>
-            <name>""" + ssid + """</name>
-        </SSID>
-    </SSIDConfig>
-    <connectionType>ESS</connectionType>
-    <connectionMode>auto</connectionMode>
-    <MSM>
-        <security>
-            <authEncryption>
-                <authentication>WPA2PSK</authentication>
-                <encryption>AES</encryption>
-                <useOneX>false</useOneX>
-            </authEncryption>
-            <sharedKey>
-                <keyType>passPhrase</keyType>
-                <protected>false</protected>
-                <keyMaterial>""" + password + """</keyMaterial>
-            </sharedKey>
-        </security>
-    </MSM>
-</WLANProfile>"""
-    command = "netsh wlan add profile filename=\"" + name + ".xml\"" + " interface=Wi-Fi"
-    with open(name + ".xml", mode='w', encoding="utf-8") as file: file.write(config)
-    os.system(command)
-
+    if platform.system() == "Windows":
+        config = """<?xml version=\"1.0\"?>
+        // ...existing XML config...
+        """
+        command = "netsh wlan add profile filename=\"" + name + ".xml\"" + " interface=Wi-Fi"
+        with open(name + ".xml", mode='w', encoding="utf-8") as file:
+            file.write(config)
+        os.system(command)
+    elif platform.system() == "Linux":
+        # Use nmcli to add/update connection
+        command = f"nmcli connection add type wifi con-name '{name}' ssid '{ssid}' wifi-sec.key-mgmt wpa-psk wifi-sec.psk '{password}'"
+        subprocess.run(command, shell=True, check=True)
 
 def connect(name: str, ssid: str):
-    command = "netsh wlan connect name=\"" + name + "\" ssid=\"" + ssid + "\" interface=Wi-Fi"
-    os.system(command)
-def display_available_networks(): os.system("netsh wlan show networks interface=Wi-Fi")  #
+    if platform.system() == "Windows":
+        command = "netsh wlan connect name=\"" + name + "\" ssid=\"" + ssid + "\" interface=Wi-Fi"
+        os.system(command)
+    elif platform.system() == "Linux":
+        command = f"nmcli connection up '{name}'"
+        subprocess.run(command, shell=True, check=True)
+
+
+def display_available_networks():
+    if platform.system() == "Windows":
+        os.system("netsh wlan show networks interface=Wi-Fi")
+    elif platform.system() == "Linux":
+        subprocess.run("nmcli device wifi list", shell=True, check=True)
 
 
 def main():
@@ -52,20 +46,18 @@ def main():
     creds.read(Path.home().joinpath('dotfiles/machineconfig/setup/wifi.ini'))
 
     parser = argparse.ArgumentParser(description='Wifi Connector')
-    parser.add_argument('-n', "--ssid", help=f"SSID of Wifi", default='MyPhoneHotSpot')
+    parser.add_argument('-n', "--ssid", help="SSID of Wifi", default='MyPhoneHotSpot')
 
     args = parser.parse_args()
     ssid = creds[args.ssid]['SSID']
-    # pwd = creds[args.ssid]['pwd']
+    password = creds[args.ssid]['pwd']  # You'll need the password for Linux connections
 
-    # displayAvailableNetworks()
-    # createNewConnection(name, name, password)
+    # Create and connect to the network
+    create_new_connection(ssid, ssid, password)
     connect(ssid, ssid)
 
 
 def get_current_wifi_name() -> str:
-    import subprocess
-    import platform
     if platform.system() == "Windows":
         try:
             cmd_output = subprocess.check_output(["netsh", "wlan", "show", "interface"], shell=True).decode("utf-8")

machineconfig/scripts/python/wsl_windows_transfer.py

@@ -28,7 +28,7 @@ Otherwise, a flag must be raised to indicate the direction.""")
     path = P(args.path).expanduser().absolute()
 
     if args.same_file_system:
-        print(f"💥 Using a not recommended transfer method! Copying same files across different file systems.")
+        print("💥 Using a not recommended transfer method! Copying same files across different file systems.")
         if system == "Windows":  # move files over to WSL
             path.copy(folder=WSL_FROM_WIN.joinpath(UserName).joinpath(path.rel2home().parent), overwrite=True)  # the following works for files and folders alike.
         else:  # move files from WSL to win

machineconfig/setup_windows/wt_and_pwsh/set_pwsh_theme.py

@@ -32,7 +32,7 @@ def install_nerd_fonts():
     folder.search("*readme*").apply(lambda p: p.delete(sure=True))
     folder.search("*LICENSE*").apply(lambda p: p.delete(sure=True))
     file = P.tmpfile(suffix=".ps1").write_text(LIBRARY_ROOT.joinpath("setup_windows/wt_and_pwsh/install_fonts.ps1").read_text().replace(r".\fonts-to-be-installed", str(folder)))
-    subprocess.run(rf"powershell.exe -executionpolicy Bypass -nologo -noninteractive -File {file.str}", check=True)
+    subprocess.run(rf"powershell.exe -executionpolicy Bypass -nologo -noninteractive -File {file.to_str()}", check=True)
     folder.delete(sure=True)
 
 

machineconfig/setup_windows/wt_and_pwsh/set_wt_settings.py

@@ -52,7 +52,7 @@ class TerminalSettings(object):
 
     # 1- Customizing Powershell========================================================
     # as opposed to Windows Powershell
-    def customize_powershell(self, nerd_font: bool = True):
+    def customize_powershell(self, nerd_font: bool=True):
         pwsh: dict[str, Any] = dict(name="PowerShell",
                                     commandline="pwsh",
                                     hidden=False,
@@ -65,7 +65,8 @@ class TerminalSettings(object):
             if item["name"] == "PowerShell":
                 self.profs.list[idx].update(pwsh)
                 break
-        else: print(f"Couldn't customize powershell because profile not found, try to install it first.")
+        else:
+            print("Couldn't customize powershell because profile not found, try to install it first.")
 
     def make_powershell_default_profile(self):
         for profile in self.profs: