diff --git a/build/user.sh b/build/user.sh index 299a49e..2ece467 100644 --- a/build/user.sh +++ b/build/user.sh @@ -28,7 +28,7 @@ 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 workEnv +nix-env -i myPackages # FIXME have this pull from synced dir instead # oh-my-zsh diff --git a/root/home/user/.config/nixpkgs/config.nix b/root/home/user/.config/nixpkgs/config.nix index 7cf78d7..580cf70 100644 --- a/root/home/user/.config/nixpkgs/config.nix +++ b/root/home/user/.config/nixpkgs/config.nix @@ -1,33 +1,17 @@ -{ pkgs }: -let - # Inherit utilities - inherit (pkgs) lib buildEnv; +{ + packageOverrides = pkgs: with pkgs; { - homeDir = builtins.getEnv "HOME"; - -in { - allowUnfree = true; - #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; [ + myPackages = pkgs.buildEnv { + name = "myPackages"; + paths = [ + aspell + bc clang + coreutils ctags curl + ffmpeg + gdb gitAndTools.git-annex gitAndTools.git-extras gitAndTools.git2cl @@ -35,16 +19,18 @@ in { gitAndTools.tig gnupg go + jq nix-prefetch-scripts - nix-repl openssh pwgen qemu tmux tree vim + weechat wget ]; - }); + }; + }; }