diff --git a/flake.nix b/flake.nix index ae039c0..cd59b09 100644 --- a/flake.nix +++ b/flake.nix @@ -55,7 +55,7 @@ }; homeConfigurations = { - "willow@dahlia" = home-manager.lib.homeManagerConfiguration { + "apr@dahlia" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages."x86_64-linux"; extraSpecialArgs = { inherit inputs; @@ -67,7 +67,7 @@ ]; }; - "willow@ivy" = home-manager.lib.homeManagerConfiguration { + "apr@ivy" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages."x86_64-linux"; extraSpecialArgs = { inherit inputs; diff --git a/home/apr-dahlia.nix b/home/apr-dahlia.nix index 88801a2..7c8d0ec 100644 --- a/home/apr-dahlia.nix +++ b/home/apr-dahlia.nix @@ -43,8 +43,8 @@ in }; home = { - username = "willow"; - homeDirectory = "/home/willow"; + username = "apr"; + homeDirectory = "/home/apr"; stateVersion = "25.11"; sessionVariables = { @@ -63,7 +63,7 @@ in }; file.".ssh/allowed_signers".text = '' - willow ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPWD6wk95qNhk/36vEH34qIRp/TPCcQ+D+u5Xd9/N0m1 + apr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPWD6wk95qNhk/36vEH34qIRp/TPCcQ+D+u5Xd9/N0m1 did:web:vt3e.cat ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGDXt8vkpi9jOp9dCjoS8u0dC4fDdgb73w8z7VNI42FB did:plc:nz5npphohxgjo2blfipdatam ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINGmmVCj5fvjT09SMmMsheGJ9vMKRF1UWoTEwR7yWeKO ''; diff --git a/hosts/common/users.nix b/hosts/common/users.nix index 996ffdf..59a51da 100644 --- a/hosts/common/users.nix +++ b/hosts/common/users.nix @@ -4,7 +4,8 @@ mutableUsers = false; users = { - willow = { + apr = { + uid = 1001; initialPassword = "pass"; isNormalUser = true; extraGroups = [ diff --git a/hosts/dahlia/default.nix b/hosts/dahlia/default.nix index e308052..c6fc3cb 100644 --- a/hosts/dahlia/default.nix +++ b/hosts/dahlia/default.nix @@ -32,7 +32,7 @@ hostName = "192.168.1.107"; system = "x86_64-linux"; protocol = "ssh-ng"; - sshUser = "willow"; + sshUser = "apr"; sshKey = "/etc/nix/id_builder"; maxJobs = 20; @@ -55,7 +55,7 @@ home-manager = { extraSpecialArgs = { inherit inputs; }; users = { - willow = import ../../home/apr-dahlia.nix; + apr = import ../../home/apr-dahlia.nix; }; useGlobalPkgs = true; useUserPackages = true; diff --git a/hosts/ivy/default.nix b/hosts/ivy/default.nix index 449b237..15d8069 100644 --- a/hosts/ivy/default.nix +++ b/hosts/ivy/default.nix @@ -14,7 +14,7 @@ nix.settings.trusted-users = [ "root" "@wheel" - "willow" + "apr" ]; boot = { diff --git a/pkgs/zed.nix b/pkgs/zed.nix index 9e726b6..6c143d9 100644 --- a/pkgs/zed.nix +++ b/pkgs/zed.nix @@ -86,6 +86,6 @@ stdenv.mkDerivation rec { homepage = "https://zed.dev"; platforms = [ "x86_64-linux" ]; license = licenses.mit; - maintainers = with maintainers; [ willow ]; + maintainers = with maintainers; [ apr ]; }; }