seems to build now

build/packages.txt

@@ -1,122 +0,0 @@
-apt-transport-https
-apt-utils
-aspell
-aspell-en
-automake
-avahi-daemon
-avahi-utils
-bash-completion
-bc
-bind9-host
-bonnie++
-build-essential
-byobu
-ca-certificates
-cmake
-curl
-daemontools
-debmirror
-default-jdk
-default-jre
-diffstat
-dnsutils
-docker.io
-dos2unix
-editorconfig
-ffmpeg
-fonts-indic
-fonts-ipafont-gothic
-fonts-ipafont-mincho
-fortune
-git
-gnupg2
-gnupg-agent
-golang-go
-host
-imagemagick
-iputils-ping
-irssi
-jq
-lcov
-ldap-auth-client
-ldap-utils
-libasound2
-libatk1.0-0
-libboost-all-dev
-libbz2-dev
-libdb++-dev
-libffi-dev
-libgconf-2-4
-libgtk-3-0
-libjpeg-dev
-liblzma-dev
-libncurses5-dev
-libnss3
-libnss-mdns
-libpng-dev
-libreadline-dev
-libsqlite3-dev
-libssl-dev
-libtool
-libxcursor1
-libxml2
-libxml2-dev
-libxmlsec1-dev
-libxslt1-dev
-llvm
-locales
-lsof
-mailutils
-make
-man
-man-db
-mercurial
-mosh
-mutt
-netcat-openbsd
-nmap
-nscd
-openssh-server
-pandoc
-pass
-pbzip2
-pinentry-curses
-pkg-config
-psmisc
-pv
-pwgen
-python3
-python3-dev
-python3-pip
-rbenv
-rsync
-rsyslog
-rsyslog-gnutls
-rsyslog-relp
-runit
-screen
-snmp
-snmpd
-socat
-software-properties-common
-strace
-sudo
-tcpdump
-telnet
-texlive-latex-base
-tk-dev
-tmux
-tree
-ttf-wqy-microhei
-ttf-wqy-zenhei
-vagrant
-vim
-vim-gtk
-wamerican-insane
-wget
-xterm
-xz-utils
-zfsutils-linux
-zip
-zlib1g-dev
-zsh

build/root.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-echo "##### build/run.sh"
+echo "##### build/root.sh"
 
 export LANG="en_US.UTF-8"
 export LANGUAGE="en_US:en"
@@ -12,8 +12,6 @@ TD="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)"
 
 cd "$TD"
 
-apt install -y $(cat packages.txt)
-
 SSH_HOST_KEY_FILES="
     ssh_host_ecdsa_key
     ssh_host_ecdsa_key.pub
@@ -35,8 +33,10 @@ ln -s /hostroot/root /root/.home
 
 # install other stuff here
 
-pip3 install -U pip
-pip3 install black
+# FIXME do these with nix:
+#pip3 install -U pip
+#pip3 install black
+
 # install python packages
 # install yarn
 # install prettier
@@ -46,12 +46,5 @@ mkdir -p /home/user/.ssh
 cp /root/.ssh/authorized_keys /home/user/.ssh/authorized_keys
 echo chown -Rv $UID_TO_ADD:$GID_TO_ADD /home/user
 chown -Rv $UID_TO_ADD:$GID_TO_ADD /home/user
-chsh --shell $(which zsh) $USERNAME_TO_ADD
 
 echo "$USERNAME_TO_ADD ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/user
-
-sudo \
-    --set-home \
-    --non-interactive \
-    -u $USERNAME_TO_ADD \
-    bash ./user.sh

build/user.sh

@@ -4,8 +4,10 @@ set -x
 
 TD="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)"
 
-U="$USERNAME_TO_ADD"
+U="user"
 
+export HOME=/home/user
+export USER=user
 export LC_ALL=en_US
 export LANG=en_US.UTF-8
 
@@ -14,43 +16,26 @@ OH="/hosthome"
 # link ~/.home to original home
 ln -s "/hosthome" $HOME/.home
 
-# oh-my-zsh
-curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh > /tmp/installomz.sh
-export ZSH="$HOME/.zsh"
-bash /tmp/installomz.sh --unattended --keep-zshrc
-
-zsh -c 'vim &'
+#vim -s ~/.vimrc -c 'q!'
 # vim-plug
 # this should happen from vimrc
 #curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
 #    https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 
-# link in ssh key from original home
-mkdir -p ~/.ssh
-ln -s ~/.home/Documents/sync/secrets/ssh/pixel16/id_rsa ~/.ssh/id_rsa
-ln -s ~/.home/Documents/sync/secrets/ssh/pixel16/id_rsa.pub ~/.ssh/id_rsa.pub
+# /nix is already created for us and chowned to us by now:
+curl -L https://nixos.org/nix/install | sh
 
-# install pyenv
-git clone -n https://github.com/pyenv/pyenv.git ~/.pyenv
-pushd ~/.pyenv
-git checkout 3e0f5e798ca16cd9389c4c8805038ac2c0d45cae
-popd
+source /home/user/.nix-profile/etc/profile.d/nix.sh
 
-export PYENV_ROOT="$HOME/.pyenv"
-export PATH="$PYENV_ROOT/bin:$PATH"
-eval "$(pyenv init -)"
-pyenv install 3.8.2
-pyenv global 3.8.2
+# this should install all the packages from the config.nix:
+nix-env -i workEnv
 
-git clone -n https://github.com/nvm-sh/nvm.git ~/.nvm
-pushd ~/.nvm
-git checkout 73438e339e242fce0cba443e5c4322ac996e9197
-popd
+# FIXME have this pull from synced dir instead
+# oh-my-zsh
+curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh > /tmp/installomz.sh
+export ZSH="$HOME/.zsh"
+zsh /tmp/installomz.sh && rm /tmp/installomz.sh
 
-export NVM_DIR="$HOME/.nvm"
-source "$NVM_DIR/nvm.sh"
-
-nvm install node
 
 ###############################################################################
 ##### Personal Config
@@ -59,3 +44,18 @@ nvm install node
 # to abandon that hope and hardcode my own values in here.
 git config --global user.email sneak@sneak.berlin
 git config --global user.name sneak
+
+mkdir -p ~/.paths
+# TODO FIXME change the syncthing paths on las1 when convenient sometime
+ln -s ~/.home/Documents/syncthing/folders/sync ~/.paths/sneak-sync
+ln -s ~/.home/Documents/syncthing/folders/scratch ~/.paths/sneak-scratch
+ln -s ~/.home/Documents/syncthing/folders/sneak-docs ~/.paths/sneak-docs
+ln -s ~/.paths/sneak-docs ~/Documents
+ln -s ~/.paths/sneak-scratch/dev ~/dev
+ln -s ~/.paths/sneak-sync/dotfiles/weechat ~/.weechat
+ln -s ~/.paths/sneak-sync/ssh/config ~/.ssh/config
+
+# link in ssh key from original home
+mkdir -p ~/.ssh
+ln -s ~/.paths/sneak-sync/secrets/ssh/pixel16/id_rsa ~/.ssh/id_rsa
+ln -s ~/.paths/sneak-sync/secrets/ssh/pixel16/id_rsa.pub ~/.ssh/id_rsa.pub