Compare commits

..

No commits in common. "a671f563758819783f7a98600f284bf3e3f76c33" and "ea0697fc0482f0357abfaf87ce0553999e6b4e41" have entirely different histories.

2 changed files with 38 additions and 28 deletions

View File

@ -75,7 +75,7 @@ in
services.xserver.displayManager.defaultSession = "plasmawayland";
programs.partition-manager.enable = true;
programs.fish.enable = true;
programs.zsh.enable = true;
# use bash shell for other users
environment.shells = with pkgs; [ bash ];
@ -153,14 +153,6 @@ in
environment.systemPackages = (with pkgs; [
(python3.withPackages(python-packages))
fishPlugins.done
fishPlugins.fzf-fish
fishPlugins.forgit
fishPlugins.hydro
fzf
fishPlugins.grc
grc
distrobox
go

View File

@ -24,8 +24,8 @@
"plugdev"
"docker"
];
# use fish
shell = pkgs.fish;
# use zsh
shell = pkgs.zsh;
# ------------------------------------------------------
# user packages
@ -54,6 +54,7 @@
figlet
cowsay
cmatrix
eza
btop
htop
tmux
@ -127,11 +128,7 @@
home-manager.users.servostar = {
home = {
stateVersion = "23.11";
sessionVariables = {
PAGER = "most"; # use most as pager program for man pages (colors!)
EDITOR = "nvim"; # overwrite editor
};
stateVersion = "23.05";
};
programs.vscode = {
enable = true;
@ -151,7 +148,7 @@
};
programs.starship = {
enable = true;
enableFishIntegration = true;
enableZshIntegration = true;
};
programs.kitty = {
enable = true;
@ -167,19 +164,40 @@
xdg.configFile."kitty/tokyonight.conf".source = config/kitty/tokyonight.conf;
# ------------------------------------------------------
# Fish shell
programs.fish = {
# ZSH
programs.zsh = {
enable = true;
interactiveShellInit = ''
set fish_greeting # Disable greeting
autocd = true;
completionInit = "autoload -U compinit";
initExtra = ''
export PAGER="most"
export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=242"
'';
};
programs.eza = {
# Custom keybindings
initExtraFirst = ''
bindkey "^[[1;5C" emacs-forward-word
bindkey "^[[1;5D" emacs-backward-word
'';
enableCompletion = true;
enableAutosuggestions = true;
syntaxHighlighting = {
enable = true;
enableAliases = true;
git = true;
icons = true;
};
shellAliases = {
ls = "eza --icons";
};
history = {
size = 10000;
share = true;
};
zplug = {
enable = true;
plugins = [
{ name = "MichaelAquilina/zsh-you-should-use"; }
{ name = "akash329d/zsh-alias-finder"; }
{ name = "zsh-users/zsh-completions"; }
];
};
};
# ------------------------------------------------------