From ba4b6882cf266537769a49708fbeab35f6d1db6e Mon Sep 17 00:00:00 2001 From: Ethan Reece Date: Mon, 14 Jul 2025 00:15:54 -0500 Subject: [PATCH] Tidy base module --- .envrc | 2 +- .../base/modules => base}/base/default.nix | 0 base/default.nix | 8 +++++++ .../base/modules => base}/helix/default.nix | 23 ++++++++++++++----- .../modules => base}/languages/default.nix | 0 .../languages/en-us/.vale/.vale.ini | 0 .../.vale/styles/RedHat/Abbreviations.yml | 0 .../styles/RedHat/CaseSensitiveTerms.yml | 0 .../.vale/styles/RedHat/Conjunctions.yml | 0 .../.vale/styles/RedHat/ConsciousLanguage.yml | 0 .../.vale/styles/RedHat/Contractions.yml | 0 .../en-us/.vale/styles/RedHat/Definitions.yml | 0 .../.vale/styles/RedHat/DoNotUseTerms.yml | 0 .../en-us/.vale/styles/RedHat/Ellipses.yml | 0 .../en-us/.vale/styles/RedHat/EmDash.yml | 0 .../en-us/.vale/styles/RedHat/GitLinks.yml | 0 .../styles/RedHat/HeadingPunctuation.yml | 0 .../en-us/.vale/styles/RedHat/Headings.yml | 0 .../en-us/.vale/styles/RedHat/Hyphens.yml | 0 .../styles/RedHat/MergeConflictMarkers.yml | 0 .../.vale/styles/RedHat/ObviousTerms.yml | 0 .../en-us/.vale/styles/RedHat/OxfordComma.yml | 0 .../.vale/styles/RedHat/PascalCamelCase.yml | 0 .../.vale/styles/RedHat/PassiveVoice.yml | 0 .../styles/RedHat/ProductCentricWriting.yml | 0 .../en-us/.vale/styles/RedHat/README-IBM.adoc | 0 .../.vale/styles/RedHat/README-proselint.md | 0 .../.vale/styles/RedHat/README-write-good.md | 0 .../.vale/styles/RedHat/ReadabilityGrade.yml | 0 .../.vale/styles/RedHat/ReleaseNotes.yml | 0 .../.vale/styles/RedHat/RepeatedWords.yml | 0 .../styles/RedHat/SelfReferentialText.yml | 0 .../.vale/styles/RedHat/SentenceLength.yml | 0 .../en-us/.vale/styles/RedHat/SimpleWords.yml | 0 .../en-us/.vale/styles/RedHat/Slash.yml | 0 .../en-us/.vale/styles/RedHat/SmartQuotes.yml | 0 .../en-us/.vale/styles/RedHat/Spacing.yml | 0 .../en-us/.vale/styles/RedHat/Spelling.yml | 0 .../en-us/.vale/styles/RedHat/Symbols.yml | 0 .../en-us/.vale/styles/RedHat/TermsErrors.yml | 0 .../.vale/styles/RedHat/TermsSuggestions.yml | 0 .../.vale/styles/RedHat/TermsWarnings.yml | 0 .../styles/RedHat/UserReplacedValues.yml | 0 .../en-us/.vale/styles/RedHat/Using.yml | 0 .../.vale/styles/RedHat/collate-output.tmpl | 0 .../en-us/.vale/styles/RedHat/meta.json | 0 .../en-us/.vale/styles/alex/Ablist.yml | 0 .../en-us/.vale/styles/alex/Condescending.yml | 0 .../en-us/.vale/styles/alex/Gendered.yml | 0 .../en-us/.vale/styles/alex/LGBTQ.yml | 0 .../languages/en-us/.vale/styles/alex/OCD.yml | 0 .../en-us/.vale/styles/alex/Press.yml | 0 .../.vale/styles/alex/ProfanityLikely.yml | 0 .../.vale/styles/alex/ProfanityMaybe.yml | 0 .../.vale/styles/alex/ProfanityUnlikely.yml | 0 .../en-us/.vale/styles/alex/README.md | 0 .../en-us/.vale/styles/alex/Race.yml | 0 .../en-us/.vale/styles/alex/Suicide.yml | 0 .../en-us/.vale/styles/alex/meta.json | 0 .../.vale/styles/proselint/Airlinese.yml | 0 .../.vale/styles/proselint/AnimalLabels.yml | 0 .../.vale/styles/proselint/Annotations.yml | 0 .../.vale/styles/proselint/Apologizing.yml | 0 .../.vale/styles/proselint/Archaisms.yml | 0 .../en-us/.vale/styles/proselint/But.yml | 0 .../en-us/.vale/styles/proselint/Cliches.yml | 0 .../.vale/styles/proselint/CorporateSpeak.yml | 0 .../en-us/.vale/styles/proselint/Currency.yml | 0 .../en-us/.vale/styles/proselint/Cursing.yml | 0 .../en-us/.vale/styles/proselint/DateCase.yml | 0 .../.vale/styles/proselint/DateMidnight.yml | 0 .../.vale/styles/proselint/DateRedundancy.yml | 0 .../.vale/styles/proselint/DateSpacing.yml | 0 .../.vale/styles/proselint/DenizenLabels.yml | 0 .../.vale/styles/proselint/Diacritical.yml | 0 .../.vale/styles/proselint/GenderBias.yml | 0 .../.vale/styles/proselint/GroupTerms.yml | 0 .../en-us/.vale/styles/proselint/Hedging.yml | 0 .../.vale/styles/proselint/Hyperbole.yml | 0 .../en-us/.vale/styles/proselint/Jargon.yml | 0 .../.vale/styles/proselint/LGBTOffensive.yml | 0 .../.vale/styles/proselint/LGBTTerms.yml | 0 .../.vale/styles/proselint/Malapropisms.yml | 0 .../en-us/.vale/styles/proselint/Needless.yml | 0 .../en-us/.vale/styles/proselint/Nonwords.yml | 0 .../.vale/styles/proselint/Oxymorons.yml | 0 .../en-us/.vale/styles/proselint/P-Value.yml | 0 .../.vale/styles/proselint/RASSyndrome.yml | 0 .../en-us/.vale/styles/proselint/README.md | 0 .../en-us/.vale/styles/proselint/Skunked.yml | 0 .../en-us/.vale/styles/proselint/Spelling.yml | 0 .../.vale/styles/proselint/Typography.yml | 0 .../.vale/styles/proselint/Uncomparables.yml | 0 .../en-us/.vale/styles/proselint/Very.yml | 0 .../en-us/.vale/styles/proselint/meta.json | 0 .../en-us/.vale/styles/write-good/Cliches.yml | 0 .../en-us/.vale/styles/write-good/E-Prime.yml | 0 .../.vale/styles/write-good/Illusions.yml | 0 .../en-us/.vale/styles/write-good/Passive.yml | 0 .../en-us/.vale/styles/write-good/README.md | 0 .../en-us/.vale/styles/write-good/So.yml | 0 .../en-us/.vale/styles/write-good/ThereIs.yml | 0 .../.vale/styles/write-good/TooWordy.yml | 0 .../en-us/.vale/styles/write-good/Weasel.yml | 0 .../en-us/.vale/styles/write-good/meta.json | 0 .../languages/en-us/default.nix | 4 ++-- .../languages/markdown/default.nix | 0 .../languages/nix/default.nix | 0 .../languages/toml/default.nix | 0 .../languages/yaml/default.nix | 0 flake.nix | 2 +- modules/base/default.nix | 4 ---- modules/base/modules/default.nix | 8 ------- modules/default.nix | 8 ------- 114 files changed, 29 insertions(+), 30 deletions(-) rename {modules/base/modules => base}/base/default.nix (100%) create mode 100644 base/default.nix rename {modules/base/modules => base}/helix/default.nix (71%) rename {modules/base/modules => base}/languages/default.nix (100%) rename {modules/base/modules => base}/languages/en-us/.vale/.vale.ini (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/Abbreviations.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/CaseSensitiveTerms.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/Conjunctions.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/ConsciousLanguage.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/Contractions.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/Definitions.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/DoNotUseTerms.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/Ellipses.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/EmDash.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/GitLinks.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/HeadingPunctuation.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/Headings.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/Hyphens.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/MergeConflictMarkers.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/ObviousTerms.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/OxfordComma.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/PascalCamelCase.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/PassiveVoice.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/ProductCentricWriting.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/README-IBM.adoc (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/README-proselint.md (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/README-write-good.md (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/ReadabilityGrade.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/ReleaseNotes.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/RepeatedWords.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/SelfReferentialText.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/SentenceLength.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/SimpleWords.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/Slash.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/SmartQuotes.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/Spacing.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/Spelling.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/Symbols.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/TermsErrors.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/TermsSuggestions.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/TermsWarnings.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/UserReplacedValues.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/Using.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/collate-output.tmpl (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/RedHat/meta.json (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/alex/Ablist.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/alex/Condescending.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/alex/Gendered.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/alex/LGBTQ.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/alex/OCD.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/alex/Press.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/alex/ProfanityLikely.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/alex/ProfanityMaybe.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/alex/ProfanityUnlikely.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/alex/README.md (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/alex/Race.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/alex/Suicide.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/alex/meta.json (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/Airlinese.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/AnimalLabels.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/Annotations.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/Apologizing.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/Archaisms.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/But.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/Cliches.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/CorporateSpeak.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/Currency.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/Cursing.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/DateCase.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/DateMidnight.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/DateRedundancy.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/DateSpacing.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/DenizenLabels.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/Diacritical.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/GenderBias.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/GroupTerms.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/Hedging.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/Hyperbole.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/Jargon.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/LGBTOffensive.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/LGBTTerms.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/Malapropisms.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/Needless.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/Nonwords.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/Oxymorons.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/P-Value.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/RASSyndrome.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/README.md (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/Skunked.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/Spelling.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/Typography.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/Uncomparables.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/Very.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/proselint/meta.json (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/write-good/Cliches.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/write-good/E-Prime.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/write-good/Illusions.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/write-good/Passive.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/write-good/README.md (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/write-good/So.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/write-good/ThereIs.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/write-good/TooWordy.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/write-good/Weasel.yml (100%) rename {modules/base/modules => base}/languages/en-us/.vale/styles/write-good/meta.json (100%) rename {modules/base/modules => base}/languages/en-us/default.nix (96%) rename {modules/base/modules => base}/languages/markdown/default.nix (100%) rename {modules/base/modules => base}/languages/nix/default.nix (100%) rename {modules/base/modules => base}/languages/toml/default.nix (100%) rename {modules/base/modules => base}/languages/yaml/default.nix (100%) delete mode 100644 modules/base/default.nix delete mode 100644 modules/base/modules/default.nix delete mode 100644 modules/default.nix diff --git a/.envrc b/.envrc index 1377a83..b9f0fd0 100644 --- a/.envrc +++ b/.envrc @@ -1,2 +1,2 @@ -watch_dir ./modules +watch_dir ./base use flake diff --git a/modules/base/modules/base/default.nix b/base/base/default.nix similarity index 100% rename from modules/base/modules/base/default.nix rename to base/base/default.nix diff --git a/base/default.nix b/base/default.nix new file mode 100644 index 0000000..94819d3 --- /dev/null +++ b/base/default.nix @@ -0,0 +1,8 @@ +{ ... }: +{ + imports = [ + ./base + ./helix + ./languages + ]; +} diff --git a/modules/base/modules/helix/default.nix b/base/helix/default.nix similarity index 71% rename from modules/base/modules/helix/default.nix rename to base/helix/default.nix index 4136d2c..c8d8c67 100644 --- a/modules/base/modules/helix/default.nix +++ b/base/helix/default.nix @@ -40,11 +40,21 @@ in config.devshells.default = let tomlFormatter = pkgs.formats.toml { }; - helixLanguages = { - directory = ".helix"; - filename = "languages.toml"; - content = config.helix.languages; - file = tomlFormatter.generate "languages.toml" helixLanguages.content; + helix = { + languages = { + name = "languages.toml"; + content = config.helix.languages; + path = tomlFormatter.generate "languages.toml" helix.languages.content; + }; + directory = { + name = ".helix"; + path = pkgs.linkFarm helix.directory.name [ + { + name = helix.languages.name; + path = helix.languages.path; + } + ]; + }; }; in { @@ -59,7 +69,8 @@ in packages = [ pkgs.helix ]; devshell.startup.helix_config.text = '' mkdir -p .helix - ${pkgs.uutils-coreutils-noprefix}/bin/ln -fs ${helixLanguages.file} ./${helixLanguages.directory}/${helixLanguages.filename} + ${pkgs.uutils-coreutils-noprefix}/bin/rm -rf ./${helix.directory.name} + ${pkgs.uutils-coreutils-noprefix}/bin/ln -fsn ${helix.directory.path} ./${helix.directory.name} ''; }; } diff --git a/modules/base/modules/languages/default.nix b/base/languages/default.nix similarity index 100% rename from modules/base/modules/languages/default.nix rename to base/languages/default.nix diff --git a/modules/base/modules/languages/en-us/.vale/.vale.ini b/base/languages/en-us/.vale/.vale.ini similarity index 100% rename from modules/base/modules/languages/en-us/.vale/.vale.ini rename to base/languages/en-us/.vale/.vale.ini diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/Abbreviations.yml b/base/languages/en-us/.vale/styles/RedHat/Abbreviations.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/Abbreviations.yml rename to base/languages/en-us/.vale/styles/RedHat/Abbreviations.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/CaseSensitiveTerms.yml b/base/languages/en-us/.vale/styles/RedHat/CaseSensitiveTerms.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/CaseSensitiveTerms.yml rename to base/languages/en-us/.vale/styles/RedHat/CaseSensitiveTerms.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/Conjunctions.yml b/base/languages/en-us/.vale/styles/RedHat/Conjunctions.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/Conjunctions.yml rename to base/languages/en-us/.vale/styles/RedHat/Conjunctions.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/ConsciousLanguage.yml b/base/languages/en-us/.vale/styles/RedHat/ConsciousLanguage.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/ConsciousLanguage.yml rename to base/languages/en-us/.vale/styles/RedHat/ConsciousLanguage.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/Contractions.yml b/base/languages/en-us/.vale/styles/RedHat/Contractions.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/Contractions.yml rename to base/languages/en-us/.vale/styles/RedHat/Contractions.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/Definitions.yml b/base/languages/en-us/.vale/styles/RedHat/Definitions.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/Definitions.yml rename to base/languages/en-us/.vale/styles/RedHat/Definitions.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/DoNotUseTerms.yml b/base/languages/en-us/.vale/styles/RedHat/DoNotUseTerms.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/DoNotUseTerms.yml rename to base/languages/en-us/.vale/styles/RedHat/DoNotUseTerms.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/Ellipses.yml b/base/languages/en-us/.vale/styles/RedHat/Ellipses.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/Ellipses.yml rename to base/languages/en-us/.vale/styles/RedHat/Ellipses.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/EmDash.yml b/base/languages/en-us/.vale/styles/RedHat/EmDash.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/EmDash.yml rename to base/languages/en-us/.vale/styles/RedHat/EmDash.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/GitLinks.yml b/base/languages/en-us/.vale/styles/RedHat/GitLinks.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/GitLinks.yml rename to base/languages/en-us/.vale/styles/RedHat/GitLinks.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/HeadingPunctuation.yml b/base/languages/en-us/.vale/styles/RedHat/HeadingPunctuation.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/HeadingPunctuation.yml rename to base/languages/en-us/.vale/styles/RedHat/HeadingPunctuation.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/Headings.yml b/base/languages/en-us/.vale/styles/RedHat/Headings.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/Headings.yml rename to base/languages/en-us/.vale/styles/RedHat/Headings.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/Hyphens.yml b/base/languages/en-us/.vale/styles/RedHat/Hyphens.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/Hyphens.yml rename to base/languages/en-us/.vale/styles/RedHat/Hyphens.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/MergeConflictMarkers.yml b/base/languages/en-us/.vale/styles/RedHat/MergeConflictMarkers.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/MergeConflictMarkers.yml rename to base/languages/en-us/.vale/styles/RedHat/MergeConflictMarkers.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/ObviousTerms.yml b/base/languages/en-us/.vale/styles/RedHat/ObviousTerms.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/ObviousTerms.yml rename to base/languages/en-us/.vale/styles/RedHat/ObviousTerms.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/OxfordComma.yml b/base/languages/en-us/.vale/styles/RedHat/OxfordComma.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/OxfordComma.yml rename to base/languages/en-us/.vale/styles/RedHat/OxfordComma.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/PascalCamelCase.yml b/base/languages/en-us/.vale/styles/RedHat/PascalCamelCase.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/PascalCamelCase.yml rename to base/languages/en-us/.vale/styles/RedHat/PascalCamelCase.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/PassiveVoice.yml b/base/languages/en-us/.vale/styles/RedHat/PassiveVoice.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/PassiveVoice.yml rename to base/languages/en-us/.vale/styles/RedHat/PassiveVoice.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/ProductCentricWriting.yml b/base/languages/en-us/.vale/styles/RedHat/ProductCentricWriting.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/ProductCentricWriting.yml rename to base/languages/en-us/.vale/styles/RedHat/ProductCentricWriting.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/README-IBM.adoc b/base/languages/en-us/.vale/styles/RedHat/README-IBM.adoc similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/README-IBM.adoc rename to base/languages/en-us/.vale/styles/RedHat/README-IBM.adoc diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/README-proselint.md b/base/languages/en-us/.vale/styles/RedHat/README-proselint.md similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/README-proselint.md rename to base/languages/en-us/.vale/styles/RedHat/README-proselint.md diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/README-write-good.md b/base/languages/en-us/.vale/styles/RedHat/README-write-good.md similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/README-write-good.md rename to base/languages/en-us/.vale/styles/RedHat/README-write-good.md diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/ReadabilityGrade.yml b/base/languages/en-us/.vale/styles/RedHat/ReadabilityGrade.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/ReadabilityGrade.yml rename to base/languages/en-us/.vale/styles/RedHat/ReadabilityGrade.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/ReleaseNotes.yml b/base/languages/en-us/.vale/styles/RedHat/ReleaseNotes.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/ReleaseNotes.yml rename to base/languages/en-us/.vale/styles/RedHat/ReleaseNotes.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/RepeatedWords.yml b/base/languages/en-us/.vale/styles/RedHat/RepeatedWords.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/RepeatedWords.yml rename to base/languages/en-us/.vale/styles/RedHat/RepeatedWords.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/SelfReferentialText.yml b/base/languages/en-us/.vale/styles/RedHat/SelfReferentialText.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/SelfReferentialText.yml rename to base/languages/en-us/.vale/styles/RedHat/SelfReferentialText.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/SentenceLength.yml b/base/languages/en-us/.vale/styles/RedHat/SentenceLength.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/SentenceLength.yml rename to base/languages/en-us/.vale/styles/RedHat/SentenceLength.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/SimpleWords.yml b/base/languages/en-us/.vale/styles/RedHat/SimpleWords.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/SimpleWords.yml rename to base/languages/en-us/.vale/styles/RedHat/SimpleWords.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/Slash.yml b/base/languages/en-us/.vale/styles/RedHat/Slash.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/Slash.yml rename to base/languages/en-us/.vale/styles/RedHat/Slash.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/SmartQuotes.yml b/base/languages/en-us/.vale/styles/RedHat/SmartQuotes.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/SmartQuotes.yml rename to base/languages/en-us/.vale/styles/RedHat/SmartQuotes.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/Spacing.yml b/base/languages/en-us/.vale/styles/RedHat/Spacing.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/Spacing.yml rename to base/languages/en-us/.vale/styles/RedHat/Spacing.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/Spelling.yml b/base/languages/en-us/.vale/styles/RedHat/Spelling.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/Spelling.yml rename to base/languages/en-us/.vale/styles/RedHat/Spelling.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/Symbols.yml b/base/languages/en-us/.vale/styles/RedHat/Symbols.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/Symbols.yml rename to base/languages/en-us/.vale/styles/RedHat/Symbols.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/TermsErrors.yml b/base/languages/en-us/.vale/styles/RedHat/TermsErrors.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/TermsErrors.yml rename to base/languages/en-us/.vale/styles/RedHat/TermsErrors.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/TermsSuggestions.yml b/base/languages/en-us/.vale/styles/RedHat/TermsSuggestions.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/TermsSuggestions.yml rename to base/languages/en-us/.vale/styles/RedHat/TermsSuggestions.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/TermsWarnings.yml b/base/languages/en-us/.vale/styles/RedHat/TermsWarnings.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/TermsWarnings.yml rename to base/languages/en-us/.vale/styles/RedHat/TermsWarnings.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/UserReplacedValues.yml b/base/languages/en-us/.vale/styles/RedHat/UserReplacedValues.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/UserReplacedValues.yml rename to base/languages/en-us/.vale/styles/RedHat/UserReplacedValues.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/Using.yml b/base/languages/en-us/.vale/styles/RedHat/Using.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/Using.yml rename to base/languages/en-us/.vale/styles/RedHat/Using.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/collate-output.tmpl b/base/languages/en-us/.vale/styles/RedHat/collate-output.tmpl similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/collate-output.tmpl rename to base/languages/en-us/.vale/styles/RedHat/collate-output.tmpl diff --git a/modules/base/modules/languages/en-us/.vale/styles/RedHat/meta.json b/base/languages/en-us/.vale/styles/RedHat/meta.json similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/RedHat/meta.json rename to base/languages/en-us/.vale/styles/RedHat/meta.json diff --git a/modules/base/modules/languages/en-us/.vale/styles/alex/Ablist.yml b/base/languages/en-us/.vale/styles/alex/Ablist.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/alex/Ablist.yml rename to base/languages/en-us/.vale/styles/alex/Ablist.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/alex/Condescending.yml b/base/languages/en-us/.vale/styles/alex/Condescending.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/alex/Condescending.yml rename to base/languages/en-us/.vale/styles/alex/Condescending.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/alex/Gendered.yml b/base/languages/en-us/.vale/styles/alex/Gendered.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/alex/Gendered.yml rename to base/languages/en-us/.vale/styles/alex/Gendered.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/alex/LGBTQ.yml b/base/languages/en-us/.vale/styles/alex/LGBTQ.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/alex/LGBTQ.yml rename to base/languages/en-us/.vale/styles/alex/LGBTQ.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/alex/OCD.yml b/base/languages/en-us/.vale/styles/alex/OCD.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/alex/OCD.yml rename to base/languages/en-us/.vale/styles/alex/OCD.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/alex/Press.yml b/base/languages/en-us/.vale/styles/alex/Press.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/alex/Press.yml rename to base/languages/en-us/.vale/styles/alex/Press.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/alex/ProfanityLikely.yml b/base/languages/en-us/.vale/styles/alex/ProfanityLikely.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/alex/ProfanityLikely.yml rename to base/languages/en-us/.vale/styles/alex/ProfanityLikely.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/alex/ProfanityMaybe.yml b/base/languages/en-us/.vale/styles/alex/ProfanityMaybe.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/alex/ProfanityMaybe.yml rename to base/languages/en-us/.vale/styles/alex/ProfanityMaybe.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/alex/ProfanityUnlikely.yml b/base/languages/en-us/.vale/styles/alex/ProfanityUnlikely.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/alex/ProfanityUnlikely.yml rename to base/languages/en-us/.vale/styles/alex/ProfanityUnlikely.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/alex/README.md b/base/languages/en-us/.vale/styles/alex/README.md similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/alex/README.md rename to base/languages/en-us/.vale/styles/alex/README.md diff --git a/modules/base/modules/languages/en-us/.vale/styles/alex/Race.yml b/base/languages/en-us/.vale/styles/alex/Race.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/alex/Race.yml rename to base/languages/en-us/.vale/styles/alex/Race.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/alex/Suicide.yml b/base/languages/en-us/.vale/styles/alex/Suicide.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/alex/Suicide.yml rename to base/languages/en-us/.vale/styles/alex/Suicide.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/alex/meta.json b/base/languages/en-us/.vale/styles/alex/meta.json similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/alex/meta.json rename to base/languages/en-us/.vale/styles/alex/meta.json diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/Airlinese.yml b/base/languages/en-us/.vale/styles/proselint/Airlinese.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/Airlinese.yml rename to base/languages/en-us/.vale/styles/proselint/Airlinese.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/AnimalLabels.yml b/base/languages/en-us/.vale/styles/proselint/AnimalLabels.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/AnimalLabels.yml rename to base/languages/en-us/.vale/styles/proselint/AnimalLabels.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/Annotations.yml b/base/languages/en-us/.vale/styles/proselint/Annotations.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/Annotations.yml rename to base/languages/en-us/.vale/styles/proselint/Annotations.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/Apologizing.yml b/base/languages/en-us/.vale/styles/proselint/Apologizing.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/Apologizing.yml rename to base/languages/en-us/.vale/styles/proselint/Apologizing.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/Archaisms.yml b/base/languages/en-us/.vale/styles/proselint/Archaisms.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/Archaisms.yml rename to base/languages/en-us/.vale/styles/proselint/Archaisms.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/But.yml b/base/languages/en-us/.vale/styles/proselint/But.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/But.yml rename to base/languages/en-us/.vale/styles/proselint/But.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/Cliches.yml b/base/languages/en-us/.vale/styles/proselint/Cliches.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/Cliches.yml rename to base/languages/en-us/.vale/styles/proselint/Cliches.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/CorporateSpeak.yml b/base/languages/en-us/.vale/styles/proselint/CorporateSpeak.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/CorporateSpeak.yml rename to base/languages/en-us/.vale/styles/proselint/CorporateSpeak.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/Currency.yml b/base/languages/en-us/.vale/styles/proselint/Currency.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/Currency.yml rename to base/languages/en-us/.vale/styles/proselint/Currency.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/Cursing.yml b/base/languages/en-us/.vale/styles/proselint/Cursing.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/Cursing.yml rename to base/languages/en-us/.vale/styles/proselint/Cursing.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/DateCase.yml b/base/languages/en-us/.vale/styles/proselint/DateCase.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/DateCase.yml rename to base/languages/en-us/.vale/styles/proselint/DateCase.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/DateMidnight.yml b/base/languages/en-us/.vale/styles/proselint/DateMidnight.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/DateMidnight.yml rename to base/languages/en-us/.vale/styles/proselint/DateMidnight.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/DateRedundancy.yml b/base/languages/en-us/.vale/styles/proselint/DateRedundancy.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/DateRedundancy.yml rename to base/languages/en-us/.vale/styles/proselint/DateRedundancy.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/DateSpacing.yml b/base/languages/en-us/.vale/styles/proselint/DateSpacing.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/DateSpacing.yml rename to base/languages/en-us/.vale/styles/proselint/DateSpacing.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/DenizenLabels.yml b/base/languages/en-us/.vale/styles/proselint/DenizenLabels.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/DenizenLabels.yml rename to base/languages/en-us/.vale/styles/proselint/DenizenLabels.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/Diacritical.yml b/base/languages/en-us/.vale/styles/proselint/Diacritical.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/Diacritical.yml rename to base/languages/en-us/.vale/styles/proselint/Diacritical.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/GenderBias.yml b/base/languages/en-us/.vale/styles/proselint/GenderBias.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/GenderBias.yml rename to base/languages/en-us/.vale/styles/proselint/GenderBias.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/GroupTerms.yml b/base/languages/en-us/.vale/styles/proselint/GroupTerms.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/GroupTerms.yml rename to base/languages/en-us/.vale/styles/proselint/GroupTerms.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/Hedging.yml b/base/languages/en-us/.vale/styles/proselint/Hedging.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/Hedging.yml rename to base/languages/en-us/.vale/styles/proselint/Hedging.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/Hyperbole.yml b/base/languages/en-us/.vale/styles/proselint/Hyperbole.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/Hyperbole.yml rename to base/languages/en-us/.vale/styles/proselint/Hyperbole.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/Jargon.yml b/base/languages/en-us/.vale/styles/proselint/Jargon.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/Jargon.yml rename to base/languages/en-us/.vale/styles/proselint/Jargon.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/LGBTOffensive.yml b/base/languages/en-us/.vale/styles/proselint/LGBTOffensive.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/LGBTOffensive.yml rename to base/languages/en-us/.vale/styles/proselint/LGBTOffensive.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/LGBTTerms.yml b/base/languages/en-us/.vale/styles/proselint/LGBTTerms.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/LGBTTerms.yml rename to base/languages/en-us/.vale/styles/proselint/LGBTTerms.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/Malapropisms.yml b/base/languages/en-us/.vale/styles/proselint/Malapropisms.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/Malapropisms.yml rename to base/languages/en-us/.vale/styles/proselint/Malapropisms.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/Needless.yml b/base/languages/en-us/.vale/styles/proselint/Needless.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/Needless.yml rename to base/languages/en-us/.vale/styles/proselint/Needless.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/Nonwords.yml b/base/languages/en-us/.vale/styles/proselint/Nonwords.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/Nonwords.yml rename to base/languages/en-us/.vale/styles/proselint/Nonwords.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/Oxymorons.yml b/base/languages/en-us/.vale/styles/proselint/Oxymorons.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/Oxymorons.yml rename to base/languages/en-us/.vale/styles/proselint/Oxymorons.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/P-Value.yml b/base/languages/en-us/.vale/styles/proselint/P-Value.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/P-Value.yml rename to base/languages/en-us/.vale/styles/proselint/P-Value.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/RASSyndrome.yml b/base/languages/en-us/.vale/styles/proselint/RASSyndrome.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/RASSyndrome.yml rename to base/languages/en-us/.vale/styles/proselint/RASSyndrome.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/README.md b/base/languages/en-us/.vale/styles/proselint/README.md similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/README.md rename to base/languages/en-us/.vale/styles/proselint/README.md diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/Skunked.yml b/base/languages/en-us/.vale/styles/proselint/Skunked.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/Skunked.yml rename to base/languages/en-us/.vale/styles/proselint/Skunked.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/Spelling.yml b/base/languages/en-us/.vale/styles/proselint/Spelling.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/Spelling.yml rename to base/languages/en-us/.vale/styles/proselint/Spelling.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/Typography.yml b/base/languages/en-us/.vale/styles/proselint/Typography.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/Typography.yml rename to base/languages/en-us/.vale/styles/proselint/Typography.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/Uncomparables.yml b/base/languages/en-us/.vale/styles/proselint/Uncomparables.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/Uncomparables.yml rename to base/languages/en-us/.vale/styles/proselint/Uncomparables.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/Very.yml b/base/languages/en-us/.vale/styles/proselint/Very.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/Very.yml rename to base/languages/en-us/.vale/styles/proselint/Very.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/proselint/meta.json b/base/languages/en-us/.vale/styles/proselint/meta.json similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/proselint/meta.json rename to base/languages/en-us/.vale/styles/proselint/meta.json diff --git a/modules/base/modules/languages/en-us/.vale/styles/write-good/Cliches.yml b/base/languages/en-us/.vale/styles/write-good/Cliches.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/write-good/Cliches.yml rename to base/languages/en-us/.vale/styles/write-good/Cliches.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/write-good/E-Prime.yml b/base/languages/en-us/.vale/styles/write-good/E-Prime.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/write-good/E-Prime.yml rename to base/languages/en-us/.vale/styles/write-good/E-Prime.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/write-good/Illusions.yml b/base/languages/en-us/.vale/styles/write-good/Illusions.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/write-good/Illusions.yml rename to base/languages/en-us/.vale/styles/write-good/Illusions.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/write-good/Passive.yml b/base/languages/en-us/.vale/styles/write-good/Passive.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/write-good/Passive.yml rename to base/languages/en-us/.vale/styles/write-good/Passive.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/write-good/README.md b/base/languages/en-us/.vale/styles/write-good/README.md similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/write-good/README.md rename to base/languages/en-us/.vale/styles/write-good/README.md diff --git a/modules/base/modules/languages/en-us/.vale/styles/write-good/So.yml b/base/languages/en-us/.vale/styles/write-good/So.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/write-good/So.yml rename to base/languages/en-us/.vale/styles/write-good/So.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/write-good/ThereIs.yml b/base/languages/en-us/.vale/styles/write-good/ThereIs.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/write-good/ThereIs.yml rename to base/languages/en-us/.vale/styles/write-good/ThereIs.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/write-good/TooWordy.yml b/base/languages/en-us/.vale/styles/write-good/TooWordy.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/write-good/TooWordy.yml rename to base/languages/en-us/.vale/styles/write-good/TooWordy.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/write-good/Weasel.yml b/base/languages/en-us/.vale/styles/write-good/Weasel.yml similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/write-good/Weasel.yml rename to base/languages/en-us/.vale/styles/write-good/Weasel.yml diff --git a/modules/base/modules/languages/en-us/.vale/styles/write-good/meta.json b/base/languages/en-us/.vale/styles/write-good/meta.json similarity index 100% rename from modules/base/modules/languages/en-us/.vale/styles/write-good/meta.json rename to base/languages/en-us/.vale/styles/write-good/meta.json diff --git a/modules/base/modules/languages/en-us/default.nix b/base/languages/en-us/default.nix similarity index 96% rename from modules/base/modules/languages/en-us/default.nix rename to base/languages/en-us/default.nix index 5785e6f..4bb302a 100644 --- a/modules/base/modules/languages/en-us/default.nix +++ b/base/languages/en-us/default.nix @@ -107,7 +107,7 @@ in settings.configPath = vale.directory.configFile; }; }; - excludes = [ "modules/base/modules/languages/en-us/.vale" ]; + excludes = [ "base/languages/en-us/.vale" ]; }; treefmt = { programs.typos = { @@ -115,7 +115,7 @@ in configFile = typos.file.outPath; locale = "en-us"; }; - settings.global.excludes = [ "modules/base/modules/languages/en-us/.vale/*" ]; + settings.global.excludes = [ "base/languages/en-us/.vale/*" ]; }; devshells.default = { # commands = [ diff --git a/modules/base/modules/languages/markdown/default.nix b/base/languages/markdown/default.nix similarity index 100% rename from modules/base/modules/languages/markdown/default.nix rename to base/languages/markdown/default.nix diff --git a/modules/base/modules/languages/nix/default.nix b/base/languages/nix/default.nix similarity index 100% rename from modules/base/modules/languages/nix/default.nix rename to base/languages/nix/default.nix diff --git a/modules/base/modules/languages/toml/default.nix b/base/languages/toml/default.nix similarity index 100% rename from modules/base/modules/languages/toml/default.nix rename to base/languages/toml/default.nix diff --git a/modules/base/modules/languages/yaml/default.nix b/base/languages/yaml/default.nix similarity index 100% rename from modules/base/modules/languages/yaml/default.nix rename to base/languages/yaml/default.nix diff --git a/flake.nix b/flake.nix index f100f63..3e19090 100644 --- a/flake.nix +++ b/flake.nix @@ -39,8 +39,8 @@ { systems = [ "aarch64-linux" ]; imports = [ + ./base inputs.home-manager.flakeModules.home-manager - ./modules ]; flake = { # https://nix-community.github.io/home-manager/options.xhtml diff --git a/modules/base/default.nix b/modules/base/default.nix deleted file mode 100644 index f16951f..0000000 --- a/modules/base/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ ... }: -{ - imports = [ ./modules ]; -} diff --git a/modules/base/modules/default.nix b/modules/base/modules/default.nix deleted file mode 100644 index 66f3daa..0000000 --- a/modules/base/modules/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ ... }: -let - entries = builtins.attrNames (builtins.readDir ./.); - configs = builtins.filter (dir: builtins.pathExists (./. + "/${dir}/default.nix")) entries; -in -{ - imports = builtins.map (name: (./. + "/${name}")) configs; -} diff --git a/modules/default.nix b/modules/default.nix deleted file mode 100644 index 66f3daa..0000000 --- a/modules/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ ... }: -let - entries = builtins.attrNames (builtins.readDir ./.); - configs = builtins.filter (dir: builtins.pathExists (./. + "/${dir}/default.nix")) entries; -in -{ - imports = builtins.map (name: (./. + "/${name}")) configs; -}