Compare commits
3 Commits
4388cc6249
...
d9ef3b056e
| Author | SHA1 | Date | |
|---|---|---|---|
| d9ef3b056e | |||
| bc607c2956 | |||
| 9ff3f739d0 |
@@ -1,7 +1,13 @@
|
||||
{ config, lib, ... }:
|
||||
|
||||
{
|
||||
programs.bash.enable = true;
|
||||
programs.fzf = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
enableBashIntegration = true;
|
||||
defaultOptions = [ "--height 40%" "--layout=reverse" "--border" ];
|
||||
};
|
||||
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
dotDir = "${config.xdg.configHome}/zsh";
|
||||
@@ -15,9 +21,6 @@
|
||||
};
|
||||
|
||||
initContent = ''
|
||||
bindkey '^R' history-incremental-search-backward
|
||||
bindkey '^S' history-incremental-search-forward
|
||||
|
||||
autoload -Uz vcs_info
|
||||
precmd() { vcs_info }
|
||||
zstyle ':vcs_info:git:*' formats '%b'
|
||||
|
||||
@@ -40,6 +40,7 @@
|
||||
|
||||
# System-wide locale
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
i18n.supportedLocales = [ "de_DE.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" ];
|
||||
time.timeZone = "Europe/Berlin";
|
||||
|
||||
# Networking basics
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
defaultShell = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "zsh";
|
||||
description = "Default shell (dash, zsh, fish)";
|
||||
description = "Default shell (bash, zsh, fish)";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
cfg = config.custom.shell;
|
||||
in lib.mkIf cfg.enable {
|
||||
|
||||
programs.bash.enable = true;
|
||||
programs.zsh.enable = cfg.defaultShell == "zsh";
|
||||
programs.fish.enable = cfg.defaultShell == "fish";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user