aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrankie B <git@diskfloppy.me>2023-07-11 21:50:57 +0100
committerFrankie B <git@diskfloppy.me>2023-07-11 21:50:57 +0100
commit70dd415c8e053721186ee1834a4abda0770405bc (patch)
treedae2a51f1043ee606bb77353f630947ac986096a
parentab73790c6dd54d62724949dd85644e7e9e2d3f9c (diff)
Change from fish to zsh with p10k
-rw-r--r--homes/floppydisk/default.nix37
-rw-r--r--hosts/nixbox/configuration.nix4
-rw-r--r--hosts/nixpad/configuration.nix4
3 files changed, 36 insertions, 9 deletions
diff --git a/homes/floppydisk/default.nix b/homes/floppydisk/default.nix
index dbf60c3..855515d 100644
--- a/homes/floppydisk/default.nix
+++ b/homes/floppydisk/default.nix
@@ -119,6 +119,9 @@
vlc
libsForQt5.vvave
tidal-hifi
+
+ # zsh Themes
+ zsh-powerlevel10k
];
};
@@ -127,12 +130,36 @@
# Enable home-manager
home-manager.enable = true;
- # Enable fish shell
- fish = {
+ # Enable z-shell
+ zsh = {
enable = true;
- interactiveShellInit = ''
- set fish_greeting # Disable fish_greeting
- export GPG_TTY=$(tty)
+ shellAliases = {
+ ls = "lsd";
+ ll = "ls -l";
+ la = "ls -la";
+ };
+ history = {
+ size = 10000;
+ path = "$HOME/.config/zsh/history";
+ };
+ oh-my-zsh = {
+ enable = true;
+ plugins = [
+ "git"
+ "thefuck"
+ ];
+ custom = "$HOME/.oh-my-custom";
+ theme = "powerlevel10k/powerlevel10k";
+ };
+ plugins = [
+ {
+ name = "powerlevel10k";
+ src = pkgs.zsh-powerlevel10k;
+ file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
+ }
+ ];
+ initExtra = ''
+ source ~/.p10k.zsh
'';
};
diff --git a/hosts/nixbox/configuration.nix b/hosts/nixbox/configuration.nix
index e66b634..d47d768 100644
--- a/hosts/nixbox/configuration.nix
+++ b/hosts/nixbox/configuration.nix
@@ -102,7 +102,7 @@
# thunderbird
];
initialPassword = "changeme";
- shell = pkgs.fish;
+ shell = pkgs.zsh;
};
# Allow unfree packages
@@ -139,7 +139,7 @@
jetbrains-mono
];
- programs.fish.enable = true;
+ programs.zsh.enable = true;
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
diff --git a/hosts/nixpad/configuration.nix b/hosts/nixpad/configuration.nix
index d24216b..115c941 100644
--- a/hosts/nixpad/configuration.nix
+++ b/hosts/nixpad/configuration.nix
@@ -99,7 +99,7 @@
teams
];
initialPassword = "changeme";
- shell = pkgs.fish;
+ shell = pkgs.zsh;
};
# Allow unfree packages
@@ -122,7 +122,7 @@
jetbrains-mono
];
- programs.fish.enable = true;
+ programs.zsh.enable = true;
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.