chore: rename chloe -> clover, julia -> fish

names are fun. for a few weeks i've been presenting publicly with the
name 'clover', and i like it a lot. for me it's sort of a name tier,
where friends can call me chloe for short, but my full name is clover.
(and for people very close to me, there's more names to unlock).

julia to fish is from a misunderstanding. i used the name julia with her
a lot because it sounded more like a usual name, so i assumed it was.
but no, that's just a nickname. an extra option. her preferred name is
fish. simple as. i am sorry for this confusion.
This commit is contained in:
clover caruso 2025-08-18 00:44:21 -07:00
parent 13f07b32b0
commit 38a0ff6959
18 changed files with 17 additions and 24 deletions

View file

@ -1,3 +1,3 @@
# To learn more about git's mailmap: https://ntietz.com/blog/git-mailmap-for-name-changes
chloe caruso <git@paperclover.net> <git@paperclover.net>
clover caruso <git@paperclover.net> <git@paperclover.net>
Natalie Marks <nmarks413@gmail.com> <nmarks413@gmail.com>

View file

@ -97,9 +97,9 @@
packages = forAllSystems (
{ system, pkgs, ... }:
{
nvim-chloe = mkNeovim "chloe" pkgs;
nvim-clover = mkNeovim "clover" pkgs;
nvim-fish = mkNeovim "fish" pkgs;
nvim-natalie = mkNeovim "natalie" pkgs;
nvim-julia = mkNeovim "julia" pkgs;
inherit (pkgs) autofmt;
}
@ -122,22 +122,22 @@
system = "aarch64-darwin";
};
# chloe's mac studio "sandwich"
# clover's mac studio "sandwich"
darwinConfigurations.sandwich = mkSystem "sandwich" {
user = "chloe";
user = "clover";
host = "sandwich";
system = "aarch64-darwin";
};
# chloe's macbook air "paperback"
# clover's macbook air "paperback"
darwinConfigurations.paperback = mkSystem "paperback" {
user = "chloe";
user = "clover";
host = "paperback";
system = "aarch64-darwin";
};
# julia's cattop
# fish's cattop
nixosConfigurations.cattop = mkSystem "cattop" {
user = "julia";
user = "fish";
host = "cattop";
system = "x86_64-linux";
};

4
nvim
View file

@ -1,11 +1,11 @@
#!/bin/sh
username="$(id -u -n)"
if [ "$username" = "clo" ]; then
name="chloe"
name="clover"
elif [ "$username" = "nmarks" ]; then
name="natalie"
elif [ "$username" = "fish" ]; then
name="julia"
name="fish"
fi
if [ -z "$name" ]; then
echo "Configure this wrapper script with your name." >&2

View file

@ -1,7 +1,7 @@
# nix config
this setup allows natalie and chloe to share common configuration between their
machines, but also share useful modules between each other.
this setup allows natalie, clover, and more to share common configuration
between their machines, but also share useful modules between each other.
```
lib/ # reusable functions
@ -12,7 +12,7 @@ modules/ # reusable modules
+-- nixos/ # linux configurations
+-- shared/ # shared between nixos-rebuild & darwin-rebuild
users/
+-- chloe/
+-- clover/
| +-- user.nix # info about her
| +-- configuration.nix # for all hosts (system)
| +-- home.nix # for all hosts (userspace)

View file

@ -1,4 +1,4 @@
# Configuration applied to all of chloe's machines
# Configuration applied to all of clover's machines
{ pkgs, ... }:
{
# packages for all machines

View file

@ -1,18 +1,11 @@
# This definition is used by modules to customize as needed.
{
username = "clo"; # username
name = "chloe caruso";
name = "clover caruso";
email = "account@paperclover.net";
timeZone = "America/Los_Angeles";
dotfilesDir = "~/config"; # absolute path of the local repo
# Stylix/Theming
theme = null;
#font
sexuality = "lesbian"; # hyfetch
# Default terminal command. NOTE: ghostty is not installed for you
term = "ghostty"; # preferred $TERMINAL
editor = "nvim"; # preferred $EDITOR
}

View file

@ -1,6 +1,6 @@
rec {
username = "fish"; # username
name = "Julia"; # name/identifier
name = "Fish"; # name/identifier
email = "fish@fishcat.fish"; # email (used for certain configurations)
dotfilesDir = "~/config"; # absolute path of the local repo
theme = "catppuccin-mocha"; # name of theme that stylix will use