From c3823d0cfb69e1886013ab4428a734d9784a0073 Mon Sep 17 00:00:00 2001 From: Fiscal Velvet Poet Date: Wed, 10 Jan 2024 01:28:40 +1000 Subject: [PATCH] Correct grammar in the collective's name You know that moment when you're learning a languaged and getting the grammar all wrong? No? Niether do I. resolves #6 --- LICENSE | 2 +- README.rst | 8 ++++---- hardware/linode_vm.nix | 2 +- outputs.nix | 2 +- profiles/bash.nix | 2 +- profiles/hakyll-skeleton.nix | 2 +- profiles/host_common.nix | 2 +- profiles/neovim.nix | 28 ++++++++++++++-------------- profiles/reciproka-forgejo.nix | 4 ++-- profiles/reciproka-web.nix | 2 +- profiles/server_common.nix | 2 +- profiles/users.nix | 2 +- profiles/zsh.nix | 2 +- 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/LICENSE b/LICENSE index 38fca60..35f8b33 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ ANARCHIST LICENSE Version 1.0, 1 May, 2021 -Copyright © 2023 Reciproka Kolectiva +Copyright © 2024 Reciproka Kolektivo This is Anarchist software, released for free use by individuals and organizations that do not operate by capitalist principles. diff --git a/README.rst b/README.rst index c7d51d7..b66c356 100644 --- a/README.rst +++ b/README.rst @@ -1,10 +1,10 @@ -Reciproka Ops -============= +Reciproka Kolektivo Ops +======================= -Colmena_ deployment configuration for services hosted by `Reciproka Kolectiva`_ services. +Colmena_ deployment configuration for services hosted by `Reciproka Kolektivo`_ services. The canonical home for this repo is https://reciproka.dev/reciproka/reciproka-ops .. _Colmena: https://colmena.cli.rs/ -.. _Reciproka Kolectiva: https://reciproka.co/ +.. _Reciproka Kolektivo: https://reciproka.co/ diff --git a/hardware/linode_vm.nix b/hardware/linode_vm.nix index 38719ef..da68358 100644 --- a/hardware/linode_vm.nix +++ b/hardware/linode_vm.nix @@ -1,4 +1,4 @@ -# Configuration common to all Reciproka Kolectiva Linode VMs +# Configuration common to all Reciproka Kolektivo Linode VMs { config, pkgs, diff --git a/outputs.nix b/outputs.nix index 9418deb..0da9cdf 100644 --- a/outputs.nix +++ b/outputs.nix @@ -25,7 +25,7 @@ in { // { colmena = { meta = { - description = "NixOS deployment for Reciproka Kolectiva"; + description = "NixOS deployment for Reciproka Kolektivo"; name = "reciproka-ops"; nixpkgs = import nixpkgs { system = "x86_64-linux"; diff --git a/profiles/bash.nix b/profiles/bash.nix index c2abfec..5a255b7 100644 --- a/profiles/bash.nix +++ b/profiles/bash.nix @@ -1,4 +1,4 @@ -# Configuration common to all Reciproka Kolectiva servers +# Configuration common to all Reciproka Kolektivo servers {config, ...}: { # Program defaults for all hosts programs.bash = { diff --git a/profiles/hakyll-skeleton.nix b/profiles/hakyll-skeleton.nix index 5f53a1a..45dde3f 100644 --- a/profiles/hakyll-skeleton.nix +++ b/profiles/hakyll-skeleton.nix @@ -1,4 +1,4 @@ -# NixOS configuration for deploying the Reciproka Kolectiva website +# NixOS configuration for deploying the Reciproka Kolektivo website { self, config, diff --git a/profiles/host_common.nix b/profiles/host_common.nix index 82237a8..87a7129 100644 --- a/profiles/host_common.nix +++ b/profiles/host_common.nix @@ -1,4 +1,4 @@ -# Configuration common to all Reciproka Kolectiva servers +# Configuration common to all Reciproka Kolektivo servers { config, pkgs, diff --git a/profiles/neovim.nix b/profiles/neovim.nix index 1dd17e1..012794e 100644 --- a/profiles/neovim.nix +++ b/profiles/neovim.nix @@ -157,7 +157,7 @@ set undodir=/tmp/.vim-undo-dir set undofile - " Reciproka Kolectiva Markdown environment + " Reciproka Kolektivo Markdown environment function! MarkdownSettings() set textwidth=79 set spell spelllang=en_au @@ -165,7 +165,7 @@ autocmd BufNewFile,BufFilePre,BufRead *.mdwn :call MarkdownSettings() autocmd BufNewFile,BufFilePre,BufRead *.md :call MarkdownSettings() - " Reciproka Kolectiva ReStructured Text environment + " Reciproka Kolektivo ReStructured Text environment function! ReStructuredSettings() set textwidth=79 set spell spelllang=en_au @@ -176,14 +176,14 @@ autocmd BufNewFile,BufFilePre,BufRead *.rst :call ReStructuredSettings() autocmd BufNewFile,BufFilePre,BufRead *.txt :call ReStructuredSettings() - " Reciproka Kolectiva LaTeX environment: + " Reciproka Kolektivo LaTeX environment: function! LaTeXSettings() set textwidth=79 set spell spelllang=en_au endfunction autocmd BufNewFile,BufFilePre,BufRead *.tex :call LaTeXSettings() - " Settings for Reciproka Kolectiva Haskell environment: + " Settings for Reciproka Kolektivo Haskell environment: function! HaskellSettings() set tabstop=2 set shiftwidth=2 @@ -192,7 +192,7 @@ endfunction autocmd BufNewFile,BufFilePre,BufRead *.hs :call HaskellSettings() - " Settings for Reciproka Kolectiva Nix environment: + " Settings for Reciproka Kolektivo Nix environment: function! NixSettings() set tabstop=2 set shiftwidth=2 @@ -202,7 +202,7 @@ endfunction autocmd BufNewFile,BufFilePre,BufRead *.nix :call NixSettings() - " Settings for Reciproka Kolectiva Cue environment: + " Settings for Reciproka Kolektivo Cue environment: function! CueSettings() set noexpandtab set tabstop=2 @@ -212,7 +212,7 @@ endfunction autocmd BufNewFile,BufFilePre,BufRead *.cue :call CueSettings() - " Settings for Reciproka Kolectiva Rust environment: + " Settings for Reciproka Kolektivo Rust environment: function! RustSettings() set tabstop=4 set shiftwidth=4 @@ -222,7 +222,7 @@ endfunction autocmd BufNewFile,BufFilePre,BufRead *.rs :call RustSettings() - " Settings for Reciproka Kolectiva Crystal environment: + " Settings for Reciproka Kolektivo Crystal environment: function! CrystalSettings() set tabstop=2 set shiftwidth=2 @@ -232,7 +232,7 @@ endfunction autocmd BufNewFile,BufFilePre,BufRead *.cr :call CrystalSettings() - " Settings for Reciproka Kolectiva Golang environment: + " Settings for Reciproka Kolektivo Golang environment: function! GoSettings() set tabstop=7 set shiftwidth=7 @@ -240,7 +240,7 @@ endfunction autocmd BufNewFile,BufFilePre,BufRead *.go :call GoSettings() - " Settings for Reciproka Kolectiva Python environment: + " Settings for Reciproka Kolektivo Python environment: function! PythonSettings() set tabstop=4 set shiftwidth=4 @@ -250,7 +250,7 @@ endfunction autocmd BufNewFile,BufFilePre,BufRead *.py :call PythonSettings() - " Reciproka Kolectiva Mutt environment + " Reciproka Kolektivo Mutt environment function! MuttSettings() set textwidth=79 set spell spelllang=en_au @@ -261,7 +261,7 @@ autocmd BufNewFile,BufFilePre,BufRead mutt-* :call MuttSettings() autocmd BufNewFile,BufFilePre,BufRead neomutt-* :call MuttSettings() - " Settings for Reciproka Kolectiva C environment: + " Settings for Reciproka Kolektivo C environment: function! CSettings() set tabstop=2 set shiftwidth=2 @@ -270,7 +270,7 @@ endfunction autocmd BufNewFile,BufFilePre,BufRead *.c :call CSettings() - " Settings for Reciproka Kolectiva YAML environment: + " Settings for Reciproka Kolektivo YAML environment: function! YAMLSettings() set tabstop=2 set shiftwidth=2 @@ -284,7 +284,7 @@ autocmd BufNewFile,BufFilePre,BufRead *.yaml :call YAMLSettings() autocmd BufNewFile,BufFilePre,BufRead *.yml :call YAMLSettings() - " Settings for Reciproka Kolectiva Bash environment: + " Settings for Reciproka Kolektivo Bash environment: function! BashSettings() set tabstop=4 set shiftwidth=4 diff --git a/profiles/reciproka-forgejo.nix b/profiles/reciproka-forgejo.nix index 47a805b..283179d 100644 --- a/profiles/reciproka-forgejo.nix +++ b/profiles/reciproka-forgejo.nix @@ -1,4 +1,4 @@ -# Nix configuration for the Reciproka Forgejo service +# Nix configuration for the Reciproka Kolectivo Forgejo service { config, pkgs, @@ -10,7 +10,7 @@ in { services.forgejo = { enable = true; # Enable Forgejo - appName = "Reciproka Kolectiva: Forgejo Service"; # Give the site a name + appName = "Reciproka Kolektivo: Forgejo Service"; # Give the site a name database = { type = "postgres"; # Database type passwordFile = config.age.secrets.forgejo.path; diff --git a/profiles/reciproka-web.nix b/profiles/reciproka-web.nix index 7226242..05d9449 100644 --- a/profiles/reciproka-web.nix +++ b/profiles/reciproka-web.nix @@ -1,4 +1,4 @@ -# Nix configuration for deploying the Reciproka Kolectiva website +# Nix configuration for deploying the Reciproka Kolektivo website { self, config, diff --git a/profiles/server_common.nix b/profiles/server_common.nix index 833aa8e..65a924b 100644 --- a/profiles/server_common.nix +++ b/profiles/server_common.nix @@ -1,4 +1,4 @@ -# Configuration common to all Reciproka Kolectiva servers +# Configuration common to all Reciproka Kolektivo servers { config, pkgs, diff --git a/profiles/users.nix b/profiles/users.nix index 1a0ee9d..4b0f7c1 100644 --- a/profiles/users.nix +++ b/profiles/users.nix @@ -1,4 +1,4 @@ -# User configuration common to all Reciproka Kolectiva servers +# User configuration common to all Reciproka Kolektivo servers { config, pkgs, diff --git a/profiles/zsh.nix b/profiles/zsh.nix index 826fdc2..c9cf880 100644 --- a/profiles/zsh.nix +++ b/profiles/zsh.nix @@ -1,4 +1,4 @@ -# Configuration common to all Reciproka Kolectiva servers +# Configuration common to all Reciproka Kolektivo servers { config, pkgs,