diff --git a/flake.nix b/flake.nix index 409f350..2da3826 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ }; outputs = { self, nixpkgs, lanzaboote, nix-darwin, disko, jovian, nix-minecraft, ... }@inputs: { - nixosConfigurations.pluto = nixpkgs.lib.nixosSystem { + nixosConfigurations.nijika = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ ./hosts/nixos-common.nix @@ -46,12 +46,12 @@ ./modules/hardware/secureboot.nix lanzaboote.nixosModules.lanzaboote - ./hosts/pluto/configuration.nix + ./hosts/nijika/configuration.nix disko.nixosModules.disko ]; }; - darwinConfigurations.faye = nix-darwin.lib.darwinSystem { + darwinConfigurations.kita = nix-darwin.lib.darwinSystem { system = "aarch64-darwin"; modules = [ ./modules/desktop/fonts.nix @@ -65,7 +65,7 @@ ./modules/nix/darwin.nix ./modules/network/vpn/tailscale.nix - ./hosts/faye/conf.nix + ./hosts/kita/conf.nix ]; }; }; diff --git a/hosts/faye/conf.nix b/hosts/faye/conf.nix deleted file mode 100644 index 6049ca5..0000000 --- a/hosts/faye/conf.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - networking.hostName = "faye"; - networking.computerName = "faye"; -} diff --git a/hosts/kita/conf.nix b/hosts/kita/conf.nix new file mode 100644 index 0000000..27832f0 --- /dev/null +++ b/hosts/kita/conf.nix @@ -0,0 +1,6 @@ +{ config, lib, pkgs, ... }: + +{ + networking.hostName = "kita"; + networking.computerName = "kita"; +} diff --git a/hosts/pluto/configuration.nix b/hosts/nijika/configuration.nix similarity index 96% rename from hosts/pluto/configuration.nix rename to hosts/nijika/configuration.nix index a5c3718..e80eda3 100644 --- a/hosts/pluto/configuration.nix +++ b/hosts/nijika/configuration.nix @@ -7,7 +7,7 @@ ./specialisation.nix ]; - networking.hostName = "pluto"; + networking.hostName = "nijika"; hardware.graphics.enable = true; environment.sessionVariables.LIBVA_DRIVER_NAME = "iHD"; diff --git a/hosts/pluto/disko.nix b/hosts/nijika/disko.nix similarity index 100% rename from hosts/pluto/disko.nix rename to hosts/nijika/disko.nix diff --git a/hosts/pluto/hardware-configuration.nix b/hosts/nijika/hardware-configuration.nix similarity index 100% rename from hosts/pluto/hardware-configuration.nix rename to hosts/nijika/hardware-configuration.nix diff --git a/hosts/pluto/specialisation.nix b/hosts/nijika/specialisation.nix similarity index 100% rename from hosts/pluto/specialisation.nix rename to hosts/nijika/specialisation.nix diff --git a/stow/.zshrc b/stow/.zshrc index 8945d27..9f6a4e2 100644 --- a/stow/.zshrc +++ b/stow/.zshrc @@ -1,7 +1,8 @@ # z shell configuration -export OSICON="?" +OSICON="?" +# set prompt icon if [ -e /System ]; then OSICON="" else @@ -18,7 +19,37 @@ else fi fi -PROMPT="%K{219}%F{black} %~ %K{213} $OSICON %k " +# set prompt colours +HOSTNAME="$(hostname)" + +if [ "$HOSTNAME" = "faye" ]; then + PRIMARY_COLOUR="{red}" + SECONDARY_COLOUR="{yellow}" + TEXT_COLOUR="{black}" + +elif [ "$HOSTNAME" = "bocchi" ]; then + PRIMARY_COLOUR="{magenta}" + SECONDARY_COLOUR="{white}" + TEXT_COLOUR="{black}" + +elif [ "$HOSTNAME" = "ryo" ]; then + PRIMARY_COLOUR="{cyan}" + SECONDARY_COLOUR="{blue}" + TEXT_COLOUR="{black}" + +elif [ "$HOSTNAME" = "nijika" ]; then + PRIMARY_COLOUR="{yellow}" + SECONDARY_COLOUR="{green}" + TEXT_COLOUR="{black}" + +else + PRIMARY_COLOUR="{blue}" + SECONDARY_COLOUR="{red}" + TEXT_COLOUR="{black}" +fi + +PROMPT="%K$PRIMARY_COLOUR%F$TEXT_COLOUR %~ %K$SECONDARY_COLOUR $OSICON %k " +RPROMPT="%F{7}$HOSTNAME" bindkey -e