yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'fix typos' (#2282) from danjujan/clan-core:fix-typos into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/2282
This commit is contained in:
Mic92
2024-10-29 12:37:34 +00:00
parent 20d79eac17 75ffb4436e
commit 936d4b75e3
19 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
checks/matrix-synapse/default.nix
View File

@@ -32,7 +32,7 @@
clan.core.facts.secretStore = "vm"; 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"; boot.postBootCommands = "${config.systemd.package}/bin/systemd-tmpfiles --create /etc/tmpfiles.d/00-vmsecrets.conf";
systemd.tmpfiles.settings."00-vmsecrets" = { systemd.tmpfiles.settings."00-vmsecrets" = {

4
clanModules/postgresql/default.nix
View File

@@ -5,7 +5,7 @@
... ...
}: }:
let let
createDatatbaseState = createDatabaseState =
db: db:
let let
folder = "/var/backup/postgres/${db.name}"; folder = "/var/backup/postgres/${db.name}";
@@ -173,7 +173,7 @@ in
''; '';
clan.core.state = lib.mapAttrs' ( clan.core.state = lib.mapAttrs' (
_: db: lib.nameValuePair db.service (createDatatbaseState db) _: db: lib.nameValuePair db.service (createDatabaseState db)
) config.clan.postgresql.databases; ) config.clan.postgresql.databases;
environment.systemPackages = builtins.map ( environment.systemPackages = builtins.map (

4
clanModules/single-disk/README.md
View File

@@ -5,7 +5,7 @@ features = [ "inventory" ]
--- ---
# Primary Disk Layout # 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 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:
} }
} }
} }
``` ```

2
lib/build-clan/default.nix
View File

@@ -13,7 +13,7 @@
# This improves performance, but all nipxkgs.* options will be ignored. # This improves performance, but all nipxkgs.* options will be ignored.
# deadnix: skip # deadnix: skip
inventory ? { }, 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 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
## ##
... ...

2
lib/build-clan/interface.nix
View File

@@ -99,7 +99,7 @@ in
type = types.submodule { type = types.submodule {
options = { options = {
# Those options are interfaced by the CLI # 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; }; inventory = lib.mkOption { type = lib.types.raw; };
inventoryFile = lib.mkOption { type = lib.types.raw; }; inventoryFile = lib.mkOption { type = lib.types.raw; };
clanModules = lib.mkOption { type = lib.types.raw; }; clanModules = lib.mkOption { type = lib.types.raw; };

2
lib/inventory/build-inventory/interface.nix
View File

@@ -45,7 +45,7 @@ let
extraModulesOption = lib.mkOption { extraModulesOption = lib.mkOption {
description = '' description = ''
List of addtionally imported `.nix` expressions. List of additionally imported `.nix` expressions.
Supported types: Supported types:

2
lib/jsonschema/default.nix
View File

@@ -302,7 +302,7 @@ rec {
additionalProperties = true; additionalProperties = true;
} }
# parse attrsOf # 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 else if
option.type.name == "attrsOf" || option.type.name == "lazyAttrsOf" option.type.name == "attrsOf" || option.type.name == "lazyAttrsOf"
# return jsonschema property definition for attrs # return jsonschema property definition for attrs

2
pkgs/clan-app/clan_app/api/__init__.py
View File

@@ -105,7 +105,7 @@ class GObjApi:
for m_name, m_signature in fn_signatures.items(): for m_name, m_signature in fn_signatures.items():
if m_name not in overwrite_fns: if m_name not in overwrite_fns:
continue continue
# check if the signature of the overriden method matches # check if the signature of the overridden method matches
# the implementation signature # the implementation signature
exp_args = [] exp_args = []
exp_return = m_signature.return_annotation exp_return = m_signature.return_annotation

4
pkgs/clan-app/default.nix
View File

@@ -127,7 +127,7 @@ python3.pkgs.buildPythonApplication rec {
export HOME=.home export HOME=.home
fc-cache --verbose fc-cache --verbose
# > fc-cache succeded # > fc-cache succeeded
echo "Loaded the following fonts ..." echo "Loaded the following fonts ..."
fc-list fc-list
@@ -167,7 +167,7 @@ python3.pkgs.buildPythonApplication rec {
export HOME=.home export HOME=.home
fc-cache --verbose fc-cache --verbose
# > fc-cache succeded # > fc-cache succeeded
echo "Loaded the following fonts ..." echo "Loaded the following fonts ..."
fc-list fc-list

2
pkgs/clan-app/tests/command.py
View File

@@ -28,7 +28,7 @@ class Command:
extra_env = {} extra_env = {}
env = os.environ.copy() env = os.environ.copy()
env.update(extra_env) 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( p = subprocess.Popen(
command, command,
env=env, env=env,

2
pkgs/clan-cli/README.md
View File

@@ -4,7 +4,7 @@ The clan-cli contains the command line interface
## Hacking on the cli ## 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: If you do not have it set up you can also use `nix develop` directly like this:
``` ```

2
pkgs/clan-cli/default.nix
View File

@@ -180,7 +180,7 @@ python3.pkgs.buildPythonApplication {
''; '';
# Clean up after the package to avoid leaking python packages into a devshell # 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 = '' postFixup = ''
rm $out/nix-support/propagated-build-inputs rm $out/nix-support/propagated-build-inputs
''; '';

2
pkgs/clan-cli/tests/command.py
View File

@@ -28,7 +28,7 @@ class Command:
extra_env = {} extra_env = {}
env = os.environ.copy() env = os.environ.copy()
env.update(extra_env) 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( p = subprocess.Popen(
command, command,
env=env, env=env,

4
pkgs/clan-vm-manager/default.nix
View File

@@ -111,7 +111,7 @@ python3.pkgs.buildPythonApplication rec {
export HOME=.home export HOME=.home
fc-cache --verbose fc-cache --verbose
# > fc-cache succeded # > fc-cache succeeded
echo "Loaded the following fonts ..." echo "Loaded the following fonts ..."
fc-list fc-list
@@ -149,7 +149,7 @@ python3.pkgs.buildPythonApplication rec {
export HOME=.home export HOME=.home
fc-cache --verbose fc-cache --verbose
# > fc-cache succeded # > fc-cache succeeded
echo "Loaded the following fonts ..." echo "Loaded the following fonts ..."
fc-list fc-list

4
pkgs/clan-vm-manager/notes.md
View File

@@ -1,7 +1,7 @@
# Webkit GTK doesn't interop flawless with Solid.js build result # 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. 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. 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) 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? 6. Other problems to be found?

2
pkgs/clan-vm-manager/tests/command.py
View File

@@ -28,7 +28,7 @@ class Command:
extra_env = {} extra_env = {}
env = os.environ.copy() env = os.environ.copy()
env.update(extra_env) 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( p = subprocess.Popen(
command, command,
env=env, env=env,

6
pkgs/classgen/main.py
View File

@@ -143,7 +143,7 @@ def field_def_from_default_value(
return finalize_field( return finalize_field(
field_types=field_types, field_types=field_types,
default_factory="dict", default_factory="dict",
type_apendix=" | dict[str,Any]", type_appendix=" | dict[str,Any]",
) )
if default_value == "‹name›": if default_value == "‹name›":
return None return None
@@ -171,10 +171,10 @@ def get_field_def(
field_types: set[str], field_types: set[str],
default: str | None = None, default: str | None = None,
default_factory: str | None = None, default_factory: str | None = None,
type_apendix: str = "", type_appendix: str = "",
) -> str: ) -> str:
sorted_field_types = sorted(field_types) 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: if not default and not default_factory and not field_meta:
return f"{field_name}: {serialised_types}" return f"{field_name}: {serialised_types}"
field_init = "field(" field_init = "field("

2
templates/flake-parts/machines/jon/hardware-configuration.nix
View File

@@ -10,5 +10,5 @@ throw ''
'ssh root@<hostname> nixos-generate-config --no-filesystems --show-hardware-config > hardware-configuration.nix' 'ssh root@<hostname> 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".
'' ''

2
templates/new-clan/machines/jon/hardware-configuration.nix
View File

@@ -10,5 +10,5 @@ throw ''
'ssh root@<hostname> nixos-generate-config --no-filesystems --show-hardware-config > hardware-configuration.nix' 'ssh root@<hostname> 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".
'' ''