pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Revert "Switch to using fish (again), keep root using bash for stability"

Browse source 
This reverts commit ec89edbe6c.

Back to zsh, preferred to fish
This commit is contained in:
Evie Litherland-Smith 2023-11-07 09:19:03 +00:00
parent 5323e880fe
commit 432c4d0d2a
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
flake.nix
View file

@ -25,7 +25,7 @@
user = "xenia"; user = "xenia";
system = "x86_64-linux"; system = "x86_64-linux";
group = "users"; group = "users";
shell = "fish"; shell = "zsh";
systemModules = [ ./system/hyprland.nix ]; systemModules = [ ./system/hyprland.nix ];
homeModules = [ homeModules = [
./home/accounts/default.nix ./home/accounts/default.nix
@ -183,7 +183,7 @@
]; ];
in { in {
root = { root = {
shell = pkgs.bash; shell = pkgs.${shell};
openssh = { inherit authorizedKeys; }; openssh = { inherit authorizedKeys; };
}; };
${user} = { ${user} = {

5
home/default.nix
View file

@ -3,8 +3,6 @@
{ {
programs = { programs = {
bash.enable = true; bash.enable = true;
bat.enable = true;
fish.enable = true;
readline = { readline = {
enable = true; enable = true;
includeSystemConfig = true; includeSystemConfig = true;
@ -21,9 +19,9 @@
fzf = { fzf = {
enable = true; enable = true;
enableBashIntegration = true; enableBashIntegration = true;
enableFishIntegration = true;
enableZshIntegration = true; enableZshIntegration = true;
}; };
bat.enable = true;
git = { git = {
enable = true; enable = true;
package = pkgs.gitFull; package = pkgs.gitFull;
@ -90,7 +88,6 @@
starship = { starship = {
enable = true; enable = true;
enableBashIntegration = true; enableBashIntegration = true;
enableFishIntegration = true;
enableZshIntegration = true; enableZshIntegration = true;
settings = { settings = {
command_timeout = 1000; command_timeout = 1000;