mirror of
https://github.com/willemml/dotfiles.nix.git
synced 2025-04-12 11:17:17 +00:00
Fixes command-not-found conflict on NixOS
This commit is contained in:
parent
a3da8492b7
commit
3ee52ab988
5 changed files with 3 additions and 48 deletions
|
@ -24,7 +24,7 @@
|
|||
settings.trusted-users = ["root" "willem"];
|
||||
};
|
||||
|
||||
programs.nix-index.enable = false;
|
||||
programs.command-not-found.enable = false;
|
||||
|
||||
programs.bash.enableCompletion = true;
|
||||
programs.bash.interactiveShellInit = ''
|
||||
|
|
|
@ -16,6 +16,8 @@
|
|||
|
||||
home.homeDirectory = "/Users/willem";
|
||||
|
||||
programs.command-not-found.enable = true;
|
||||
|
||||
home.file.".gnupg/gpg-agent.conf" = {
|
||||
text = ''
|
||||
pinentry-program "${pkgs.pinentry-touchid}/bin/pinentry-touchid"
|
||||
|
|
|
@ -12,8 +12,6 @@
|
|||
programs = {
|
||||
bash.enableCompletion = true;
|
||||
|
||||
command-not-found.enable = true;
|
||||
|
||||
direnv = {
|
||||
enable = true;
|
||||
enableBashIntegration = true;
|
||||
|
|
|
@ -1,43 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
environment.pathsToLink = ["/share/zsh"];
|
||||
environment.shells = [pkgs.bashInteractive pkgs.zsh];
|
||||
environment.systemPackages = [pkgs.coreutils pkgs.git];
|
||||
environment.variables.LANG = "en_US.UTF-8";
|
||||
environment.variables.LANGUAGE = "en_US.UTF-8";
|
||||
environment.variables.LC_ALL = "en_US.UTF-8";
|
||||
environment.variables.LC_CTYPE = "en_US.UTF-8";
|
||||
environment.variables.SHELL = "${pkgs.zsh}/bin/zsh";
|
||||
|
||||
nix = {
|
||||
package = pkgs.nix;
|
||||
settings.experimental-features = ["nix-command" "flakes" "repl-flake"];
|
||||
settings.trusted-users = ["root" "willem"];
|
||||
};
|
||||
|
||||
programs.nix-index.enable = false;
|
||||
|
||||
programs.bash.enableCompletion = true;
|
||||
programs.bash.interactiveShellInit = ''
|
||||
export PS1=$'\n'"\e[0mbash: \e[34;1m\w"$'\n'"\e[32m\\$\e[0m "
|
||||
'';
|
||||
|
||||
documentation.enable = true;
|
||||
documentation.man.enable = true;
|
||||
|
||||
programs.zsh.enable = true;
|
||||
programs.zsh.shellInit = lib.mkDefault "zsh-newuser-install() { :; }";
|
||||
programs.zsh.enableBashCompletion = true;
|
||||
programs.zsh.promptInit = lib.mkDefault ''
|
||||
autoload -U promptinit && promptinit
|
||||
export PROMPT=$'\n'"%B%F{cyan}%m:%F{blue}%~"$'\n'"%F{green}%(!.#.$) %f%b"
|
||||
export RPROMPT="%B%F{red}%*%f%b"
|
||||
'';
|
||||
|
||||
time.timeZone = "America/Vancouver";
|
||||
|
||||
users.users.willem.shell = pkgs.zsh;
|
||||
}
|
|
@ -16,8 +16,6 @@
|
|||
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
|
||||
programs.command-not-found.enable = true;
|
||||
|
||||
programs.zsh.loginShellInit = ''
|
||||
reexec() {
|
||||
unset __NIX_OS_SET_ENVIRONMENT_DONE
|
||||
|
|
Loading…
Add table
Reference in a new issue