Revert "Switch to using fish (again), keep root using bash for stability"
This reverts commit ec89edbe6c
.
Back to zsh, preferred to fish
This commit is contained in:
parent
5323e880fe
commit
432c4d0d2a
|
@ -25,7 +25,7 @@
|
|||
user = "xenia";
|
||||
system = "x86_64-linux";
|
||||
group = "users";
|
||||
shell = "fish";
|
||||
shell = "zsh";
|
||||
systemModules = [ ./system/hyprland.nix ];
|
||||
homeModules = [
|
||||
./home/accounts/default.nix
|
||||
|
@ -183,7 +183,7 @@
|
|||
];
|
||||
in {
|
||||
root = {
|
||||
shell = pkgs.bash;
|
||||
shell = pkgs.${shell};
|
||||
openssh = { inherit authorizedKeys; };
|
||||
};
|
||||
${user} = {
|
||||
|
|
|
@ -3,8 +3,6 @@
|
|||
{
|
||||
programs = {
|
||||
bash.enable = true;
|
||||
bat.enable = true;
|
||||
fish.enable = true;
|
||||
readline = {
|
||||
enable = true;
|
||||
includeSystemConfig = true;
|
||||
|
@ -21,9 +19,9 @@
|
|||
fzf = {
|
||||
enable = true;
|
||||
enableBashIntegration = true;
|
||||
enableFishIntegration = true;
|
||||
enableZshIntegration = true;
|
||||
};
|
||||
bat.enable = true;
|
||||
git = {
|
||||
enable = true;
|
||||
package = pkgs.gitFull;
|
||||
|
@ -90,7 +88,6 @@
|
|||
starship = {
|
||||
enable = true;
|
||||
enableBashIntegration = true;
|
||||
enableFishIntegration = true;
|
||||
enableZshIntegration = true;
|
||||
settings = {
|
||||
command_timeout = 1000;
|
||||
|
|
Loading…
Reference in a new issue