Compare commits

..

No commits in common. "709ea8576c7355b3891476c362c55e90b6ba805f" and "eaf2b014d2647e1600ac85ca8df873a80b3c18ef" have entirely different histories.

2 changed files with 5 additions and 7 deletions

1
_zshrc
View file

@ -31,7 +31,6 @@ function zle-keymap-select {
zle -N zle-keymap-select zle -N zle-keymap-select
[ -f "$HOME/.bashrc" ] && emulate sh -c "source $HOME/.bashrc" [ -f "$HOME/.bashrc" ] && emulate sh -c "source $HOME/.bashrc"
[ -f "$HOME/./config/bashrc" ] && emulate sh -c "source $HOME/./config/bashrc"
[ -f "/usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" ] && source "/usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" [ -f "/usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" ] && source "/usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
[ -f "/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh" ] && source "/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh" [ -f "/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh" ] && source "/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh"

View file

@ -33,7 +33,6 @@
userEmail = "osh@oshgnacknak.de"; userEmail = "osh@oshgnacknak.de";
}; };
programs.neovim = { programs.neovim = {
enable = true; enable = true;
package = neovim-nightly-overlay.packages.${pkgs.system}.default; package = neovim-nightly-overlay.packages.${pkgs.system}.default;
@ -43,10 +42,6 @@
programs.home-manager.enable = true; programs.home-manager.enable = true;
programs.bash.initExtra = ''
exec zsh
'';
programs.zsh = { programs.zsh = {
enable = true; enable = true;
@ -62,6 +57,10 @@
[ -f "$HOME/.config/zshrc" ] && source $HOME/.config/zshrc [ -f "$HOME/.config/zshrc" ] && source $HOME/.config/zshrc
''; '';
programs.bash.initExtra = ''
exec zsh
'';
plugins = [ plugins = [
{ {
name = "manydots-magic"; name = "manydots-magic";
@ -103,7 +102,7 @@
# Link dotfiles without forcing overwrite (fails safely if a file already exists) # Link dotfiles without forcing overwrite (fails safely if a file already exists)
home.file.".tmux.conf".source = ./_tmux.conf; home.file.".tmux.conf".source = ./_tmux.conf;
home.file.".config/zshrc".source = ./_zshrc; home.file.".config/zshrc".source = ./_zshrc;
home.file.".config/bashrc".source = ./_config/bashrc; home.file.".bashrc".source = ./_bashrc;
home.file.".local/share/nvim/site/autoload/plug.vim".source = pkgs.fetchurl { home.file.".local/share/nvim/site/autoload/plug.vim".source = pkgs.fetchurl {
url = "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim"; url = "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim";