feat(rewrite): Config preparations

README.md

@@ -3,3 +3,9 @@
 A nixos-like declarative config and package manager for Arch Linux (or any other distro, with some tweaks).
 
 See the [Wiki](https://git.janishutz.com/janishutz/archmgr/wiki)
+
+## WIP
+This project is very much Work In Progress.
+The configs will likely move to python-based configs from the current yaml-based ones to provide you with more flexibility.
+
+`archmgr` will automatically create a basic setup if you run `archmgr init`, so you can get up and running quickly

archmgr/__init__.py

@@ -0,0 +1,9 @@
+#!/usr/bin/env python3
+# PYTHON_ARGCOMPLETE_OK
+
+# TODO: Re-export the config stuff
+
+if __name__ == "__main__":
+    from app import run as _run
+
+    _run()

archmgr/app.py

@@ -1,7 +1,6 @@
-#!/usr/bin/env python3
-# PYTHON_ARGCOMPLETE_OK
-
-import cli.args as cliargs
+# The main app
+from typing import cast
+import cli as cliargs
 
 import commands.commit as commit
 import commands.config as config
@@ -9,9 +8,10 @@ import commands.init as init
 import commands.pull as pull
 import commands.push as push
 import commands.prepare as setup
-from config import load_config
+import commands.show as show
 
-if __name__ == "__main__":
+
+def run():
     args, ap = cliargs.add_cli_args()
 
     if args.cmd == None:
@@ -30,20 +30,22 @@ if __name__ == "__main__":
                                       \\___/      
         """)
 
-    print(load_config("config.yml"))
+    conf = {}
     try:
         if args.cmd == "commit":
-            commit.commit(args.force, args.no_render)
+            commit.commit(conf, args.force, args.no_render)
         elif args.cmd == "config":
-            config.config()
+            config.config(args, conf)
         elif args.cmd == "init":
             init.init(args.force)
         elif args.cmd == "setup":
             setup.setup()
         elif args.cmd == "pull":
-            pull.pull(args.rebase, args.apply)
+            pull.pull(conf, args.rebase, args.apply)
         elif args.cmd == "push":
             push.push(args.force)
+        elif args.cmd == "show":
+            show.show(conf, cast(ArchMgrTemplates, {}), args)
     except KeyboardInterrupt as e:
         exit(130)
     except Exception as e:

archmgr/cli/__init__.py

@@ -0,0 +1,34 @@
+# CLI argument parsing and setup for it
+import argparse
+import argcomplete
+
+from args import commit, init, pull, push, show
+
+
+def add_cli_args():
+    ap = argparse.ArgumentParser(
+        "archmgr",
+        description="A nixos-like declarative config and package manager for Arch Linux (or any other distro, with some tweaks)",
+        usage="archmgr [command] [options]",
+    )
+    ap.add_argument("-v", "--version", action="version", version="%(prog)s V0.0.1")
+    sp = ap.add_subparsers(
+        title="commands",
+        metavar="Use 'archmgr [command] --help' to see help for each command",
+        dest="cmd",
+    )
+
+    # ┌                                                ┐
+    # │                  Subcommands                   │
+    # └                                                ┘
+    sp.add_parser("setup", help="Do initial setup, like installing required tools")
+    commit.add_parser(sp)
+    sp.add_parser("config", help="prints information about your config")
+    init.add_parser(sp)
+    pull.add_parser(sp)
+    push.add_parser(sp)
+    show.add_parser(sp)
+
+    argcomplete.autocomplete(ap)
+
+    return ap.parse_args(), ap

archmgr/cli/args/commit.py

@@ -0,0 +1,13 @@
+import argparse as ap
+
+
+def add_parser(sp: ap._SubParsersAction[ap.ArgumentParser]):
+    commit = sp.add_parser(
+        "commit", help="apply pending changes and commit to git repo"
+    )
+    commit.add_argument(
+        "-f", "--force", help="force apply (skips prompts)", action="store_true"
+    )
+    commit.add_argument(
+        "--no-render", "-r", help="do not re-render renderables", action="store_true"
+    )

archmgr/cli/args/init.py

@@ -0,0 +1,11 @@
+import argparse as ap
+
+
+def add_parser(sp: ap._SubParsersAction[ap.ArgumentParser]):
+    init = sp.add_parser("init", help="initialize a new archmgr repository")
+    init.add_argument(
+        "--force",
+        "-f",
+        help="resets the git repository and initializes new archmgr repo",
+        action="store_true",
+    )

archmgr/cli/args/pull.py

@@ -0,0 +1,12 @@
+import argparse as ap
+
+
+def add_parser(sp: ap._SubParsersAction[ap.ArgumentParser]):
+    pull = sp.add_parser("pull", help="pull changes from git remote")
+    pull.add_argument("--rebase", "-r", help="execute rebase", action="store_true")
+    pull.add_argument(
+        "--apply",
+        "-a",
+        help="also apply the changes to the local system",
+        action="store_true",
+    )

archmgr/cli/args/push.py

@@ -0,0 +1,11 @@
+import argparse as ap
+
+
+def add_parser(sp: ap._SubParsersAction[ap.ArgumentParser]):
+    push = sp.add_parser("push", help="push pending changes to git remote")
+    push.add_argument(
+        "--force",
+        "-f",
+        help="force push (overriding possible remote changes)",
+        action="store_true",
+    )

archmgr/cli/args/show.py

@@ -0,0 +1,13 @@
+import argparse as ap
+
+
+def add_parser(sp: ap._SubParsersAction[ap.ArgumentParser]):
+    show = sp.add_parser("show", help="get information about configuration presets")
+    show_sp = show.add_subparsers(
+        title="config presets to show details on",
+        dest="show",
+        required=True,
+    )
+    show_sp.add_parser("config", help="show details about your configuration. Alias of config show")
+    pkgs = show_sp.add_parser("pkgs", help="show details on package presets")
+    pkgs.add_argument("show_pkg")

archmgr/config/filesystem/files.py

@@ -0,0 +1 @@
+# Declare a file explicitly if it has different permissions

archmgr/config/git/__init__.py

@@ -0,0 +1,2 @@
+def clone_git_repo(repo_url: str, clone_path: str, branch: str = "DEFAULT"):
+    pass

archmgr/config/pkgs/pkg_mgr.py

@@ -0,0 +1,6 @@
+def add_packages(pkgs: list[str]):
+    pass
+
+
+def add_package_bundles(pkgs: list[str]):
+    pass

archmgr/config/pkgs/reflector.py

@@ -0,0 +1,2 @@
+def enable_reflector():
+    pass

archmgr/config/pkgs/repos.py

@@ -0,0 +1,2 @@
+def enable_repo(name: str):
+    pass

archmgr/config/templates/__init__.py

@@ -0,0 +1,36 @@
+def add_template_data(name: str, data: str):
+    """Replace all occurrences of variable specified by `name` by
+        the specified data
+
+    Args:
+        name: The variable to replace
+        data: The data to replace it with
+    """
+    pass
+
+
+def add_template_array(name: str, template: str, data: list[str]):
+    """Replace all occurrences of variable specified by `name` in the files with
+            the specified template, where {{ data }} is replaced with the each element
+            of the data argument
+
+    Args:
+        name: The name of the variable to replace
+        template:
+            Template syntax, with {{ data }} as variable, see example below or docs.
+            Recursive replacement is supported up to one layer deep
+        data: A list of data that is substituted into the {{ data }} variable in the template
+
+    Example:
+        ```python
+    add_template_array("test", "- Hello World {{ data }}\\n", [0, 1])
+        ```
+        for example replaces {{ test }} in a file with
+        ```
+        - Hello World 0
+
+        - Hello World 1
+        ```
+    """
+    # TODO: Recursive replacement
+    pass

archmgr/config/themes/custom.py

@@ -0,0 +1,14 @@
+from typing import Literal
+
+
+def add_custom_theme():
+    pass
+
+
+def custom_theme_color_source(src: Literal["wallpaper"] | Literal["default"]):
+    pass
+
+
+# TODO: For desktop environments, what command??
+def set_wallpaper(path: str):
+    pass

archmgr/config/themes/set_theme.py

@@ -0,0 +1,2 @@
+def set_gtk_theme():
+    pass

archmgr/util/diff.py

@@ -0,0 +1,34 @@
+from typing import List
+
+
+def pkg_diff(target: List[str], actual: List[str]) -> tuple[List[str], List[str]]:
+    """Compute a diff between target packages and installed packages
+
+    Args:
+        target: The target packages
+        actual: The actually installed packages
+
+    Returns:
+        A tuple with first the missing (not installed) packages
+        and second the extraneous (to be uninstalled) packages
+    """
+    removed = []
+    diffed_out = []
+    for pkg in actual:
+        try:
+            diffed_out.append(target.index(pkg))
+        except Exception:
+            removed.append(pkg)
+
+    diffed_out.reverse()
+    new_pkgs = []
+    if len(diffed_out) > 0:
+        curr = diffed_out.pop()
+        for i, pkg in enumerate(target):
+            if i != curr:
+                new_pkgs.append(pkg)
+            else:
+                if len(diffed_out) > 0:
+                    curr = diffed_out.pop()
+
+    return (new_pkgs, removed)

archmgr/util/input/__init__.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from commands.util.password_manager import PasswordManager
+from password_mgr import PasswordManager
 
 
 def choice(default: str, options: str, msg: str) -> str:

archmgr/util/pacman.py

@@ -1,7 +1,7 @@
 import subprocess as sp
 from typing import List
 
-from commands.util.input_mgr import password
+from util.input import password
 
 pkg_manager = ["yay", "--noconfirm"]
 

archmgr/util/printing/__init__.py

@@ -0,0 +1,2 @@
+import list
+import diff

archmgr/util/printing/diff.py

@@ -1,7 +1,7 @@
 from typing import List
 import colorama as cl
 
-from commands.util.printing.list import print_list
+from list import print_list
 
 
 def print_diff(add: List[str], remove: List[str]):

cli/args.py

@@ -1,61 +0,0 @@
-import argparse
-import argcomplete
-
-
-def add_cli_args():
-    ap = argparse.ArgumentParser(
-        "archmgr",
-        description="A nixos-like declarative config and package manager for Arch Linux (or any other distro, with some tweaks)",
-        usage="archmgr [command] [options]",
-    )
-    ap.add_argument("-v", "--version", action="version", version="%(prog)s V0.0.1")
-    sp = ap.add_subparsers(
-        title="commands",
-        metavar="Use 'archmgr [command] --help' to see help for each command",
-        dest="cmd",
-    )
-
-    # ┌                                                ┐
-    # │                  Subcommands                   │
-    # └                                                ┘
-    commit = sp.add_parser(
-        "commit", help="apply pending changes and commit to git repo"
-    )
-    commit.add_argument("-f", "--force", help="force apply (skips prompts)", action="store_true")
-    commit.add_argument(
-        "--no-render", "-r", help="do not re-render renderables", action="store_true"
-    )
-
-    # TODO: Allow changing things like config path
-    sp.add_parser("config", help="prints information about your config and change some of them")
-
-    sp.add_parser("setup", help="Do initial setup, like installing required tools")
-
-    init = sp.add_parser("init", help="initialize a new archmgr repository")
-    init.add_argument(
-        "--force",
-        "-f",
-        help="resets the git repository and initializes new archmgr repo",
-        action="store_true",
-    )
-
-    push = sp.add_parser("push", help="push pending changes to git remote")
-    push.add_argument(
-        "--force",
-        "-f",
-        help="force push (overriding possible remote changes)",
-        action="store_true",
-    )
-
-    pull = sp.add_parser("pull", help="pull changes from git remote")
-    pull.add_argument("--rebase", "-r", help="execute rebase", action="store_true")
-    pull.add_argument(
-        "--apply",
-        "-a",
-        help="also apply the changes to the local system",
-        action="store_true",
-    )
-
-    argcomplete.autocomplete(ap)
-
-    return ap.parse_args(), ap

commands/commit.py

@@ -1,22 +0,0 @@
-from commands.util import pacman
-from commands.util.diff import pkg_diff
-from commands.util.input_mgr import confirm, password
-
-from commands.util.printing.diff import print_diff
-
-
-def commit(force: bool = False, no_render: bool = False):
-    """Commit the changes to the system
-
-    Args:
-        force: Apply, overriding any changes since the last commit without confirming
-        no_render: Don't rerender the templates (use cached version).
-            Will be ignored if cache is unavailable (and prompt the user)
-    """
-    # TODO: Make sure we don't uninstall critical system packages by accident (i.e. prompt user)
-    # Probably do that check in the pacman util lib tho
-    add, remove = pkg_diff([], pacman.list_explicitly_installed())
-    print_diff(add, remove)
-    if confirm(False, "Do you really want to proceed?"):
-        pacman.install_package_list(add)
-        pacman.uninstall_package_list(remove)

commands/config.py

@@ -1,4 +0,0 @@
-def config():
-    print("""
-          Your config can be found at 
-          """)

commands/init.py

@@ -1,19 +0,0 @@
-import os
-import commands.util.git as git
-
-
-def init(force: bool = False):
-    dir = os.getcwd()
-    if force:
-        [os.remove(dir) for dir in os.listdir(dir)]
-    git.init(dir)
-    os.mkdir(dir + "/config")
-    os.mkdir(dir + "/etc")
-    with open(dir + "/config.yaml") as file:
-        file.write("")
-    print("Initialized a new archmgr repository")
-    # TODO: Warn user to not delete .config/archmgr repo
-    # TODO: Set up that repo (where to put it? /usr/share?)
-    # TODO: Consider collecting function
-    # TODO: Config folder instead of single config file
-    # TODO: Also store the folder name of the config folder in that repo (needs to be easily changeable for user!)

commands/prepare.py

@@ -1,30 +0,0 @@
-import subprocess
-
-from commands.util import pacman
-from commands.util.input_mgr import confirm
-
-
-def setup():
-    print("==> Installing required packages")
-    if not pacman.install_package_list(["git"]):
-        print("Git installation failed")
-        return
-
-    subprocess.run(
-        ["git", "clone", "https://aur.archlinux.org/yay.git"],
-        cwd="/tmp",
-        capture_output=True,
-    )
-    yay_install = subprocess.run(
-        ["makepkg", "-si"], cwd="/tmp/yay", capture_output=True
-    )
-
-    if yay_install.returncode != 0:
-        print("==> Installation of yay failed")
-        if confirm(True, "Do you wish to view the logs?"):
-            print(yay_install.stdout, "\n", yay_install.stderr)
-        return
-
-    print("==> Installation completed")
-
-# TODO: Check if yay is available before installing

commands/pull.py

@@ -1,2 +0,0 @@
-def pull(rebase: bool = False, apply: bool = False):
-    print("pull")

commands/push.py

@@ -1,2 +0,0 @@
-def push(force: bool = False):
-    print("push")

commands/util/diff.py

@@ -1,22 +0,0 @@
-from typing import List
-
-
-def pkg_diff(target: List[str], actual: List[str]) -> tuple[List[str], List[str]]:
-    """Compute a diff between target packages and installed packages
-
-    Args:
-        target: The target packages
-        actual: The actually installed packages
-
-    Returns:
-        A tuple with first the missing (not installed) packages
-        and second the extraneous (to be uninstalled) packages
-    """
-    for i, pkg in enumerate(actual):
-        try:
-            idx = target.index(pkg)
-            target.pop(idx)
-            actual.pop(i)
-        except Exception:
-            pass
-    return (target, actual)

config.schema.json

@@ -1,365 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-07/schema",
-    "type": "object",
-    "properties": {
-        "requires": {
-            "type": "array",
-            "items": {
-                "type": "string",
-                "pattern": "^([a-zA-Z0-9.-_]+\\/)+",
-                "description": "Path to other configs, relative to this file (e.g. config/pkgs.yaml will expand to dirname(this_file)/config/pkgs.yaml)"
-            },
-            "description": "Imports for other config files that will be merged into this one. Precedence order is bottom up (i.e. lowest has highest precedence)"
-        },
-        "pkgs": {
-            "type": "object",
-            "description": "The packages to be installed",
-            "properties": {
-                "individual": {
-                    "type:": "array",
-                    "description": "the packages to be installed, by their package name",
-                    "items": {
-                        "type": "string",
-                        "pattern": "^[a-z0-9-._]+(?=[a-z0-9]$)"
-                    }
-                },
-                "repos": {
-                    "type": "object",
-                    "properties": {
-                        "enabled_repos": {
-                            "type": "array",
-                            "items": {
-                                "type": "object",
-                                "additionalProperties": false,
-                                "description": "The repos to set up",
-                                "properties": {
-                                    "name": {
-                                        "type": "string",
-                                        "description": "The repositories to set up",
-                                        "pattern": "^(core|extra|core-testing|extra-testing|multilib|multilib-testing|[a-z0-9-]+(?=[a-z0-9]$))"
-                                    },
-                                    "setup_cmds": {
-                                        "type": "array",
-                                        "description": "The commands to run to set it up (optional if any of the explicitly supported ones)",
-                                        "items": {
-                                            "type": "string",
-                                            "description": "Command to run"
-                                        }
-                                    },
-                                    "mirrors": {
-                                        "type": "object",
-                                        "description": "Configure the mirrors to use",
-                                        "properties": {
-                                            "use_default": {
-                                                "type": "boolean",
-                                                "description": "Whether to use the default mirrors or not",
-                                                "default": true
-                                            },
-                                            "extra_mirrors": {
-                                                "type": "array",
-                                                "description": "Any extra mirrors you want to add. At least one mirror needs to be put here if use_default is false. Order matters",
-                                                "items": {
-                                                    "type": "string"
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        },
-                        "reflector": {
-                            "type": "object",
-                            "description": "Use reflector to update the mirrors",
-                            "properties": {
-                                "enabled": {
-                                    "type": "boolean",
-                                    "default": false
-                                },
-                                "interval": {
-                                    "type": "number",
-                                    "description": "The number of days to elapse between reflector reruns"
-                                },
-                                "countries": {
-                                    "type": "array",
-                                    "description": "The countries in which the should be located (only applies for the main arch repos)",
-                                    "items": {
-                                        "type": "string",
-                                        "pattern": "^[A-Z][a-z]*[a-z]$"
-                                    },
-                                    "maxItems": 5,
-                                    "minItems": 1
-                                },
-                                "count": {
-                                    "type": "number",
-                                    "description": "The number of mirrors to add to the list",
-                                    "maximum": 20,
-                                    "minimum": 3
-                                }
-                            },
-                            "required": [
-                                "enabled"
-                            ],
-                            "additionalProperties": false
-                        },
-                        "additionalProperties": false
-                    }
-                },
-                "bundles": {
-                    "type": "array",
-                    "description": "Bundled packages, installing all the recommended extra software for them (such as hyprland and nvim)",
-                    "maxItems": 1,
-                    "items": {
-                        "type": "object",
-                        "properties": {
-                            "name": {
-                                "type": "string",
-                                "description": "The bundle name",
-                                "pattern": "^[a-z0-9-._]+(?=[a-z0-9]$)"
-                            },
-                            "ignored_pkgs": {
-                                "type": "array",
-                                "description": "List of packages from the bundle that should not be installed",
-                                "items": {
-                                    "type": "string",
-                                    "pattern": "^[a-z0-9-._]+(?=[a-z0-9]$)"
-                                }
-                            }
-                        },
-                        "additionalProperties": false,
-                        "required": [
-                            "name"
-                        ]
-                    }
-                }
-            },
-            "additionalProperties": false
-        },
-        "users": {
-            "type": "array",
-            "description": "Users to add, including groups. Users will be diffed and removed if they are removed from here. No files are deleted",
-            "items": {
-                "type": "object",
-                "properties": {
-                    "username": {
-                        "type": "string",
-                        "pattern": "^[a-zA-Z0-9\\-._]{2,19}(?=[a-zA-Z0-9]$)"
-                    },
-                    "groups": {
-                        "type": "array",
-                        "description": "The groups to add the user to. Groups are created if they don't exist. User's own group doesn't have to be listed explicitly",
-                        "items": {
-                            "type": "string",
-                            "pattern": "^[a-zA-Z0-9\\-._]{2,19}(?=[a-zA-Z0-9]$)"
-                        }
-                    },
-                    "sudo_user": {
-                        "type": "boolean",
-                        "default": false,
-                        "description": "Whether a user can use sudo or not. Same as appending them to the `wheel` group"
-                    },
-                    "home_dir": {
-                        "type": "boolean",
-                        "description": "Whether to create a home directory for the user or not",
-                        "default": false
-                    }
-                },
-                "required": [
-                    "username"
-                ],
-                "additionalProperties": false
-            }
-        },
-        "boot": {
-            "type": "object",
-            "description": "Settings for the bootloader, such as theme, using os-prober, etc",
-            "properties": {
-                "bootloader": {
-                    "type": "string",
-                    "description": "The bootloader to use (more coming eventually)",
-                    "pattern": "^(grub)"
-                },
-                "esp_dir": {
-                    "type": "string",
-                    "description": "The directory for the bootloader files. Has to end in slash",
-                    "pattern": "^(^(~|\\.|\\.\\.)?\\/)?([\\w\\/.-]+(?!.*[^\\w\\/.-]+))\\/$"
-                },
-                "theme": {
-                    "type": "object",
-                    "description": "Configuration for the bootloader theme",
-                    "properties": {
-                        "folder": {
-                            "type": "string",
-                            "description": "Where the folder for the theme is found. Can be relative to the config repo or file system and has to end in slash",
-                            "pattern": "^(^(~|\\.|\\.\\.)?\\/)?([\\w\\/.-]+(?!.*[^\\w\\/.-]+))\\/$"
-                        }
-                    },
-                    "additionalProperties": false,
-                    "required": [
-                        "folder"
-                    ]
-                },
-                "os_prober": {
-                    "type": "boolean",
-                    "description": "Whether to enable OS prober to search for other operating systems"
-                }
-            },
-            "additionalProperties": false,
-            "required": [
-                "bootloader",
-                "esp_dir"
-            ]
-        },
-        "themes": {
-            "type": "object",
-            "properties": {}
-        },
-        "git": {
-            "type": "object",
-            "description": "Automatically set up credential manager and clone repos",
-            "properties": {
-                "creds": {
-                    "type": "object",
-                    "description": "Which git services to log into",
-                    "properties": {
-                        "manager": {
-                            "type": "string",
-                            "description": "The git credential manager to use. Set to none if you don't want one (default)",
-                            "pattern": "^(git-credential-manager|none)",
-                            "default": "none"
-                        }
-                    },
-                    "additionalProperties": false
-                },
-                "repos": {
-                    "type": "array",
-                    "description": "Which repos to clone (removing one from here doesn't delete it from the system and only pulls if folder does not exist)",
-                    "items": {
-                        "type": "object",
-                        "properties": {
-                            "url": {
-                                "type": "string",
-                                "description": "git clone URL (ssh or HTTP(S))",
-                                "pattern": "^((https?):\\/\\/(([a-z0-9-]+)((?=\\.))\\.)+[a-z]+(?=\\/)\\/([\\w\\-?.=]+(?=\\/[\\w\\-?.=])\\/)*([\\w\\-?&.=\\/]+(?=[\\w\\-.=\\/]$)))|([a-zA-Z0-9\\-._]+(?=[a-zA-Z0-9])[a-zA-Z0-9])@(([a-z0-9\\-]+(?=\\.))\\.)+[a-z]+(?=:):([a-zA-Z0-9\\-._]+(?=\\/)\\/)+([a-zA-Z0-9\\-._]+(?=[a-zA-Z0-9]$))"
-                            },
-                            "clone_path": {
-                                "type": "string",
-                                "description": "The location on the local system where to put it. Must be absolute path. Parent folders will be created if they don't exist",
-                                "pattern": "^(^(~|\\.|\\.\\.)?\\/)?([\\w\\/.-]+(?!.*[^\\w\\/.-]+))\\/$"
-                            }
-                        },
-                        "additionalProperties": false,
-                        "required": [
-                            "url",
-                            "clone_path"
-                        ]
-                    }
-                },
-                "additionalProperties": false
-            }
-        },
-        "template_data": {
-            "type": "array",
-            "description": "The data to be inserted into the templates",
-            "items": {
-                "type": "object",
-                "properties": {
-                    "name": {
-                        "type": "string",
-                        "description": "The name that appears in the template"
-                    },
-                    "data": {
-                        "type": "string",
-                        "description": "The data that is to be inserted"
-                    }
-                },
-                "required": [
-                    "name",
-                    "data"
-                ],
-                "additionalProperties": false
-            }
-        },
-        "cmds": {
-            "type": "object",
-            "properties": {
-                "once": {
-                    "type": "array",
-                    "description": "Commands to run on only once (uses the name property to determine if it needs to run)",
-                    "items": {
-                        "type": "object",
-                        "properties": {
-                            "name": {
-                                "type": "string",
-                                "description": "This name is used to track if a command was run before."
-                            },
-                            "cmd": {
-                                "type": "string"
-                            },
-                            "hook": {
-                                "type": "string",
-                                "description": "Where in the execution of archmgr to run",
-                                "default": "end",
-                                "pattern": "^(pre-pkg|post-pkg|pre-git|post-git|end)"
-                            },
-                            "user": {
-                                "type": "string",
-                                "default": "root",
-                                "pattern": "^[a-zA-Z0-9\\-._]{2,19}(?=[a-zA-Z0-9]$)",
-                                "description": "The user to run as. Be aware that only the current user's password is available, unless capture_output is set to false"
-                            },
-                            "capture_output": {
-                                "type": "boolean",
-                                "default": true,
-                                "description": "Whether or not to hide the output from the user"
-                            }
-                        },
-                        "additionalProperties": false,
-                        "required": [
-                            "name",
-                            "cmd"
-                        ]
-                    }
-                },
-                "always": {
-                    "type": "array",
-                    "description": "Commands to run on each apply",
-                    "items": {
-                        "type": "object",
-                        "properties": {
-                            "name": {
-                                "type": "string",
-                                "description": "Used to indicate to user what command is executing. If omitted, will be truncated cmd"
-                            },
-                            "cmd": {
-                                "type": "string"
-                            },
-                            "hook": {
-                                "type": "string",
-                                "description": "Where in the execution of archmgr to run",
-                                "default": "end",
-                                "pattern": "^(pre-pkg|post-pkg|pre-git|post-git|end)"
-                            },
-                            "user": {
-                                "type": "string",
-                                "default": "root",
-                                "pattern": "^[a-zA-Z0-9\\-._]{2,19}(?=[a-zA-Z0-9]$)",
-                                "description": "The user to run as. Be aware that only the current user's password is available, unless capture_output is set to false"
-                            },
-                            "capture_output": {
-                                "type": "boolean",
-                                "default": true,
-                                "description": "Whether or not to hide the output from the user"
-                            }
-                        }
-                    }
-                }
-            },
-            "additionalProperties": false
-        }
-    },
-    "required": [
-        "pkgs",
-        "boot"
-    ],
-    "additionalProperties": false
-}

config.yml

@@ -1,58 +0,0 @@
-# yaml-language-server: $schema=config.schema.json
-# TODO: Change the above to an import URL instead
-requires:
-  - path/to/other/configs/relative/to/this # Reads the other configs after finishing this one
-
-pkgs:
-  individual:
-    - pkg_name
-  bundles:
-    - name: hyprland
-  repos:
-    reflector:
-      enabled: false
-      countries:
-        - Switzerland
-
-users:
-  - username: username
-    groups:
-      - group_1
-    home_dir: True
-
-boot:
-  bootloader: grub
-  esp_dir: /boot/
-  theme:
-    folder: ~/.path/to/theme/
-  os_prober: False
-  # Also copies over the /etc/default/grub config or equivalent for other supported bootloaders
-
-  # TODO: Desktops, login managers, full disk encryption etc configuration?
-
-themes:
-  gtk: theme_name
-  qt: theme_name # or use_gtk to use the gtk theme instaed
-  font: Comfortaa 11 # the font name to be used (also needs to be installed)
-  icon_theme: candy-icons # The icon theme to use (also needs to be installed)
-  cursor_theme: oreo_spark_blue_cursors # TODO: Consider if GTK settings file should just be copied
-
-git:
-  creds:
-    manager: git-credential-manager # or none
-  repos:
-    - url: https://github.com/janishutz/janishutz
-      clone_path: ~/projects/ # Project location will be clone_path/<repo name>
-    - url: git@git.janishutz.com:janishutz/nvim
-      clone_path: ~/projects/ # Project location will be clone_path/<repo name>
-
-template_data:
-  - name: template_data_name
-    data: the_data
-
-cmds:
-  always:
-    - cmd: "cmd to run every time archmgr is run"
-  once:
-    - name: "cmd1"
-      cmd: "cmd to run on first execution of archmgr (or if not executed previously)"

config/__init__.py

@@ -1,31 +0,0 @@
-from typing import Any, cast
-import yaml
-
-from config import validator
-from config.merger import merge_configs
-
-
-def _load_config_file(file: str):
-    with open(file, "r") as f:
-        parsed = yaml.load(f, Loader=yaml.FullLoader)
-    return parsed
-
-
-def load_config(file: str):
-    # Load and validate initial config
-    try:
-        loaded_conf = _load_config_file(file)
-    except Exception:
-        return {}
-    if not validator.validate(loaded_conf):
-        return {}
-
-    conf = cast(dict[str, Any], loaded_conf)
-    requires = cast(list[str], conf["requires"])
-    conf.pop("requires")
-
-    # Recursively load files
-    for conf_file in requires:
-        conf = merge_configs(conf, load_config(conf_file))
-
-    return conf

config/merger.py

@@ -1,6 +0,0 @@
-def merge_configs(config: dict, new_config: dict):
-    if len(new_config) == 0 or len(config) == 0:
-        return config
-
-    # Merge configs
-    return config

config/validator.py

@@ -1,18 +0,0 @@
-import json
-import jsonschema
-
-with open("config.schema.json") as file:
-    schema = json.load(file)
-
-
-def validate(config):
-    try:
-        jsonschema.validate(config, schema)
-    except jsonschema.SchemaError:
-        print("Schema invalid")
-        return False
-    except jsonschema.ValidationError:
-        print("Config invalid")
-        return False
-
-    return True

notes.md

@@ -1,32 +1,7 @@
-# Concept for tracking changes
-- Create new commit (if possible)
-- If force is unset: Diff system's files against current state by copying them into the current state branch
-- Then, diff the package state against the state branch by dumping it
-- Else, or if no diff, continue
-- Copy normal config files into correct directories
-- Render and copy renderables
-- Retrieve explicitly installed packages and remove those that are not present in goal and install those that are not present in current state
+# Concepts
+## Config
+In python, using functions and args for them
 
 
-# Ideas
-- [ ] function to collect new configs
-- [ ] config options for users and groups
-- [ ] presets for things like desktops (like Hyprland)
-- [ ] config options for the template rendering
-- [ ] config options for themes
-- [ ] grub config
-- [ ] Dynamic selection of more configs (i.e. require syntax)
-- [ ] Own config syntax?
-- [ ] Autocompletion
-- [ ] Basic arch install how? -> Probably manual (or semi-automatic)
-- [ ] Mounts?
-
-
-# REGEX
-TODO: Improve the below (especially file can be shortened with positive lookahead)
-- File: `^(^(~|\\.|\\.\\.)?\\/)?([\\w\\/.-]+(?!.*[^\\w\\/.-]+))`
-- Folder: `^(^(~|\\.|\\.\\.)?\\/)?([\\w\\/.-]+(?!.*[^\\w\\/.-]+))\\/$`
-- URL (just domain): `^(https?):\\/\\/(([a-z0-9-]+)((?=\\.))\\.)+[a-z]+(?=[a-z]$)`
-- Full URL: `^(https?):\\/\\/(([a-z0-9-]+)((?=\\.))\\.)+[a-z]+(?=\\/)\\/([\\w\\-?.=]+(?=\\/[\\w\\-?.=])\\/)*([\\w\\-?&.=\\/]+(?=[\\w\\-.=\\/]$))`
-- UNIX username and groups: `^[a-zA-Z0-9\\-._]{2,19}(?=[a-zA-Z0-9]$)`
-- Git SSH: `([a-zA-Z0-9\\-._]+(?=[a-zA-Z0-9])[a-zA-Z0-9])@(([a-z0-9\\-]+(?=\\.))\\.)+[a-z]+(?=:):([a-zA-Z0-9\\-._]+(?=\\/)\\/)+([a-zA-Z0-9\\-._]+(?=[a-zA-Z0-9]$))`
+## Init
+- Copy

test.py

@@ -0,0 +1 @@
+import archmgr