next #1

Open
sneak wants to merge 27 commits from next into master
2 changed files with 15 additions and 29 deletions
Showing only changes of commit 9acfb54dfb - Show all commits

View File

@ -28,7 +28,7 @@ curl -L https://nixos.org/nix/install | sh
source /home/user/.nix-profile/etc/profile.d/nix.sh source /home/user/.nix-profile/etc/profile.d/nix.sh
# this should install all the packages from the config.nix: # 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 # FIXME have this pull from synced dir instead
# oh-my-zsh # oh-my-zsh

View File

@ -1,33 +1,17 @@
{ pkgs }: {
let packageOverrides = pkgs: with pkgs; {
# Inherit utilities
inherit (pkgs) lib buildEnv;
homeDir = builtins.getEnv "HOME"; myPackages = pkgs.buildEnv {
name = "myPackages";
in { paths = [
allowUnfree = true; aspell
#jre = pkgs.oraclejre8; bc
#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 clang
coreutils
ctags ctags
curl curl
ffmpeg
gdb
gitAndTools.git-annex gitAndTools.git-annex
gitAndTools.git-extras gitAndTools.git-extras
gitAndTools.git2cl gitAndTools.git2cl
@ -35,16 +19,18 @@ in {
gitAndTools.tig gitAndTools.tig
gnupg gnupg
go go
jq
nix-prefetch-scripts nix-prefetch-scripts
nix-repl
openssh openssh
pwgen pwgen
qemu qemu
tmux tmux
tree tree
vim vim
weechat
wget wget
]; ];
}); };
}; };
} }