Compare commits

..

3 Commits

3 changed files with 10 additions and 5 deletions

View File

@@ -1,7 +1,13 @@
{ config, lib, ... }: { config, lib, ... }:
{ {
programs.bash.enable = true; programs.fzf = {
enable = true;
enableZshIntegration = true;
enableBashIntegration = true;
defaultOptions = [ "--height 40%" "--layout=reverse" "--border" ];
};
programs.zsh = { programs.zsh = {
enable = true; enable = true;
dotDir = "${config.xdg.configHome}/zsh"; dotDir = "${config.xdg.configHome}/zsh";
@@ -15,9 +21,6 @@
}; };
initContent = '' initContent = ''
bindkey '^R' history-incremental-search-backward
bindkey '^S' history-incremental-search-forward
autoload -Uz vcs_info autoload -Uz vcs_info
precmd() { vcs_info } precmd() { vcs_info }
zstyle ':vcs_info:git:*' formats '%b' zstyle ':vcs_info:git:*' formats '%b'

View File

@@ -40,6 +40,7 @@
# System-wide locale # System-wide locale
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
i18n.supportedLocales = [ "de_DE.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" ];
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
# Networking basics # Networking basics

View File

@@ -6,7 +6,7 @@
defaultShell = lib.mkOption { defaultShell = lib.mkOption {
type = lib.types.str; type = lib.types.str;
default = "zsh"; default = "zsh";
description = "Default shell (dash, zsh, fish)"; description = "Default shell (bash, zsh, fish)";
}; };
}; };
@@ -14,6 +14,7 @@
cfg = config.custom.shell; cfg = config.custom.shell;
in lib.mkIf cfg.enable { in lib.mkIf cfg.enable {
programs.bash.enable = true;
programs.zsh.enable = cfg.defaultShell == "zsh"; programs.zsh.enable = cfg.defaultShell == "zsh";
programs.fish.enable = cfg.defaultShell == "fish"; programs.fish.enable = cfg.defaultShell == "fish";