gitea/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- remove vim from the nix packages because for adding plugins to neovim - need use nvim command, not vim

Browse Source 
* install nixpkgs in multi user mode
- remove configure tmux plugin, because plugins does not exists on yadm bootstrap stage - that automatically configured via tmux started in tmux.conf
This commit is contained in:
dimti
2023-04-12 10:47:44 +03:00
parent 9fc6eb4c80
commit 2e2ac306a9
2 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.config/nix/installed_packages
View File

@ -23,7 +23,6 @@ nixpkgs.starship
nixpkgs.tmate nixpkgs.tmate
nixpkgs.tmux nixpkgs.tmux
nixpkgs.unzip nixpkgs.unzip
nixpkgs.vim
nixpkgs.wget nixpkgs.wget
nixpkgs.yadm nixpkgs.yadm
nixpkgs.zplug nixpkgs.zplug

45
.config/yadm/bootstrap
View File

@ -5,49 +5,40 @@ install_nix() {
# This one courtesy of: # This one courtesy of:
# https://github.com/shadowrylander/shadowrylander/blob/35bb51822c46578d0a5da5810263fa85d464043c/.config/yadm/bootstrap#L56 # https://github.com/shadowrylander/shadowrylander/blob/35bb51822c46578d0a5da5810263fa85d464043c/.config/yadm/bootstrap#L56
install_nix_bin() { install_nix_bin() {
curl -L https://nixos.org/nix/install | sh
# TODO: Use that for per-use installation: . /nix/var/nix/profiles/per-user/${USER}/profile/etc/profile.d/nix-daemon.sh # Single User install
# if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then # Alternate nix-daemon path: . /nix/var/nix/profiles/per-user/${USER}/profile/etc/profile.d/nix-daemon.sh
# . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' # curl -L https://nixos.org/nix/install | sh
# fi #. $HOME/.nix-profile/etc/profile.d/nix.sh
. $HOME/.nix-profile/etc/profile.d/nix.sh # For Multi-User install
curl -L https://nixos.org/nix/install | sh -s -- --daemon --yes
. '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'
if [ -f "$HOME/.config/nix/installed_packages" ]; then
# This list created with `nix-env -qaPs|grep '^I'|awk '{print $2}' > ~/.config/nix/installed_packages`
cat "$HOME/.config/nix/installed_packages" | xargs nix-env -iA
fi
} }
command -v nix >/dev/null 2>&1 || install_nix_bin command -v nix >/dev/null 2>&1 || install_nix_bin
if [ -f "$HOME/.config/nix/installed_packages" ]; then
# This list created with `nix-env -qaPs|grep '^I'|awk '{print $2}' > ~/.config/nix/installed_packages`
cat "$HOME/.config/nix/installed_packages" | xargs nix-env -iA
fi
if [ -f "$HOME/.config/nix/installed_packages.local" ]; then
# Additional packages that might be needed here or there
cat "$HOME/.config/nix/installed_packages.local" | xargs nix-env -i
fi
} }
#configure_zsh() { configure_zsh() {
# # FIXME: We deserve better # FIXME: We deserve better
# source $HOME/.zshrc source $HOME/.zshrc
#} }
configure_vim() { configure_vim() {
# Install vim-plug for Vim # Install vim-plug for Vim
curl -fLo ~/.vim/autoload/plug.vim --create-dirs \ curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim nvim +'PlugInstall --sync' +qa
vim +'PlugInstall --sync' +qa
# Install vim-plug for Neovim # Install vim-plug for Neovim
sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \ sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \
https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim' https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
nvim +'PlugInstall --sync' +qa nvim +'PlugInstall --sync' +qa
} }
configure_tmux() {
~/.tmux/plugins/tpm/bin/install_plugins
}
install_nix install_nix
#configure_zsh #configure_zsh
configure_vim configure_vim
configure_tmux