From 4c2b988996d382945bd2bbcd196ebdfd45c37d13 Mon Sep 17 00:00:00 2001 From: soraefir Date: Sat, 25 Nov 2023 14:40:38 +0100 Subject: [PATCH] [m]Devshell envar name change --- modules/home/cli/starship/default.nix | 2 +- shells/default.nix | 26 +++++++++++++------------- shells/devsh/default.nix | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/home/cli/starship/default.nix b/modules/home/cli/starship/default.nix index a4b60a1..d5d86f8 100755 --- a/modules/home/cli/starship/default.nix +++ b/modules/home/cli/starship/default.nix @@ -51,7 +51,7 @@ "pictures" = " "; }; env_var = { - variable = "DEVSH"; + variable = "SHELLENVTYPE"; default = ""; style = "bg:#${config.colorScheme.colors.base04} fg:#${config.colorScheme.colors.base00}"; diff --git a/shells/default.nix b/shells/default.nix index 57aec30..e601034 100644 --- a/shells/default.nix +++ b/shells/default.nix @@ -1,13 +1,13 @@ -{ inputs, ... }: -let - forEachSystem = - inputs.nixpkgs.lib.genAttrs [ "aarch64-linux" "x86_64-linux" ]; -in forEachSystem (system: - let - overlays = import ../overlays { inherit pkgs; }; - overrides = { custom = import ../pkgs { inherit pkgs; }; }; - pkgs = import inputs.nixpkgs { inherit system overlays; } // overrides; - in { - default = import ./devsh { inherit pkgs; }; - devsh = import ./devsh { inherit pkgs; }; - }) +{ inputs, ... }: +let + forEachSystem = + inputs.nixpkgs.lib.genAttrs [ "aarch64-linux" "x86_64-linux" ]; +in forEachSystem (system: + let + overlays = import ../overlays { inherit pkgs; }; + overrides = { custom = import ../pkgs { inherit pkgs; }; }; + pkgs = import inputs.nixpkgs { inherit system overlays; } // overrides; + in { + default = import ./devsh { inherit pkgs; }; + devsh = import ./devsh { inherit pkgs; }; + }) diff --git a/shells/devsh/default.nix b/shells/devsh/default.nix index a9eaabb..ea104b2 100644 --- a/shells/devsh/default.nix +++ b/shells/devsh/default.nix @@ -40,7 +40,7 @@ pkgs.mkShell { #CUSTOM (custom...) ]; shellHook = '' - export DEVSH="DEV" + export SHELLENVTYPE="DEV" export HTTP_PORT=8080 export HTTP_ADDR="0.0.0.0" '';