machineconfig 1.7__tar.gz → 1.8__tar.gz

{machineconfig-1.7/src/machineconfig.egg-info → machineconfig-1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: machineconfig
-Version: 1.7
+Version: 1.8
 Summary: Dotfiles management package
 Home-page: https://github.com/thisismygitrepo/machineconfig
 Author: Alex Al-Saffar
@@ -52,7 +52,7 @@ Invoke-WebRequest https://raw.githubusercontent.com/thisismygitrepo/machineconfi
 Invoke-WebRequest https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/ve.ps1 | Invoke-Expression
 # dev repos  # short `(iwr bit.ly/cfgreposwindows).Content | iex` OR `curl bit.ly/cfgreposwindows -L | iex`
 Invoke-WebRequest https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/repos.ps1 | Invoke-Expression
-# symlinks: locally, run: `ftpsx username@hostname[:port] ~/dotfiles -z`, then, on the remote:
+# symlinks # short `curl bit.ly/cfgsymlinkswindows -L | iex` OR `(iwr bit.ly/cfgsymlinkswindows).Content | iex`
 . ~/code/machineconfig/src/machineconfig/setup_windows/symlinks.ps1
 # devapps:
 ~/code/machineconfig/src/machineconfig/setup_windows/devapps.ps1
@@ -88,21 +88,21 @@ short: `curl bit.ly/cfgcroshellwindows -L | iex` OR `(iwr bit.ly/cfgcroshellwind
 # Linux Setup
 With `sudo` access, run the following: (short `curl bit.ly/cfgalllinux -L | bash`)
 ```bash
-# export package_manager="apt"
-# export package_manager="nix"
+export package_manager="apt"
+export package_manager="nix"
 
 # apps  # short: `curl bit.ly/cfgappslinux -L | bash`
 curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/apps.sh | bash
 # Optionally: curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/apps_dev.sh | bash
+
 # virtual enviornment  # short `curl bit.ly/cfgvelinux -L | bash`
 curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/ve.sh | bash
+
 # repos  # short `curl bit.ly/cfgreposlinux -L | bash`
 curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/repos.sh | bash
-# symlinks and bash profile.
-
-# locally, run: `ftpsx username@hostname[:port] ~/dotfiles -z`
-# for wsl: wsl_server.ps1; ftpsx $env:USERNAME@localhost:2222 ~/dotfiles -z # OR: ln -s /mnt/c/Users/$(whoami)/dotfiles ~/dotfiles
+# symlinks and bash profile: # short `curl bit.ly/cfgsymlinkslinux -L | bash`
 source ~/code/machineconfig/src/machineconfig/setup_linux/symlinks.sh  # requires sudo since it invloves chmod of dotfiles/.ssh, however sudo doesn't work with source. best to have sudo -s earlier.
+
 # devapps
 source <(sudo cat ~/code/machineconfig/src/machineconfig/setup_linux/devapps.sh)
 ```

{machineconfig-1.7 → machineconfig-1.8}/README.md

@@ -38,7 +38,7 @@ Invoke-WebRequest https://raw.githubusercontent.com/thisismygitrepo/machineconfi
 Invoke-WebRequest https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/ve.ps1 | Invoke-Expression
 # dev repos  # short `(iwr bit.ly/cfgreposwindows).Content | iex` OR `curl bit.ly/cfgreposwindows -L | iex`
 Invoke-WebRequest https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/repos.ps1 | Invoke-Expression
-# symlinks: locally, run: `ftpsx username@hostname[:port] ~/dotfiles -z`, then, on the remote:
+# symlinks # short `curl bit.ly/cfgsymlinkswindows -L | iex` OR `(iwr bit.ly/cfgsymlinkswindows).Content | iex`
 . ~/code/machineconfig/src/machineconfig/setup_windows/symlinks.ps1
 # devapps:
 ~/code/machineconfig/src/machineconfig/setup_windows/devapps.ps1
@@ -74,21 +74,21 @@ short: `curl bit.ly/cfgcroshellwindows -L | iex` OR `(iwr bit.ly/cfgcroshellwind
 # Linux Setup
 With `sudo` access, run the following: (short `curl bit.ly/cfgalllinux -L | bash`)
 ```bash
-# export package_manager="apt"
-# export package_manager="nix"
+export package_manager="apt"
+export package_manager="nix"
 
 # apps  # short: `curl bit.ly/cfgappslinux -L | bash`
 curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/apps.sh | bash
 # Optionally: curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/apps_dev.sh | bash
+
 # virtual enviornment  # short `curl bit.ly/cfgvelinux -L | bash`
 curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/ve.sh | bash
+
 # repos  # short `curl bit.ly/cfgreposlinux -L | bash`
 curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/repos.sh | bash
-# symlinks and bash profile.
-
-# locally, run: `ftpsx username@hostname[:port] ~/dotfiles -z`
-# for wsl: wsl_server.ps1; ftpsx $env:USERNAME@localhost:2222 ~/dotfiles -z # OR: ln -s /mnt/c/Users/$(whoami)/dotfiles ~/dotfiles
+# symlinks and bash profile: # short `curl bit.ly/cfgsymlinkslinux -L | bash`
 source ~/code/machineconfig/src/machineconfig/setup_linux/symlinks.sh  # requires sudo since it invloves chmod of dotfiles/.ssh, however sudo doesn't work with source. best to have sudo -s earlier.
+
 # devapps
 source <(sudo cat ~/code/machineconfig/src/machineconfig/setup_linux/devapps.sh)
 ```

machineconfig-1.8/src/machineconfig/__init__.py

@@ -0,0 +1,8 @@
+
+"""DS
+"""
+
+__version__ = "1.8"
+release_notes = """
+enhanced ve management
+"""

{machineconfig-1.7 → machineconfig-1.8}/src/machineconfig/jobs/python/check_installations.py

@@ -2,7 +2,7 @@
 """CI
 """
 
-import crocodile.toolbox as tb
+
 import time
 import pandas as pd
 import platform
@@ -10,18 +10,21 @@ from rich.console import Console
 # from rich.progress import track
 from machineconfig.utils.utils import LIBRARY_ROOT, INSTALL_VERSION_ROOT
 from machineconfig.utils.installer import get_installed_cli_apps
+from crocodile.core import List as L, install_n_import, Struct
+from crocodile.file_management import P
+from crocodile.meta import Terminal
 from tqdm import tqdm
 from typing import Optional
 
 
 APP_SUMMARY_PATH = LIBRARY_ROOT.joinpath(f"profile/records/{platform.system().lower()}/apps_summary_report.csv")
-CLOUD: str = "gdw"  # tb.Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
+CLOUD: str = "gdw"  # Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
 # my onedrive doesn't allow sharing.
 
 
-def scan(path: tb.P, pct: float = 0.0):
-    vt = tb.install_n_import(library="vt", package="vt-py")
-    client = vt.Client(tb.P.home().joinpath("dotfiles/creds/tokens/virustotal").read_text().split("\n")[0])
+def scan(path: P, pct: float = 0.0):
+    vt = install_n_import(library="vt", package="vt-py")
+    client = vt.Client(P.home().joinpath("dotfiles/creds/tokens/virustotal").read_text().split("\n")[0])
     console = Console()
     console.rule(f"Scanning {path}. {pct:.2f}% done")
     if path.is_dir():
@@ -34,7 +37,6 @@ def scan(path: tb.P, pct: float = 0.0):
         with console.status(f"waiting for scan of {path} ... "):
             try:
                 anal = client.get_object("/analyses/{}", analysis.id)
-                # print(anal.status)
                 if anal.status == "completed": break
             except Exception as ex:  # type: ignore
                 repeat_counter += 1
@@ -42,33 +44,37 @@ def scan(path: tb.P, pct: float = 0.0):
                     raise ValueError(f"Error in scanning {path}") from ex
                 print(f"Error in scanning, trying again.")
             time.sleep(30)
-    df = pd.DataFrame(anal.results).T
+    df = pd.DataFrame(anal.results.values())
     malicious = []
     for _idx, row in df.iterrows():
+        # try:
+        #     print(row.result)
+        # except Exception as ex:  # type: ignore
+        #     print(row)
         if row.result is None and row.category in ["undetected", "type-unsupported", "failure", "timeout", "confirmed-timeout"]: continue
         else:
-            tb.Struct(row.to_dict()).print(as_config=True, title=f"Found Category {row.category}")
+            Struct(row.to_dict()).print(as_config=True, title=f"Found Category {row.category}")
             malicious.append(row)
-    positive_pct = round(len(malicious) / len(df) * 100, 1)
+    positive_pct: float = round(number=len(malicious) / len(df) * 100, ndigits=1)
     print(f"positive_ratio = {positive_pct:.1f} %")
     return positive_pct, df
 
 
 def main() -> None:
-    apps_paths_tmp: tb.List[tb.P] = get_installed_cli_apps()
-    versions_files_paths: tb.L[tb.P] = INSTALL_VERSION_ROOT.search()
+    apps_paths_tmp: L[P] = get_installed_cli_apps()
+    versions_files_paths: L[P] = INSTALL_VERSION_ROOT.search()
     app_versions: list[Optional[str]] = []
-    apps_paths_raw: tb.L[tb.P] = tb.L([])
-    for an_app in versions_files_paths:
-        exe_path = apps_paths_tmp.filter(lambda x: x.stem == an_app.stem)
-        if len(exe_path) == 1:
-            app_versions.append(an_app.read_text())
-            apps_paths_raw.append(exe_path.list[0])
+    apps_paths_raw: L[P] = L([])
+    for an_app in apps_paths_tmp:
+        version_path = versions_files_paths.filter(lambda x: x.stem == an_app.stem)
+        if len(version_path) == 1:
+            app_versions.append(version_path.list[0].read_text())
+            apps_paths_raw.append(an_app)
         # if an_app.stem in versions_files_paths.stem:
         #     app_versions.append(versions_files_paths.filter(lambda x: x.stem == an_app.stem.replace(".exe", "")).list[0].read_text())
         # else:
         #     print(f"🤔 Cloud not find a documented version for installation of {an_app.stem}, trying to get it from the app itself.")
-        #     tmp = tb.Terminal().run(f"{an_app.stem} --version", shell="powershell").capture().op_if_successfull_or_default(strict_err=False, strict_returcode=False)
+        #     tmp = Terminal().run(f"{an_app.stem} --version", shell="powershell").capture().op_if_successfull_or_default(strict_err=False, strict_returcode=False)
         #     if tmp is not None: tmp = tmp.split("\n")[0]
         #     print(f"➡️ Found version `{tmp}` for {an_app.stem}.")
         #     app_versions.append(None)
@@ -94,8 +100,8 @@ def main() -> None:
 
     app_url: list[Optional[str]] = []
     for idx, row in tqdm(res_df.iterrows(), total=res_df.shape[0]):
-        apps_safe_url = upload(tb.P(str(row["app_path"])).expanduser())
-        app_url.append(apps_safe_url.as_posix() if type(apps_safe_url) is tb.P else apps_safe_url)
+        apps_safe_url = upload(P(str(row["app_path"])).expanduser())
+        app_url.append(apps_safe_url.as_posix() if type(apps_safe_url) is P else apps_safe_url)
     res_df["app_url"] = app_url
     res_df.to_csv(APP_SUMMARY_PATH.with_suffix(".csv").create(parents_only=True), index=False)
     APP_SUMMARY_PATH.with_suffix(".md").write_text(res_df.to_markdown())
@@ -103,8 +109,8 @@ def main() -> None:
     print(res_df)
 
 
-def upload(path: tb.P):
-    set_time_out = tb.install_n_import("call_function_with_timeout").SetTimeout
+def upload(path: P):
+    set_time_out = install_n_import("call_function_with_timeout").SetTimeout
     func_with_timeout = set_time_out(lambda: path.to_cloud(CLOUD, rel2home=True, share=True, os_specific=True), timeout=180)
     is_done, _is_timeout, _erro_message, results = func_with_timeout()
     if is_done: return results
@@ -113,17 +119,17 @@ def upload(path: tb.P):
 
 class PrecheckedCloudInstaller:
     def __init__(self):
-        tb.install_n_import("gdown")
+        install_n_import("gdown")
         self.df = pd.read_csv(APP_SUMMARY_PATH)
 
     @staticmethod
     def download_google_links(url: str):
         # if "drive.google.com" in str(url): url = str(url).replace("open?", "uc?")
         # else: raise NotImplementedError("Only google drive is supported for now.")
-        # return tb.P(url).download(name=name)
-        gdrive_id = tb.P(url).parts[-1].split("id=")[1]
-        gdown = tb.install_n_import("gdown")
-        result = tb.P(gdown.download(id=gdrive_id)).absolute()
+        # return P(url).download(name=name)
+        gdrive_id = P(url).parts[-1].split("id=")[1]
+        gdown = install_n_import("gdown")
+        result = P(gdown.download(id=gdrive_id)).absolute()
         return result
 
     @staticmethod
@@ -134,10 +140,10 @@ class PrecheckedCloudInstaller:
             print(f"Error in downloading {app_url} {ex}")
             return None
         if platform.system().lower() == "linux":
-            tb.Terminal().run(f"chmod +x {exe}")
-            tb.Terminal().run(f"mv {exe} /usr/local/bin/")
+            Terminal().run(f"chmod +x {exe}")
+            Terminal().run(f"mv {exe} /usr/local/bin/")
         elif platform.system().lower() == "windows":
-            exe.move(folder=tb.P.home().joinpath("AppData/Local/Microsoft/WindowsApps"), overwrite=True)
+            exe.move(folder=P.home().joinpath("AppData/Local/Microsoft/WindowsApps"), overwrite=True)
         return True
 
     def download_safe_apps(self, name: str = "AllEssentials"):
@@ -152,7 +158,7 @@ class PrecheckedCloudInstaller:
         if name == "AllEssentials":
             print(f"Downloading {self.df.shape[0]} apps ...")
             print(self.df)
-            _res = tb.L(self.df.app_url).apply(PrecheckedCloudInstaller.install_cli_apps, jobs=20)
+            _res = L(self.df.app_url).apply(PrecheckedCloudInstaller.install_cli_apps, jobs=20)
         else:
             app_url = self.df[self.df.app_name == name].iloc[0].app_url
             _res = PrecheckedCloudInstaller.install_cli_apps(app_url=app_url)

machineconfig-1.8/src/machineconfig/jobs/python/create_bootable_media.py

@@ -0,0 +1,14 @@
+
+
+# 
+
+# # one can either install rufus: https://rufus.ie/en/
+# # however, to create bootable media with multiple OSs to choose from:
+
+# P(r'https://github.com/ventoy/Ventoy/archive/refs/tags/v1.0.78.zip').download().unzip().search[0]()
+# P(r'https://mirrors.layeronline.com/linuxmint/stable/21/linuxmint-21-cinnamon-64bit.iso').download(folder=P.home().joinpath("Downloads/os").create())
+# P(r'https://download.manjaro.org/kde/21.3.7/manjaro-kde-21.3.7-minimal-220816-linux515.iso').download(folder=P.home().joinpath("Downloads/os").create())
+
+
+# if __name__ == '__main__':
+#     pass

{machineconfig-1.7 → machineconfig-1.8}/src/machineconfig/jobs/python/create_zellij_template.py

@@ -1,9 +1,10 @@
 
 """ZT
 """
-import crocodile.toolbox as tb
+
 import socket
 from machineconfig.utils.utils import choose_ssh_host, write_shell_script
+from crocodile.file_management import P
 
 prefix = """
 
@@ -41,7 +42,7 @@ def build_template(tabs: list[str]):
     for t in tabs:
         res += tab.replace("TABNAME", t).replace("TABCOMMAND", f"ssh").replace("TABARGS", t)
     res += suffix.replace("THISMACHINE", socket.gethostname())
-    file = tb.P.tmp().joinpath(f"tmp_files/templates/zellij_template.kdl").create(parents_only=True).write_text(res)
+    file = P.tmp().joinpath(f"tmp_files/templates/zellij_template.kdl").create(parents_only=True).write_text(res)
     res = f"zellij --layout {file}"
     return res
 

{machineconfig-1.7 → machineconfig-1.8}/src/machineconfig/jobs/python/python_cargo_build_share.py

@@ -1,5 +1,10 @@
 
-import crocodile.toolbox as tb
+"""
+cargo install
+"""
+
+from crocodile.meta import Terminal
+from crocodile.file_management import P
 import platform
 
 
@@ -18,22 +23,22 @@ cargo install --path .
 """
     print(f"Executing {script}")
     if platform.system() == "Windows":
-        tb.Terminal(stdout=None).run(f". {tb.P.tmpfile(suffix='.ps1').write_text(script)}", shell="pwsh").print()
+        Terminal(stdout=None).run(f". {P.tmpfile(suffix='.ps1').write_text(script)}", shell="pwsh").print()
     else:
-        tb.Terminal(stdout=None).run(script, shell="pwsh")
+        Terminal(stdout=None).run(script, shell="pwsh")
 
-    exe = tb.P.home().joinpath(f".cargo/bin/{tool_name}" + (".exe" if platform.system() == "Windows" else ""))
+    exe = P.home().joinpath(f".cargo/bin/{tool_name}" + (".exe" if platform.system() == "Windows" else ""))
 
     try:
-        tb.P.home().joinpath(tool_name).delete(sure=True)
+        P.home().joinpath(tool_name).delete(sure=True)
     except PermissionError:
-        print(f"PermissionError, couldn't delete: {tb.P.home().joinpath(tool_name)}")
+        print(f"PermissionError, couldn't delete: {P.home().joinpath(tool_name)}")
 
     if platform.system() == "Windows":
-        exe = exe.move(folder=tb.P.get_env().WindowsApps)
+        exe = exe.move(folder=P.get_env().WindowsApps)
     elif platform.system() == "Linux":
-        tb.Terminal().run(f"sudo mv {exe} /usr/local/bin")
-        exe = tb.P(r"/usr/local/bin").joinpath(exe.name)
+        Terminal().run(f"sudo mv {exe} /usr/local/bin")
+        exe = P(r"/usr/local/bin").joinpath(exe.name)
     else:
         raise NotImplementedError(f"Platform {platform.system()} not supported.")
     share_link = exe.to_cloud("gdpo", share=True)

machineconfig-1.8/src/machineconfig/jobs/python/python_ve_symlink.py

@@ -0,0 +1,20 @@
+
+"""Symlinks
+"""
+
+from crocodile.file_management import P
+# from machineconfig.utils.utils import display_options
+
+
+def main():
+    target = P(input("Symlink to which target? ")).expanduser().absolute()
+    source = input(f"symlink from which source ? [default to: CWD/{target.name}] ") or P.cwd().joinpath(target.name)
+    if isinstance(source, str): source = P(source).expanduser().absolute()
+    # ve_path = display_options(msg="symlin link? ", options=P.home().joinpath("ve").starget.symlink_to; P(r'$pwd').joinpath('venv').symlink_to(r'$to'); P('.gitignore').modify_text('venv', 'venv', replace_line=True)"(target.symlink_to(
+    # P('.gitignore').modify_text('venv', 'venv', replace_line=True)"
+    source.symlink_to(target, overwrite=True)
+    return "echo '😁 Finished creating symlink.'"
+
+
+if __name__ == '__main__':
+    pass

{machineconfig-1.7 → machineconfig-1.8}/src/machineconfig/jobs/python_generic_installers/config.json

@@ -1,5 +1,89 @@
 
 {
+    "wezterm": {
+        "repo_url": "CUSTOM",
+        "doc": "cross-platform terminal emulator",
+        "filename_template_windows_amd_64": "WezTerm-windows-{}.zip",
+        "filename_template_linux_amd_64": "wezterm-{}.Ubuntu22.04.deb",
+        "strip_v": false,
+        "exe_name": "wezterm"
+    },
+    "ttyd": {
+        "repo_url": "https://github.com/tsl0922/ttyd",
+        "doc": "ttyd shares your terminal on the web.",
+        "filename_template_windows_amd_64": "ttyd.win32.exe",
+        "filename_template_linux_amd_64": "ttyd.x86_64",
+        "strip_v": true,
+        "exe_name": "ttyd"
+    },
+
+    "ngrok": {
+        "repo_url": "CUSTOM",
+        "doc": "ngrok secure introspectable tunnels to localhost",
+        "filename_template_windows_amd_64": "ngrok-stable-windows-amd64.zip",
+        "filename_template_linux_amd_64": "ngrok-stable-linux-amd64.zip",
+        "strip_v": false,
+        "exe_name": "ngrok"
+    },
+    "chatgpt": {
+        "repo_url": "https://github.com/j178/chatgpt",
+        "doc": "chagpt cli",
+        "filename_template_windows_amd_64": "chatgpt_Windows_x86_64.zip",
+        "filename_template_linux_amd_64": "chatgpt_Linux_x86_64.tar.gz",
+        "strip_v": true,
+        "exe_name": "chatgpt"
+    },
+    "mods": {
+        "repo_url": "https://github.com/charmbracelet/mods/",
+        "doc": "AI for the command line, built for pipelines",
+        "filename_template_windows_amd_64": "mods_{}_Windows_x86_64.zip",
+        "filename_template_linux_amd_64": "mods_{}_Linux_x86_64.tar.gz",
+        "strip_v": true,
+        "exe_name": "mods"
+    },
+
+    "glow": {
+        "repo_url": "https://github.com/charmbracelet/glow/",
+        "doc": "Render markdown on the CLI, with pizzazz!",
+        "filename_template_windows_amd_64": "glow_Windows_x86_64.zip",
+        "filename_template_linux_amd_64": "glow_Linux_x86_64.tar.gz",
+        "strip_v": true,
+        "exe_name": "glow"
+    },
+    "gum": {
+        "repo_url": "https://github.com/charmbracelet/gum",
+        "doc": "Prompt user to select from options, written in golang.",
+        "filename_template_windows_amd_64": "gum_{}_Windows_x86_64.zip",
+        "filename_template_linux_amd_64": "gum_{}_Linux_x86_64.tar.gz",
+        "strip_v": true,
+        "exe_name": "gum"
+    },
+    "bat": {
+        "repo_url": "https://github.com/sharkdp/bat",
+        "doc": "A cat(1) clone with wings.",
+        "filename_template_windows_amd_64": "bat-{}-x86_64-pc-windows-msvc.zip",
+        "filename_template_linux_amd_64": "bat-{}-x86_64-unknown-linux-gnu.tar.gz",
+        "strip_v": false,
+        "exe_name": "bat"
+    },
+
+    "nushell": {
+        "repo_url": "https://github.com/nushell/nushell",
+        "doc": "A cross-platform shell in Rust.",
+        "filename_template_windows_amd_64": "nu-{}-x86_64-windows-msvc-full.zip",
+        "filename_template_linux_amd_64": "nu-{}-x86_64-unknown-linux-gnu.tar.gz",
+        "strip_v": true,
+        "exe_name": "nu"
+    },
+    "starship": {
+        "repo_url": "https://github.com/starship/starship",
+        "doc": "a cross-platform prompt for your shell",
+        "filename_template_windows_amd_64": "starship-x86_64-pc-windows-msvc.zip",
+        "filename_template_linux_amd_64": "starship-x86_64-unknown-linux-gnu.tar.gz",
+        "strip_v": false,
+        "exe_name": "starship"
+    },
+
     "rg": {
         "repo_url": "https://github.com/BurntSushi/ripgrep",
         "doc": "recursively searches directories for a regex pattern while respecting your gitignore rules",
@@ -24,14 +108,31 @@
         "strip_v": false,
         "exe_name": "fd"
     },
-    "bat": {
-        "repo_url": "https://github.com/sharkdp/bat",
-        "doc": "A cat(1) clone with wings.",
-        "filename_template_windows_amd_64": "bat-{}-x86_64-pc-windows-msvc.zip",
-        "filename_template_linux_amd_64": "bat-{}-x86_64-unknown-linux-gnu.tar.gz",
+    "broot": {
+        "repo_url": "https://github.com/Canop/broot",
+        "doc": "broot is an fzf variant for folder structure and layered search.",
+        "filename_template_windows_amd_64": "https://dystroy.org/broot/download/x86_64-pc-windows-gnu/broot.exe",
+        "filename_template_linux_amd_64": "https://dystroy.org/broot/download/x86_64-linux/broot",
         "strip_v": false,
-        "exe_name": "bat"
+        "exe_name": "broot"
+    },
+    "rga": {
+        "repo_url": "https://github.com/phiresky/ripgrep-all",
+        "doc": "ripgrep, but also search in PDFs, E-Books, Office documents, zip, tar.gz, etc.",
+        "filename_template_windows_amd_64": "ripgrep_all-{}-x86_64-pc-windows-msvc.zip",
+        "filename_template_linux_amd_64": "ripgrep_all-{}-x86_64-unknown-linux-musl.tar.gz",
+        "strip_v": false,
+        "exe_name": "rga"
+    },
+    "ouch": {
+        "repo_url": "https://github.com/ouch-org/ouch",
+        "doc": "A cli for extracting and creating archives in unified way.",
+        "filename_template_windows_amd_64": "ouch-x86_64-pc-windows-msvc.zip",
+        "filename_template_linux_amd_64": "ouch-x86_64-unknown-linux-gnu.tar.gz",
+        "strip_v": false,
+        "exe_name": "ouch"
     },
+
     "topgrade": {
         "repo_url": "https://github.com/topgrade-rs/topgrade",
         "doc": "Keeping your system up to date usually involves invoking multiple package managers.",
@@ -55,40 +156,7 @@
         "filename_template_windows_amd_64": "bottom_x86_64-pc-windows-msvc.zip",
         "strip_v": true,
         "exe_name": "btm"
-      },  
-    "gum": {
-        "repo_url": "https://github.com/charmbracelet/gum",
-        "doc": "Prompt user to select from options, written in golang.",
-        "filename_template_windows_amd_64": "gum_{}_Windows_x86_64.zip",
-        "filename_template_linux_amd_64": "gum_{}_Linux_x86_64.tar.gz",
-        "strip_v": true,
-        "exe_name": "gum"
-    },
-
-    "broot": {
-        "repo_url": "https://github.com/Canop/broot",
-        "doc": "broot is an fzf variant for folder structure and layered search.",
-        "filename_template_windows_amd_64": "https://dystroy.org/broot/download/x86_64-pc-windows-gnu/broot.exe",
-        "filename_template_linux_amd_64": "https://dystroy.org/broot/download/x86_64-linux/broot",
-        "strip_v": false,
-        "exe_name": "broot"
-},
-    "browsh": {
-        "repo_url": "https://github.com/browsh-org/browsh",
-        "doc": "cpufetch is a small yet fancy CPU architecture fetching tool, like neofetch but for CPUs.",
-        "filename_template_windows_amd_64": "browsh_{}_windows_amd64.exe",
-        "filename_template_linux_amd_64": "browsh_{}_linux_amd64",
-        "strip_v": true,
-        "exe_name": "browsh"
-    },
-    "chatgpt": {
-        "repo_url": "https://github.com/j178/chatgpt",
-        "doc": "chagpt cli",
-        "filename_template_windows_amd_64": "chatgpt_Windows_x86_64.zip",
-        "filename_template_linux_amd_64": "chatgpt_Linux_x86_64.tar.gz",
-        "strip_v": true,
-        "exe_name": "chatgpt"
-    },
+      },
     "cpufetch": {
         "repo_url": "https://github.com/Dr-Noob/cpufetch",
         "doc": "cpufetch is a small yet fancy CPU architecture fetching tool, like neofetch but for CPUs.",
@@ -97,6 +165,15 @@
         "strip_v": false,
         "exe_name": "cpufetch"
     },
+    "procs": {
+        "repo_url": "https://github.com/dalance/procs/",
+        "doc": "procs is a modern replacement for ps written in Rust.",
+        "filename_template_windows_amd_64": "procs-{}-x86_64-windows.zip",
+        "filename_template_linux_amd_64": "procs-{}-x86_64-linux.zip",
+        "strip_v": false,
+        "exe_name": "procs"
+    },
+
     "delta": {
         "repo_url": "https://github.com/dandavison/delta",
         "doc": "A viewer for git and diff output",
@@ -137,6 +214,31 @@
         "strip_v": false,
         "exe_name": "lf"
     },
+    "tere": {
+        "repo_url": "https://github.com/mgunyho/tere",
+        "doc": "Tere is a terminal file explorer written in Rust. No more ls + cd",
+        "filename_template_windows_amd_64": "tere-{}-x86_64-pc-windows-gnu.zip",
+        "filename_template_linux_amd_64": "tere-{}-x86_64-unknown-linux-gnu.zip",
+        "strip_v": true,
+        "exe_name": "tere"
+    },
+    "zoxide": {
+        "repo_url": "https://github.com/ajeetdsouza/zoxide",
+        "doc": "A cd command that learns - easily navigate directories from the command-line",
+        "filename_template_windows_amd_64": "zoxide-{}-x86_64-pc-windows-msvc.zip",
+        "filename_template_linux_amd_64": "zoxide-{}-x86_64-unknown-linux-musl.tar.gz",
+        "strip_v": true,
+        "exe_name": "zoxide"
+    },
+
+    "lsd": {
+        "repo_url": "https://github.com/lsd-rs/lsd",
+        "doc": "lsd is a modern ls with a lot of pretty colors and font-awesome icons.",
+        "filename_template_windows_amd_64": "lsd-{}-x86_64-pc-windows-msvc.zip",
+        "filename_template_linux_amd_64": "lsd-{}-x86_64-unknown-linux-gnu.tar.gz",
+        "strip_v": false,
+        "exe_name": "lsd"
+    },
     "mprocs": {
         "repo_url": "https://github.com/pvolok/mprocs",
         "doc": "Windows/Linux poorman's zellij",
@@ -145,22 +247,6 @@
         "strip_v": true,
         "exe_name": "mprocs"
     },
-    "ouch": {
-        "repo_url": "https://github.com/ouch-org/ouch",
-        "doc": "A cli for extracting and creating archives in unified way.",
-        "filename_template_windows_amd_64": "ouch-x86_64-pc-windows-msvc.zip",
-        "filename_template_linux_amd_64": "ouch-x86_64-unknown-linux-gnu.tar.gz",
-        "strip_v": false,
-        "exe_name": "ouch"
-    },
-    "procs": {
-        "repo_url": "https://github.com/dalance/procs/",
-        "doc": "procs is a modern replacement for ps written in Rust.",
-        "filename_template_windows_amd_64": "procs-{}-x86_64-windows.zip",
-        "filename_template_linux_amd_64": "procs-{}-x86_64-linux.zip",
-        "strip_v": false,
-        "exe_name": "procs"
-    },
     "rclone": {
         "repo_url": "https://github.com/rclone/rclone",
         "doc": "cli to sync to cloud storage providers.",
@@ -169,22 +255,7 @@
         "strip_v": false,
         "exe_name": "rclone"
     },
-    "tere": {
-        "repo_url": "https://github.com/mgunyho/tere",
-        "doc": "Tere is a terminal file explorer written in Rust. No more ls + cd",
-        "filename_template_windows_amd_64": "tere-{}-x86_64-pc-windows-gnu.zip",
-        "filename_template_linux_amd_64": "tere-{}-x86_64-unknown-linux-gnu.zip",
-        "strip_v": true,
-        "exe_name": "tere"
-    },
-    "ttyd": {
-        "repo_url": "https://github.com/tsl0922/ttyd",
-        "doc": "ttyd shares your terminal on the web.",
-        "filename_template_windows_amd_64": "ttyd.win32.exe",
-        "filename_template_linux_amd_64": "ttyd.x86_64",
-        "strip_v": true,
-        "exe_name": "ttyd"
-    },
+
     "watchexec": {
         "repo_url": "https://github.com/watchexec/watchexec",
         "doc": "Executes commands in response to file modifications.",
@@ -192,13 +263,6 @@
         "filename_template_linux_amd_64": "watchexec-{}-x86_64-unknown-linux-musl.tar.xz",
         "strip_v": true,
         "exe_name": "watchexec"
-    },
-    "zoxide": {
-        "repo_url": "https://github.com/ajeetdsouza/zoxide",
-        "doc": "A cd command that learns - easily navigate directories from the command-line",
-        "filename_template_windows_amd_64": "zoxide-{}-x86_64-pc-windows-msvc.zip",
-        "filename_template_linux_amd_64": "zoxide-{}-x86_64-unknown-linux-musl.tar.gz",
-        "strip_v": true,
-        "exe_name": "zoxide"
     }
+
 }