diff options
Diffstat (limited to '')
| -rw-r--r-- | debian/Vagrantfile | 8 | ||||
| -rw-r--r-- | debian/provision-root.sh | 21 | ||||
| -rw-r--r-- | scripts/provision-user.sh (renamed from debian/provision-user.sh) | 11 |
3 files changed, 14 insertions, 26 deletions
diff --git a/debian/Vagrantfile b/debian/Vagrantfile index b3500ee..a4260f6 100644 --- a/debian/Vagrantfile +++ b/debian/Vagrantfile @@ -10,8 +10,8 @@ Vagrant.configure('2') do |config| # config.vm.network 'forwarded_port', guest: 80, host: 8080, host_ip: '127.0.0.1' # config.vm.synced_folder './data', '/data' - config.vm.synced_folder '~/shared', '/shared' - config.vm.synced_folder '.', '/vagrant', disabled: true + config.vm.synced_folder '~/shared', '/shared', type: '9p', disabled: false, accessmode: 'mapped' + config.vm.synced_folder '.', '/vagrant', disabled: true, type: '9p', disabled: false, accessmode: 'mapped' config.vm.provider :libvirt do |libvirt| libvirt.cpus = 4 @@ -26,6 +26,6 @@ Vagrant.configure('2') do |config| config.vm.provision 'file', source: '~/.ssh/id_rsa', destination: '.ssh/id_rsa' config.vm.provision 'file', source: '~/.ssh/id_rsa.pub', destination: '.ssh/id_rsa.pub' - config.vm.provision 'shell', path: 'provision-root.sh' - config.vm.provision 'shell', path: 'provision-user.sh', privileged: false + config.vm.provision 'shell', path: '../scripts/provision-root.sh' + config.vm.provision 'shell', path: '../scripts/provision-user.sh', privileged: false end diff --git a/debian/provision-root.sh b/debian/provision-root.sh deleted file mode 100644 index 40f8df5..0000000 --- a/debian/provision-root.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -xe - -export DEBIAN_FRONTEND=noninteractive - -apt-get update -apt-get upgrade -y - -apt-get install -y git - -unset DEBIAN_FRONTEND - -sh <(curl -L https://nixos.org/nix/install) --daemon --yes - -if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then - . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' -fi - -nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager -nix-channel --update diff --git a/debian/provision-user.sh b/scripts/provision-user.sh index 518f7b5..39da031 100644 --- a/debian/provision-user.sh +++ b/scripts/provision-user.sh @@ -2,11 +2,19 @@ set -xe +sh <(curl -L https://nixos.org/nix/install) --no-daemon + +. "$HOME/.nix-profile/etc/profile.d/nix.sh" + +nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager +nix-channel --update + nix-shell '<home-manager>' -A install . "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" ssh-keyscan github.com >> ~/.ssh/known_hosts git clone git@github.com:compromyse/dotfiles $HOME/.config/home-manager/dotfiles +git clone git@github.com:tmux-plugins/tpm $HOME/.tmux/plugins/tpm rm $HOME/.config/home-manager/home.nix ln -s $HOME/.config/home-manager/dotfiles/machines/v/home.nix $HOME/.config/home-manager/home.nix @@ -17,5 +25,6 @@ sudo apt-get autoremove -y home-manager build home-manager switch -b backup -git clone git@github.com:tmux-plugins/tpm ~/.tmux/plugins/tpm +rm $HOME/result + ~/.tmux/plugins/tpm/bin/install_plugins |