feat: use zsh

This commit is contained in:
2024-04-07 13:27:58 +02:00
parent 1770ba725f
commit 136cf83105
6 changed files with 1739 additions and 26 deletions

View File

@@ -1,9 +1,4 @@
{ { pkgs, username, ... }:
config,
pkgs,
username,
...
}:
{ {
imports = [ ./hardware-configuration.nix ]; imports = [ ./hardware-configuration.nix ];
@@ -76,11 +71,11 @@
setSocketVariable = true; setSocketVariable = true;
}; };
programs.fish.enable = true; programs.zsh.enable = true;
security.sudo.configFile = '' security.sudo.configFile = ''
Defaults env_reset,pwfeedback,passprompt="󰟵 " Defaults env_reset,pwfeedback,passprompt="󰟵 "
''; '';
users.defaultUserShell = pkgs.fish; users.defaultUserShell = pkgs.zsh;
users.users.${username} = { users.users.${username} = {
isNormalUser = true; isNormalUser = true;
extraGroups = [ extraGroups = [

View File

@@ -21,7 +21,7 @@
}; };
gtk.gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; gtk.gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
programs.gpg.homedir = "${config.xdg.configHome}/gnupg"; programs.gpg.homedir = "${config.xdg.configHome}/gnupg";
programs.zsh.dotDir = "${config.xdg.configHome}/zsh"; programs.zsh.dotDir = ".config/zsh";
programs.zsh.history.path = "${config.xdg.stateHome}/zsh/history"; programs.zsh.history.path = "${config.xdg.stateHome}/zsh/history";
xdg.configFile.wgetrc.text = '' xdg.configFile.wgetrc.text = ''
hsts-file="${config.xdg.cacheHome}/wget-hsts" hsts-file="${config.xdg.cacheHome}/wget-hsts"

View File

@@ -1,6 +1,7 @@
{ pkgs }: { { pkgs }:
{
enable = true; enable = true;
shellIntegration.enableFishIntegration = true; shellIntegration.enableZshIntegration = true;
extraConfig = '' extraConfig = ''
symbol_map U+23FB-U+23FE,U+2665,U+26A1,U+2B58,U+E000-U+E00A,U+E0A0-U+E0A3,U+E0B0-U+E0D4,U+E200-U+E2A9,U+E300-U+E3E3,U+E5FA-U+E6AA,U+E700-U+E7C5,U+EA60-U+EBEB,U+F000-U+F2E0,U+F300-U+F32F,U+F400-U+F4A9,U+F500-U+F8FF,U+F0001-U+F1AF0 Symbols Nerd Font Mono symbol_map U+23FB-U+23FE,U+2665,U+26A1,U+2B58,U+E000-U+E00A,U+E0A0-U+E0A3,U+E0B0-U+E0D4,U+E200-U+E2A9,U+E300-U+E3E3,U+E5FA-U+E6AA,U+E700-U+E7C5,U+EA60-U+EBEB,U+F000-U+F2E0,U+F300-U+F32F,U+F400-U+F4A9,U+F500-U+F8FF,U+F0001-U+F1AF0 Symbols Nerd Font Mono

View File

@@ -2,3 +2,4 @@ set show_hidden true
set vcs_aware true set vcs_aware true
set preview_images true set preview_images true
set preview_images_method kitty set preview_images_method kitty
set collapse_preview false

File diff suppressed because it is too large Load Diff

View File

@@ -1,4 +1,4 @@
{ pkgs, config, ... }: { pkgs, ... }:
{ {
programs = { programs = {
home-manager.enable = true; home-manager.enable = true;
@@ -23,27 +23,27 @@
}; };
zsh = { zsh = {
enable = true; enable = true;
enableCompletion = true;
autosuggestion.enable = true; autosuggestion.enable = true;
syntaxHighlighting.enable = true; syntaxHighlighting.enable = true;
defaultKeymap = "viins"; defaultKeymap = "viins";
}; plugins = with pkgs; [
fish = { {
enable = true; name = "zsh-nix-shell";
shellInit = '' file = "share/zsh-nix-shell/nix-shell.plugin.zsh";
fish_vi_key_bindings src = zsh-nix-shell;
}
];
initExtraFirst = ''
if [[ -r "''${XDG_CACHE_HOME:-''$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" ]]; then
source "''${XDG_CACHE_HOME:-''$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh"
fi
[[ ! -f ${./.p10k.zsh} ]] || source ${./.p10k.zsh}
source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme
''; '';
interactiveShellInit = ''
set fish_greeting
'';
};
oh-my-posh = {
enable = true;
useTheme = "pararussel";
enableFishIntegration = true;
}; };
direnv = { direnv = {
enable = true; enable = true;
enableZshIntegration = true;
nix-direnv.enable = true; nix-direnv.enable = true;
}; };
}; };