Dockerfile

@@ -46,8 +46,6 @@ ARG SYSTEM_PACKAGES="\
     tmux \
 "
 
-RUN /bin/bash -c "echo -e 'Y\n\n' | /usr/local/sbin/unminimize"
-
 RUN \
     apt update && \
     apt -y upgrade && \

Makefile

@@ -10,4 +10,4 @@ build:
 		2>&1 | tee -a build.log
 
 enter:
-	docker run -ti --rm=true -e HOME=/home/user -e USER=user --user=user -v /home/sneak:/home/user/.home sneak/work /home/user/.nix-profile/bin/zsh -l
+	docker run -ti --rm=true -e HOME=/home/user -e USER=user --user=user -v /home/sneak:/home/user/.home sneak/work /home/user/.nix-profile/bin/zsh

build/root.sh

@@ -44,7 +44,7 @@ ln -s /hostroot/root /root/.home
 
 mkdir -p /home/user/.ssh
 cp /root/.ssh/authorized_keys /home/user/.ssh/authorized_keys
-chown -R $UID_TO_ADD:$GID_TO_ADD /home/user
+echo chown -Rv $UID_TO_ADD:$GID_TO_ADD /home/user
+chown -Rv $UID_TO_ADD:$GID_TO_ADD /home/user
+
 echo "$USERNAME_TO_ADD ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/user
-
-

build/user.sh

@@ -28,13 +28,12 @@ curl -L https://nixos.org/nix/install | sh
 source /home/user/.nix-profile/etc/profile.d/nix.sh
 
 # this should install all the packages from the config.nix:
-nix-env -i myPackages
+nix-env -i workEnv
 
 # 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"
-export KEEP_ZSHRC=yes
 zsh /tmp/installomz.sh && rm /tmp/installomz.sh
 
 

root/etc/service/sshd/run

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-exec /usr/sbin/sshd -D

root/home/user/.config/nixpkgs/config.nix

@@ -1,33 +1,50 @@
-{
+{ pkgs }:
-  packageOverrides = pkgs: with pkgs; {
+let
+  # Inherit utilities
+  inherit (pkgs) lib buildEnv;
 
-    myPackages = pkgs.buildEnv {
+  homeDir = builtins.getEnv "HOME";
-      name = "myPackages";
+
-      paths = [
+in {
-        aspell
+  allowUnfree = true;
-        bc
+  #jre = pkgs.oraclejre8;
+  #jdk = pkgs.oraclejdk8;
+
+  packageOverrides = pkgs: {
+
+    workEnv = lib.lowPrio (buildEnv {
+      name = "work-env";
+      ignoreCollisions = true;
+      paths = with pkgs; [
+        sneakDefaultPkgs
+        weechat
+      ];
+    });
+
+    sneakDefaultPkgs = lib.lowPrio (buildEnv {
+      name = "sneakDefaultPkgs";
+      ignoreCollisions = true;
+      paths = with pkgs; [
         clang
-        coreutils
         ctags
         curl
-        ffmpeg
+        gitAndTools.git-annex
-        gdb
+        gitAndTools.git-extras
-        git
+        gitAndTools.git2cl
+        gitAndTools.gitFull
+        gitAndTools.tig
         gnupg
         go
-        jq
         nix-prefetch-scripts
+        nix-repl
         openssh
         pwgen
         qemu
         tmux
         tree
         vim
-        weechat
         wget
-        zsh
       ];
-    };
+    });
-
   };
 }