From 38a0ff695984d5ff685869202c3892448cf4a0ac Mon Sep 17 00:00:00 2001 From: chloe caruso Date: Mon, 18 Aug 2025 00:44:21 -0700 Subject: [PATCH] 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. --- .mailmap | 2 +- flake.nix | 16 ++++++++-------- nvim | 4 ++-- readme.md | 6 +++--- users/{chloe => clover}/configuration.nix | 2 +- users/{chloe => clover}/home.nix | 0 .../paperback/configuration.nix | 0 users/{chloe => clover}/paperback/home.nix | 0 .../{chloe => clover}/sandwich/configuration.nix | 0 users/{chloe => clover}/user.nix | 9 +-------- users/{chloe => clover}/vim.nix | 0 users/{julia => fish}/cattop/configuration.nix | 0 .../cattop/hardware-configuration.nix | 0 users/{julia => fish}/cattop/home.nix | 0 users/{julia => fish}/cattop/home.nix.old | 0 users/{julia => fish}/configuration.nix | 0 users/{julia => fish}/user.nix | 2 +- users/{julia => fish}/vim.nix | 0 18 files changed, 17 insertions(+), 24 deletions(-) rename users/{chloe => clover}/configuration.nix (94%) rename users/{chloe => clover}/home.nix (100%) rename users/{chloe => clover}/paperback/configuration.nix (100%) rename users/{chloe => clover}/paperback/home.nix (100%) rename users/{chloe => clover}/sandwich/configuration.nix (100%) rename users/{chloe => clover}/user.nix (71%) rename users/{chloe => clover}/vim.nix (100%) rename users/{julia => fish}/cattop/configuration.nix (100%) rename users/{julia => fish}/cattop/hardware-configuration.nix (100%) rename users/{julia => fish}/cattop/home.nix (100%) rename users/{julia => fish}/cattop/home.nix.old (100%) rename users/{julia => fish}/configuration.nix (100%) rename users/{julia => fish}/user.nix (93%) rename users/{julia => fish}/vim.nix (100%) diff --git a/.mailmap b/.mailmap index e386ca3bd8d2c2c5243c60eca9fb27fcd0db795c..86cc929ac8eb7d898915998e44f64260bdfa92e0 100644 --- a/.mailmap +++ b/.mailmap @@ -1,3 +1,3 @@ # To learn more about git's mailmap: https://ntietz.com/blog/git-mailmap-for-name-changes -chloe caruso +clover caruso Natalie Marks diff --git a/flake.nix b/flake.nix index 8f40bd9ed49461870591c375968181f6fa8e5448..24e6c7d79ea873ac00f2801c9d9e13a37620da4a 100644 --- a/flake.nix +++ b/flake.nix @@ -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"; }; diff --git a/nvim b/nvim index 417714be8887b7a6f653ffd31474bcb550dbb2ea..9301a343a48c8477771cbaea7b0281277964a5ba 100755 --- a/nvim +++ b/nvim @@ -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 diff --git a/readme.md b/readme.md index 7c7416d44e70df0ed578b1f085592798c93561a1..8a9bd5e518e42d1f5ee2c71a345842dd6bf26540 100644 --- a/readme.md +++ b/readme.md @@ -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) diff --git a/users/chloe/configuration.nix b/users/clover/configuration.nix similarity index 94% rename from users/chloe/configuration.nix rename to users/clover/configuration.nix index aa0b4855f6ea0301a2e97d15bacfbf7ac5456ec4..103b011a987ed79def16b4bae7aef256192e681d 100644 --- a/users/chloe/configuration.nix +++ b/users/clover/configuration.nix @@ -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 diff --git a/users/chloe/home.nix b/users/clover/home.nix similarity index 100% rename from users/chloe/home.nix rename to users/clover/home.nix diff --git a/users/chloe/paperback/configuration.nix b/users/clover/paperback/configuration.nix similarity index 100% rename from users/chloe/paperback/configuration.nix rename to users/clover/paperback/configuration.nix diff --git a/users/chloe/paperback/home.nix b/users/clover/paperback/home.nix similarity index 100% rename from users/chloe/paperback/home.nix rename to users/clover/paperback/home.nix diff --git a/users/chloe/sandwich/configuration.nix b/users/clover/sandwich/configuration.nix similarity index 100% rename from users/chloe/sandwich/configuration.nix rename to users/clover/sandwich/configuration.nix diff --git a/users/chloe/user.nix b/users/clover/user.nix similarity index 71% rename from users/chloe/user.nix rename to users/clover/user.nix index 284592d7f6f6a36b7441b3911bafd2298cdd338d..e76aec6abba1dc2ba7c1e2b574aa089ad0057b73 100644 --- a/users/chloe/user.nix +++ b/users/clover/user.nix @@ -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 } diff --git a/users/chloe/vim.nix b/users/clover/vim.nix similarity index 100% rename from users/chloe/vim.nix rename to users/clover/vim.nix diff --git a/users/julia/cattop/configuration.nix b/users/fish/cattop/configuration.nix similarity index 100% rename from users/julia/cattop/configuration.nix rename to users/fish/cattop/configuration.nix diff --git a/users/julia/cattop/hardware-configuration.nix b/users/fish/cattop/hardware-configuration.nix similarity index 100% rename from users/julia/cattop/hardware-configuration.nix rename to users/fish/cattop/hardware-configuration.nix diff --git a/users/julia/cattop/home.nix b/users/fish/cattop/home.nix similarity index 100% rename from users/julia/cattop/home.nix rename to users/fish/cattop/home.nix diff --git a/users/julia/cattop/home.nix.old b/users/fish/cattop/home.nix.old similarity index 100% rename from users/julia/cattop/home.nix.old rename to users/fish/cattop/home.nix.old diff --git a/users/julia/configuration.nix b/users/fish/configuration.nix similarity index 100% rename from users/julia/configuration.nix rename to users/fish/configuration.nix diff --git a/users/julia/user.nix b/users/fish/user.nix similarity index 93% rename from users/julia/user.nix rename to users/fish/user.nix index edb5aeaa3bf8c240b32728cd167ea92061fb8e42..f515195d33940a28ddd793d7a1c121f8987e4e2e 100644 --- a/users/julia/user.nix +++ b/users/fish/user.nix @@ -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 diff --git a/users/julia/vim.nix b/users/fish/vim.nix similarity index 100% rename from users/julia/vim.nix rename to users/fish/vim.nix -- 2.54.0