aynish/helm
1
0
Fork 0
Code Pull requests Packages Projects Releases Activity

Don't use zsh/rc.d system

Browse source 
Instead, we just have zsh read $XDG_CONFIG_HOME/*/{aliases,env}.zsh
files.
This commit is contained in:
Henrik Lissner 2019-12-08 20:11:13 -05:00
parent 9ec3f96131
commit a7834176ec
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
6 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/zsh/.zshenv
View file

@ -2,7 +2,7 @@ for dir in $XDG_CONFIG_HOME/*/bin(N); do
export PATH="$dir:$PATH" export PATH="$dir:$PATH"
done done
for file in $XDG_CONFIG_HOME/zsh/rc.d/env.*.zsh(N); do for file in $XDG_CONFIG_HOME/*/env.zsh(N); do
source $file source $file
done done

2
config/zsh/.zshrc
View file

@ -21,7 +21,7 @@ source $ZDOTDIR/config.zsh
source $ZDOTDIR/keybinds.zsh source $ZDOTDIR/keybinds.zsh
source $ZDOTDIR/completion.zsh source $ZDOTDIR/completion.zsh
source $ZDOTDIR/aliases.zsh source $ZDOTDIR/aliases.zsh
for file in $XDG_CONFIG_HOME/zsh/rc.d/aliases.*.zsh(N); do for file in $XDG_CONFIG_HOME/*/aliases.zsh(N); do
source $file source $file
done done

5
modules/editors/emacs.nix
View file

@ -20,7 +20,8 @@ in
fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ]; fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ];
home-manager.users.hlissner.xdg.configFile = { home-manager.users.hlissner.xdg.configFile = {
"zsh/rc.d/aliases.emacs.zsh".source = <config/emacs/aliases.zsh>; # Avoid "emacs" because Emacs HEAD respects XDG conventions and we're only
"zsh/rc.d/env.emacs.zsh".source = <config/emacs/env.zsh>; # using this directory to store extra zsh config for my nix dotfiles.
"emacscfg" = { source = <config/emacs>; recursive = true; };
}; };
} }

2
modules/editors/vim.nix
View file

@ -14,6 +14,6 @@
}; };
home-manager.users.hlissner.xdg.configFile = { home-manager.users.hlissner.xdg.configFile = {
"zsh/rc.d/aliases.vim.zsh".source = <config/vim/aliases.zsh>; "vim" = { source = <config/vim>; recursive = true; };
}; };
} }

4
modules/shell/git.nix
View file

@ -7,8 +7,6 @@
]; ];
home-manager.users.hlissner.xdg.configFile = { home-manager.users.hlissner.xdg.configFile = {
"git/config".source = <config/git/config>; "git" = { source = <config/git>; recursive = true; };
"git/ignore".source = <config/git/ignore>;
"zsh/rc.d/aliases.git.zsh".source = <config/git/aliases.zsh>;
}; };
} }

5
modules/shell/ncmpcpp.nix
View file

@ -6,9 +6,6 @@
]; ];
home-manager.users.hlissner.xdg.configFile = { home-manager.users.hlissner.xdg.configFile = {
"zsh/rc.d/aliases.ncmpcpp.zsh".source = <config/ncmpcpp/aliases.zsh>; "ncmpcpp" = { source = <config/ncmpcpp>; recursive = true; };
"zsh/rc.d/env.ncmpcpp.zsh".source = <config/ncmpcpp/env.zsh>;
"ncmpcpp/config".source = <config/ncmpcpp/config>;
"ncmpcpp/bindings".source = <config/ncmpcpp/bindings>;
}; };
} }