From 1909d263afd347fcb58c34bbea98e2d6b33ee713 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 28 Jan 2017 08:28:50 +0100
Subject: [PATCH] software updates

---
 common-sw.nix | 13 +++----------
 i3.nix        |  1 +
 large-sw.nix  |  6 +++---
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/common-sw.nix b/common-sw.nix
index 14022fd..0a83e50 100644
--- a/common-sw.nix
+++ b/common-sw.nix
@@ -25,7 +25,7 @@
     mpv
     wireshark-gtk
     mutt
-    stable.goldendict
+    goldendict
     patchelf
     bazaar
     tokei loc
@@ -71,7 +71,6 @@
     emacsPackages.proofgeneral
 
     stablePkgs # protect nixpkgs checkout from GC
-    unstablePkgs
   ] ++ (with aspellDicts; [ en de fr nl ]);
 
   nixpkgs.config.packageOverrides = pkgs: with pkgs; let
@@ -85,17 +84,13 @@
       rev = "5237768d62a40236d24fafbd9f4f97f3227399ce";
       sha256 = "1j707pwm6ll2cvmqvwfxxq21gd9q7l6s3vi3vc01jklplj2v20is";
     };
-    unstablePkgs = fetchNixPkgs {
-      rev = "f25006bfaff034dcc45e4cd9bd19c072b20b472d";
-      sha256 = "1013005fw3rqraql2qcx2w0wba4n2a0w9y1cv6a2jqcjbbsvz0xd";
-    };
   in {
     idea-community-eap = pkgs.idea.idea-community.overrideDerivation (oldAttrs: rec {
         name = "idea-community-${version}";
         version = "2017.1.eap";
         src = pkgs.fetchurl {
-          url = "https://download.jetbrains.com/idea/ideaIC-171.2014.21-no-jdk.tar.gz";
-          sha256 = "bb2bfd950861d641b0608cd3aed8fae187664d00e035cd692cfba553f1ef1f7b";
+          url = "https://download.jetbrains.com/idea/ideaIC-171.2613.7-no-jdk.tar.gz";
+          sha256 = "b93d27056cd9b428cba4c0b0ba3a07e5a5adcc5b390bdfbdf3691806c0fe2a6c";
         };
       });
 
@@ -114,8 +109,6 @@
 
     stablePkgs = stablePkgs;
     stable = import stablePkgs {};
-    unstablePkgs = unstablePkgs;
-    unstable = import unstablePkgs {};
   };
 
   nixpkgs.config.allowTexliveBuilds = true;
diff --git a/i3.nix b/i3.nix
index 9c73875..748c338 100644
--- a/i3.nix
+++ b/i3.nix
@@ -25,6 +25,7 @@
     xss-lock i3lock
     xdotool
     scrot
+    pavucontrol
 
     # gnome3 core packages
     desktop_file_utils shared_mime_info
diff --git a/large-sw.nix b/large-sw.nix
index 7372fff..395b8fa 100644
--- a/large-sw.nix
+++ b/large-sw.nix
@@ -9,9 +9,9 @@
     gimp
     inkscape
     jabref
-    stable.libreoffice
-    stable.calibre
-    atom
+    libreoffice
+    calibre
+    vscode
 
     coq_8_5