diff --git a/hosts/puter/packages.nix b/hosts/puter/packages.nix index 632721a..3080a08 100644 --- a/hosts/puter/packages.nix +++ b/hosts/puter/packages.nix @@ -21,7 +21,6 @@ gcc python alejandra - starship devenv nodejs mermaid-cli diff --git a/modules/common/shell.nix b/modules/common/shell.nix index d96f41a..287f7bd 100644 --- a/modules/common/shell.nix +++ b/modules/common/shell.nix @@ -1,13 +1,8 @@ -{ - config, - pkgs, - lib, - ... -}: { +{ config, pkgs, lib, ... }: { environment.variables.EDITOR = "nvim"; users.users.user.shell = pkgs.bash; - environment.shells = with pkgs; [bash]; + environment.shells = with pkgs; [ bash ]; programs.bash = { interactiveShellInit = '' if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] @@ -18,7 +13,7 @@ ''; }; programs.fish.enable = true; - programs.starship = { + users.users.user.programs.starship = { enable = true; settings = { add_newline = true;