diff --git a/checks/matrix-synapse/default.nix b/checks/matrix-synapse/default.nix index 21bfcfe8b..9e6143e3f 100644 --- a/checks/matrix-synapse/default.nix +++ b/checks/matrix-synapse/default.nix @@ -32,7 +32,7 @@ clan.core.facts.secretStore = "vm"; - # because we use systemd-tmpfiles to copy the secrets, we need to a seperate systemd-tmpfiles call to provison them. + # because we use systemd-tmpfiles to copy the secrets, we need to a separate systemd-tmpfiles call to provision them. boot.postBootCommands = "${config.systemd.package}/bin/systemd-tmpfiles --create /etc/tmpfiles.d/00-vmsecrets.conf"; systemd.tmpfiles.settings."00-vmsecrets" = { diff --git a/clanModules/postgresql/default.nix b/clanModules/postgresql/default.nix index d23565add..73690a0b7 100644 --- a/clanModules/postgresql/default.nix +++ b/clanModules/postgresql/default.nix @@ -5,7 +5,7 @@ ... }: let - createDatatbaseState = + createDatabaseState = db: let folder = "/var/backup/postgres/${db.name}"; @@ -173,7 +173,7 @@ in ''; clan.core.state = lib.mapAttrs' ( - _: db: lib.nameValuePair db.service (createDatatbaseState db) + _: db: lib.nameValuePair db.service (createDatabaseState db) ) config.clan.postgresql.databases; environment.systemPackages = builtins.map ( diff --git a/clanModules/single-disk/README.md b/clanModules/single-disk/README.md index 163ce6360..a948c44bf 100644 --- a/clanModules/single-disk/README.md +++ b/clanModules/single-disk/README.md @@ -5,7 +5,7 @@ features = [ "inventory" ] --- # Primary Disk Layout -A module for the "disk-layout" category MUST be choosen. +A module for the "disk-layout" category MUST be chosen. There is exactly one slot for this type of module in the UI, if you don't fill the slot, your machine cannot boot @@ -40,4 +40,4 @@ The UI will ask for the options of this module: } } } -``` \ No newline at end of file +``` diff --git a/lib/build-clan/default.nix b/lib/build-clan/default.nix index ed7057e57..86f5b4da1 100644 --- a/lib/build-clan/default.nix +++ b/lib/build-clan/default.nix @@ -13,7 +13,7 @@ # This improves performance, but all nipxkgs.* options will be ignored. # deadnix: skip inventory ? { }, - ## Sepcial inputs (not passed to the module system as config) + ## Special inputs (not passed to the module system as config) specialArgs ? { }, # Extra arguments to pass to nixosSystem i.e. useful to make self available # A set containing clan meta: name :: string, icon :: string, description :: string ## ... diff --git a/lib/build-clan/interface.nix b/lib/build-clan/interface.nix index 60c2ceb31..8dd3abf74 100644 --- a/lib/build-clan/interface.nix +++ b/lib/build-clan/interface.nix @@ -99,7 +99,7 @@ in type = types.submodule { options = { # Those options are interfaced by the CLI - # We don't speficy the type here, for better performance. + # We don't specify the type here, for better performance. inventory = lib.mkOption { type = lib.types.raw; }; inventoryFile = lib.mkOption { type = lib.types.raw; }; clanModules = lib.mkOption { type = lib.types.raw; }; diff --git a/lib/inventory/build-inventory/interface.nix b/lib/inventory/build-inventory/interface.nix index a0b72e3e0..55fb875df 100644 --- a/lib/inventory/build-inventory/interface.nix +++ b/lib/inventory/build-inventory/interface.nix @@ -45,7 +45,7 @@ let extraModulesOption = lib.mkOption { description = '' - List of addtionally imported `.nix` expressions. + List of additionally imported `.nix` expressions. Supported types: diff --git a/lib/jsonschema/default.nix b/lib/jsonschema/default.nix index 8d478e018..366e8238b 100644 --- a/lib/jsonschema/default.nix +++ b/lib/jsonschema/default.nix @@ -302,7 +302,7 @@ rec { additionalProperties = true; } # parse attrsOf - # TODO: if nested option is excluded, the parent sould be excluded too + # TODO: if nested option is excluded, the parent should be excluded too else if option.type.name == "attrsOf" || option.type.name == "lazyAttrsOf" # return jsonschema property definition for attrs diff --git a/pkgs/clan-app/clan_app/api/__init__.py b/pkgs/clan-app/clan_app/api/__init__.py index aaebbe004..0c524ee2f 100644 --- a/pkgs/clan-app/clan_app/api/__init__.py +++ b/pkgs/clan-app/clan_app/api/__init__.py @@ -105,7 +105,7 @@ class GObjApi: for m_name, m_signature in fn_signatures.items(): if m_name not in overwrite_fns: continue - # check if the signature of the overriden method matches + # check if the signature of the overridden method matches # the implementation signature exp_args = [] exp_return = m_signature.return_annotation diff --git a/pkgs/clan-app/default.nix b/pkgs/clan-app/default.nix index cf600cb8d..bdbc20ad4 100644 --- a/pkgs/clan-app/default.nix +++ b/pkgs/clan-app/default.nix @@ -127,7 +127,7 @@ python3.pkgs.buildPythonApplication rec { export HOME=.home fc-cache --verbose - # > fc-cache succeded + # > fc-cache succeeded echo "Loaded the following fonts ..." fc-list @@ -167,7 +167,7 @@ python3.pkgs.buildPythonApplication rec { export HOME=.home fc-cache --verbose - # > fc-cache succeded + # > fc-cache succeeded echo "Loaded the following fonts ..." fc-list diff --git a/pkgs/clan-app/tests/command.py b/pkgs/clan-app/tests/command.py index da85bcfff..8284c7e69 100644 --- a/pkgs/clan-app/tests/command.py +++ b/pkgs/clan-app/tests/command.py @@ -28,7 +28,7 @@ class Command: extra_env = {} env = os.environ.copy() env.update(extra_env) - # We start a new session here so that we can than more reliably kill all childs as well + # We start a new session here so that we can than more reliably kill all children as well p = subprocess.Popen( command, env=env, diff --git a/pkgs/clan-cli/README.md b/pkgs/clan-cli/README.md index ba7eed991..971811a93 100644 --- a/pkgs/clan-cli/README.md +++ b/pkgs/clan-cli/README.md @@ -4,7 +4,7 @@ The clan-cli contains the command line interface ## Hacking on the cli -We recommend setting up [direnv](https://direnv.net/) to load the developement with nix. +We recommend setting up [direnv](https://direnv.net/) to load the development with nix. If you do not have it set up you can also use `nix develop` directly like this: ``` diff --git a/pkgs/clan-cli/default.nix b/pkgs/clan-cli/default.nix index 3357f98a1..2ff012557 100644 --- a/pkgs/clan-cli/default.nix +++ b/pkgs/clan-cli/default.nix @@ -180,7 +180,7 @@ python3.pkgs.buildPythonApplication { ''; # Clean up after the package to avoid leaking python packages into a devshell - # TODO: factor seperate cli / API packages + # TODO: factor separate cli / API packages postFixup = '' rm $out/nix-support/propagated-build-inputs ''; diff --git a/pkgs/clan-cli/tests/command.py b/pkgs/clan-cli/tests/command.py index 1dfee4e14..608ae439f 100644 --- a/pkgs/clan-cli/tests/command.py +++ b/pkgs/clan-cli/tests/command.py @@ -28,7 +28,7 @@ class Command: extra_env = {} env = os.environ.copy() env.update(extra_env) - # We start a new session here so that we can than more reliably kill all childs as well + # We start a new session here so that we can than more reliably kill all children as well p = subprocess.Popen( command, env=env, diff --git a/pkgs/clan-vm-manager/default.nix b/pkgs/clan-vm-manager/default.nix index 6a2c8c67f..5842ef44e 100644 --- a/pkgs/clan-vm-manager/default.nix +++ b/pkgs/clan-vm-manager/default.nix @@ -111,7 +111,7 @@ python3.pkgs.buildPythonApplication rec { export HOME=.home fc-cache --verbose - # > fc-cache succeded + # > fc-cache succeeded echo "Loaded the following fonts ..." fc-list @@ -149,7 +149,7 @@ python3.pkgs.buildPythonApplication rec { export HOME=.home fc-cache --verbose - # > fc-cache succeded + # > fc-cache succeeded echo "Loaded the following fonts ..." fc-list diff --git a/pkgs/clan-vm-manager/notes.md b/pkgs/clan-vm-manager/notes.md index 4c5120573..a0f650798 100644 --- a/pkgs/clan-vm-manager/notes.md +++ b/pkgs/clan-vm-manager/notes.md @@ -1,7 +1,7 @@ # Webkit GTK doesn't interop flawless with Solid.js build result 1. Webkit expects script tag to be in `body` only solid.js puts the in the head. -2. script and css files are loaded with type="module" and crossorigin tags beeing set. WebKit silently fails to load then. +2. script and css files are loaded with type="module" and crossorigin tags being set. WebKit silently fails to load then. 3. Paths to resiources are not allowed to start with "/" because webkit interprets them relative to the system and not the base url. 4. webkit doesn't support native features such as directly handling external urls (i.e opening them in the default browser) -6. Other problems to be found? \ No newline at end of file +6. Other problems to be found? diff --git a/pkgs/clan-vm-manager/tests/command.py b/pkgs/clan-vm-manager/tests/command.py index 1dfee4e14..608ae439f 100644 --- a/pkgs/clan-vm-manager/tests/command.py +++ b/pkgs/clan-vm-manager/tests/command.py @@ -28,7 +28,7 @@ class Command: extra_env = {} env = os.environ.copy() env.update(extra_env) - # We start a new session here so that we can than more reliably kill all childs as well + # We start a new session here so that we can than more reliably kill all children as well p = subprocess.Popen( command, env=env, diff --git a/pkgs/classgen/main.py b/pkgs/classgen/main.py index 92a21835c..be0000bc0 100644 --- a/pkgs/classgen/main.py +++ b/pkgs/classgen/main.py @@ -143,7 +143,7 @@ def field_def_from_default_value( return finalize_field( field_types=field_types, default_factory="dict", - type_apendix=" | dict[str,Any]", + type_appendix=" | dict[str,Any]", ) if default_value == "‹name›": return None @@ -171,10 +171,10 @@ def get_field_def( field_types: set[str], default: str | None = None, default_factory: str | None = None, - type_apendix: str = "", + type_appendix: str = "", ) -> str: sorted_field_types = sorted(field_types) - serialised_types = " | ".join(sorted_field_types) + type_apendix + serialised_types = " | ".join(sorted_field_types) + type_appendix if not default and not default_factory and not field_meta: return f"{field_name}: {serialised_types}" field_init = "field(" diff --git a/templates/flake-parts/machines/jon/hardware-configuration.nix b/templates/flake-parts/machines/jon/hardware-configuration.nix index 23ded2cd4..d28460609 100644 --- a/templates/flake-parts/machines/jon/hardware-configuration.nix +++ b/templates/flake-parts/machines/jon/hardware-configuration.nix @@ -10,5 +10,5 @@ throw '' 'ssh root@ nixos-generate-config --no-filesystems --show-hardware-config > hardware-configuration.nix' - And manually eplace this file with the generated "hardware-configuration.nix". + And manually replace this file with the generated "hardware-configuration.nix". '' diff --git a/templates/new-clan/machines/jon/hardware-configuration.nix b/templates/new-clan/machines/jon/hardware-configuration.nix index 23ded2cd4..d28460609 100644 --- a/templates/new-clan/machines/jon/hardware-configuration.nix +++ b/templates/new-clan/machines/jon/hardware-configuration.nix @@ -10,5 +10,5 @@ throw '' 'ssh root@ nixos-generate-config --no-filesystems --show-hardware-config > hardware-configuration.nix' - And manually eplace this file with the generated "hardware-configuration.nix". + And manually replace this file with the generated "hardware-configuration.nix". ''