From eccec234c09bfce3b29e7abd237f7abf244f8da0 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Fri, 26 Jan 2018 12:41:07 +0100
Subject: [PATCH] steveej/userconfig: manage pkgs

---
 pkg-configuration/config.nix | 68 +++++++++++++++++++++++-------------
 1 file changed, 44 insertions(+), 24 deletions(-)

diff --git a/pkg-configuration/config.nix b/pkg-configuration/config.nix
index 5a4e9ab..f3f9173 100644
--- a/pkg-configuration/config.nix
+++ b/pkg-configuration/config.nix
@@ -4,6 +4,7 @@ let
   unstablepkgs = import <nixos-unstable> {};
 
 in {
+  # required by nox
   permittedInsecurePackages = [
     "linux-4.13.16"
   ];
@@ -27,14 +28,21 @@ in {
 
   packageOverrides = stablepkgs: rec {
 
-    labshell = (import (unstablepkgs.fetchFromGitHub {
-          owner = "htwg-syslab";
-          repo = "nix-expressions";
-          rev = "89040d81cf6147b1ebaae8eca059f4718400a01a";
-          sha256 = "1ci8xbbnj7bdcciq7ibqz8vfhs3ml7k4yx6m8f8whgwrhzk4c8wa";
-        }) { labshellExpressionsRemoteRev = "master"; }
-      ).labshell;
+#    virtmanager = stablepkgs.virtmanager.overrideDerivation (oldAttrs: {
+#      patchPhase = ''
+#        sed -i "/'install_egg_info'/d" setup.py
+#        sed -i "s|self.cli_usbredir = None|self.cli_usbredir = True|" virtManager/config.py
+#      '';
+#    });
 
+#    labshell = (import (unstablepkgs.fetchFromGitHub {
+#          owner = "htwg-syslab";
+#          repo = "nix-expressions";
+#          rev = "89040d81cf6147b1ebaae8eca059f4718400a01a";
+#          sha256 = "1ci8xbbnj7bdcciq7ibqz8vfhs3ml7k4yx6m8f8whgwrhzk4c8wa";
+#        }) { labshellExpressionsRemoteRev = "master"; }
+#      ).labshell;
+#     labshell
     busyboxStatic =  stablepkgs.busybox.override {
       enableStatic = true;
       extraConfig = ''
@@ -62,7 +70,9 @@ in {
         androidsdk
 
         #nixops
+        git-crypt
         unstablepkgs.ansible2
+        pijul
 
         picocom
         roxterm
@@ -75,8 +85,6 @@ in {
         xdotool
         xdg_utils
         xdg-user-dirs
-        networkmanagerapplet
-        lightdm
 
         exiv2
         htop
@@ -158,17 +166,10 @@ in {
         iperf
         bind
 
-#        pkgconfig
-#        gcc
-#        valgrind
-#        gdb
-#        cgdb
-#        man-pages
-
-        unstablepkgs.gimp
-        unstablepkgs.inkscape
         unstablepkgs.vscode
         unstablepkgs.atom
+        gimp
+        inkscape
         plantuml
         umlet
         graphviz
@@ -176,24 +177,21 @@ in {
 #        bundler
 #        bundix
 
-        nodejs
-#        rustc
-#        cargo
+
 
         travis
         jq
 
 #        pandoc
-#        texlive.combined.scheme-medium
+        unstablepkgs.texlive.combined.scheme-medium
+#        perlPackages.YAMLTiny
 
-        redshift
 #        gnome3.pomodoro
 
         ntfs3g
         ddrescue
         ncdu
 
-        labshell
         xorg.xhost
 #        gitpkgs.wtftw
         autorandr
@@ -207,12 +205,34 @@ in {
         xorg.xcursorthemes
 
         openssl
+        mkpasswd
 
         hdparm
         testdisk
         wireshark
 
+
+        # games
         zeroad
+
+
+        # Compilers & Toolchains
+        gcc
+        pkgconfig
+        binutils
+        valgrind
+        gdb
+        cgdb
+        man-pages
+        gnumake
+
+        nodejs
+        emscripten
+
+        ## Rust Development
+        rustup
+        capnproto
+        kcov
       ];
     };
   };