Compare commits
No commits in common. "a671f563758819783f7a98600f284bf3e3f76c33" and "ea0697fc0482f0357abfaf87ce0553999e6b4e41" have entirely different histories.
a671f56375
...
ea0697fc04
|
@ -75,7 +75,7 @@ in
|
||||||
services.xserver.displayManager.defaultSession = "plasmawayland";
|
services.xserver.displayManager.defaultSession = "plasmawayland";
|
||||||
|
|
||||||
programs.partition-manager.enable = true;
|
programs.partition-manager.enable = true;
|
||||||
programs.fish.enable = true;
|
programs.zsh.enable = true;
|
||||||
|
|
||||||
# use bash shell for other users
|
# use bash shell for other users
|
||||||
environment.shells = with pkgs; [ bash ];
|
environment.shells = with pkgs; [ bash ];
|
||||||
|
@ -153,14 +153,6 @@ in
|
||||||
environment.systemPackages = (with pkgs; [
|
environment.systemPackages = (with pkgs; [
|
||||||
(python3.withPackages(python-packages))
|
(python3.withPackages(python-packages))
|
||||||
|
|
||||||
fishPlugins.done
|
|
||||||
fishPlugins.fzf-fish
|
|
||||||
fishPlugins.forgit
|
|
||||||
fishPlugins.hydro
|
|
||||||
fzf
|
|
||||||
fishPlugins.grc
|
|
||||||
grc
|
|
||||||
|
|
||||||
distrobox
|
distrobox
|
||||||
|
|
||||||
go
|
go
|
||||||
|
|
|
@ -24,8 +24,8 @@
|
||||||
"plugdev"
|
"plugdev"
|
||||||
"docker"
|
"docker"
|
||||||
];
|
];
|
||||||
# use fish
|
# use zsh
|
||||||
shell = pkgs.fish;
|
shell = pkgs.zsh;
|
||||||
|
|
||||||
# ------------------------------------------------------
|
# ------------------------------------------------------
|
||||||
# user packages
|
# user packages
|
||||||
|
@ -54,6 +54,7 @@
|
||||||
figlet
|
figlet
|
||||||
cowsay
|
cowsay
|
||||||
cmatrix
|
cmatrix
|
||||||
|
eza
|
||||||
btop
|
btop
|
||||||
htop
|
htop
|
||||||
tmux
|
tmux
|
||||||
|
@ -127,11 +128,7 @@
|
||||||
|
|
||||||
home-manager.users.servostar = {
|
home-manager.users.servostar = {
|
||||||
home = {
|
home = {
|
||||||
stateVersion = "23.11";
|
stateVersion = "23.05";
|
||||||
sessionVariables = {
|
|
||||||
PAGER = "most"; # use most as pager program for man pages (colors!)
|
|
||||||
EDITOR = "nvim"; # overwrite editor
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
programs.vscode = {
|
programs.vscode = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -151,7 +148,7 @@
|
||||||
};
|
};
|
||||||
programs.starship = {
|
programs.starship = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableFishIntegration = true;
|
enableZshIntegration = true;
|
||||||
};
|
};
|
||||||
programs.kitty = {
|
programs.kitty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -167,19 +164,40 @@
|
||||||
xdg.configFile."kitty/tokyonight.conf".source = config/kitty/tokyonight.conf;
|
xdg.configFile."kitty/tokyonight.conf".source = config/kitty/tokyonight.conf;
|
||||||
|
|
||||||
# ------------------------------------------------------
|
# ------------------------------------------------------
|
||||||
# Fish shell
|
# ZSH
|
||||||
programs.fish = {
|
programs.zsh = {
|
||||||
|
enable = true;
|
||||||
|
autocd = true;
|
||||||
|
completionInit = "autoload -U compinit";
|
||||||
|
initExtra = ''
|
||||||
|
export PAGER="most"
|
||||||
|
export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=242"
|
||||||
|
'';
|
||||||
|
# Custom keybindings
|
||||||
|
initExtraFirst = ''
|
||||||
|
bindkey "^[[1;5C" emacs-forward-word
|
||||||
|
bindkey "^[[1;5D" emacs-backward-word
|
||||||
|
'';
|
||||||
|
enableCompletion = true;
|
||||||
|
enableAutosuggestions = true;
|
||||||
|
syntaxHighlighting = {
|
||||||
enable = true;
|
enable = true;
|
||||||
interactiveShellInit = ''
|
};
|
||||||
set fish_greeting # Disable greeting
|
shellAliases = {
|
||||||
'';
|
ls = "eza --icons";
|
||||||
};
|
};
|
||||||
|
history = {
|
||||||
programs.eza = {
|
size = 10000;
|
||||||
|
share = true;
|
||||||
|
};
|
||||||
|
zplug = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableAliases = true;
|
plugins = [
|
||||||
git = true;
|
{ name = "MichaelAquilina/zsh-you-should-use"; }
|
||||||
icons = true;
|
{ name = "akash329d/zsh-alias-finder"; }
|
||||||
|
{ name = "zsh-users/zsh-completions"; }
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# ------------------------------------------------------
|
# ------------------------------------------------------
|
||||||
|
|
Loading…
Reference in New Issue