Revert "runCommand -> runCommandCC"

This reverts commit e3f8d28d6be67257d70035d122263f3a35adc438 and my
attempts to mitigate this in 0a50f5fab1abf2e70fd5d7a2dd717c2f2c1b983b
and 3b91f25b37ea709f5c86e38a50061199bbed5341.

Vuizvui is a repository for experimental stuff, but NOT a dumpster. So
please refrain from pushing waste into this repository, like markers for
a failed merge.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @Profpatsch

2 files changed, 39 insertions, 89 deletions

diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix
index efecfc15..23cb69f4 100644
--- a/machines/profpatsch/katara.nix
+++ b/machines/profpatsch/katara.nix
@@ -36,15 +36,8 @@ in {
     hardware.pulseaudio = {
       enable = true;
       zeroconf.discovery.enable = true;
-      extraConfig = ''
-        flat-volumes = no
-      '';
-      # for Pillars of Eternity
-      support32Bit = true;
     };
 
-    hardware.opengl.driSupport32Bit = true;
-
     vuizvui.hardware.thinkpad.enable = true;
 
     ######
@@ -83,7 +76,6 @@ in {
         pkgs.vuizvui.jmtpfs     # MTP fuse
         mosh              # ssh with stable connections
         nfs-utils         # the filesystem of the future for 20 years
-        tarsnap           # encrypting online backup tool
         # TODO move into atool deps
         unzip             # extract zip archives
       ];
@@ -113,9 +105,6 @@ in {
         # mercurial          # the other version control system
         telnet               # tcp debugging
       ];
-      documentation = [
-        # mustache-spec NOT IN 16.09
-      ];
       userPrograms = [
         abcde                # high-level cd-ripper with tag support
         anki                 # spaced repetition system
@@ -126,7 +115,6 @@ in {
         (chromium.override { enablePepperFlash = true; })
         # droopy               # simple HTML upload server
         unfreeAndNonDistributablePkgs.dropbox-cli # dropbox.com client
-        electrum             # bitcoin client
         emacs                # pretty neat operating system i guess
         feh                  # brother of meh, displays images in a meh way, but fast
         filezilla            # FTP GUI business-ready interface framework
@@ -145,21 +133,18 @@ in {
         remind               # calender & reminder program
         rtorrent             # monster of a bittorrent client
         myPkgs.sent          # suckless presentation tool
+        pkgs.vuizvui.show-qr-code # display a QR code
+        youtube-dl           # download videos
         myPkgs.xmpp-client   # CLI XMPP Client
-        myPkgs.youtube-dl    # download videos
         zathura              # pdf viewer
       ];
-      userScripts = with pkgs.vuizvui; [
-        profpatsch.display-infos  # show time & battery
-        show-qr-code              # display a QR code
-      ];
       mailPkgs = [
-        elinks               # command line browser
+        elinks             # command line browser
         # myPkgs.offlineimap # IMAP client
-        mutt-with-sidebar    # has been sucking less since 1970
-        msmtp                # SMTP client
-        notmuch              # mail indexer
-        pythonPackages.alot  # the next cool thing!
+        mutt-with-sidebar  # has been sucking less since 1970
+        msmtp              # SMTP client
+        notmuch            # mail indexer
+        pythonPackages.alot # the next cool thing!
       ];
       nixPkgs = [
         nix-repl                  # nix REPL
@@ -169,51 +154,31 @@ in {
         # TODO needs user service
         redshift   # increases screen warmth at night (so i don’t have to feel cold)
       ];
-    in systemPkgs ++ xPkgs ++ guiPkgs
-    ++ programmingTools ++ documentation
-    ++ userPrograms ++ userScripts
-    ++ mailPkgs ++ nixPkgs ++ tmpPkgs;
-    # system.extraDependencies = with pkgs; lib.singleton (
-    #    # Haskell packages I want to keep around
-    #    haskellPackages.ghcWithPackages (hpkgs: with hpkgs;
-    #      [
-    #        # frp
-    #        frpnow
-    #        gloss
-    #        gtk
-    #        frpnow-gtk
-    #        frpnow-gloss
-
-    #        lens
-    #        wreq
-    #        aeson-lens
-    #      ]))
-    #    ++
-    #    # other packages that I use sometimes in a shell
-    #    [
-    #    ];
+    in systemPkgs ++ xPkgs ++ guiPkgs ++ programmingTools ++ userPrograms ++ mailPkgs ++ nixPkgs ++ tmpPkgs;
+    system.extraDependencies = with pkgs; lib.singleton (
+       # Haskell packages I want to keep around
+       haskellPackages.ghcWithPackages (hpkgs: with hpkgs;
+         [
+           # frp
+           frpnow
+           gloss
+           gtk
+           frpnow-gtk
+           frpnow-gloss
+
+           lens
+           wreq
+           aeson-lens
+         ]))
+       ++
+       # other packages that I use sometimes in a shell
+       [
+       ];
 
     ###########
     # Services
 
-    services.tinc.networks.freifunk = {
-      name = "profpatsch_client";
-      debugLevel = 3;
-      listenAddress = "10.11.63.101";
-      ed25519PrivateKeyFile = "/var/lib/tinc/key.priv";
-      hosts = {
-        steini = ''
-          Address = augsburg2.total-connection.net
-          Port = 4223
-          ECDSAPublicKey = CEwnNOmriVHPnhQvVZLFNhU9vk/HCIhLotixM0w/eJh+FKEs8IbgX6mof30s3WTBHQd33XYXldx1fulLpAXURzTPgD
-        '';
-      };
-      extraConfig = ''
-        ConnectTo = steini
-      '';
-    };
-
-    services.searx.enable = true;
+    #services.searx.enable = true;
 
     services.printing = {
       enable = true;
@@ -257,13 +222,9 @@ in {
         Option "SuspendTime" "20"
         Option "OffTime" "30"
       '';
-      synaptics = {
-        enable = true;
-        minSpeed = "0.5";
-        accelFactor = "0.01";
-        twoFingerScroll = true;
-        vertEdgeScroll = false;
-      };
+      synaptics.enable = true;
+      synaptics.minSpeed = "0.5";
+      synaptics.accelFactor = "0.01";
 
 
       videoDrivers = [ "intel" ];
@@ -284,7 +245,8 @@ in {
       # };
 
       displayManager = {
-        sessionCommands = with pkgs; ''
+        sessionCommands = with pkgs;
+            ''
             #TODO add as nixpkg
             export PATH+=":$HOME/scripts" #add utility scripts
             export PATH+=":$HOME/.bin" #add (temporary) executables
@@ -294,13 +256,12 @@ in {
 
             set-background &
             # TODO xbindkeys user service file
-            ${lib.getBin xbindkeys}/bin/xbindkeys
+            ${xbindkeys}/bin/xbindkeys
             nice -n19 dropbox-cli start &
             nm-applet &
             # synchronize clipboards
-            ${lib.getBin autocutsel}/bin/autocutsel -s PRIMARY &
-            ${lib.getBin twmn}/bin/twmnd &
-          '';
+            ${autocutsel}/bin/autocutsel -s PRIMARY &
+            '';
       };
 
     };
@@ -311,7 +272,7 @@ in {
         monospace = [ "Source Code Pro" "DejaVu Sans Mono" ]; # TODO does not work
         sansSerif = [ "Liberation Sans" ];
       };
-      ultimate.preset = "ultimate4";
+      ultimate.preset = "ultimate3";
       ultimate.substitutions = "combi";
     };
     fonts.fonts = with pkgs; [
@@ -345,12 +306,7 @@ in {
     # build derivation on taalo
     vuizvui.user.aszlig.programs.taalo-build.enable = true;
 
-    vuizvui.user.profpatsch.programs = {
-      scanning.enable = true;
-
-      taffybar.enable = true;
-      taffybar.package = myPkgs.taffybar;
-    };
+    vuizvui.user.profpatsch.programs.scanning.enable = true;
 
     #######
     # Misc
@@ -363,8 +319,6 @@ in {
     # fix for emacs ssh
     programs.bash.promptInit = "PS1=\"# \"";
 
-    # containers.isso.config = ./isso-test.nix;
-
     ################
     # User services
     # systemd.user = {
diff --git a/machines/profpatsch/pkgs.nix b/machines/profpatsch/pkgs.nix
index 87c6dfaa..3e96479b 100644
--- a/machines/profpatsch/pkgs.nix
+++ b/machines/profpatsch/pkgs.nix
@@ -64,11 +64,7 @@ let
     sha256 = "03006xzs250knzcyr6j564kn9jf2a6cp3mxkpqsqmmyp6v28w90z";
   })}/overrides.nix") {};
 
-  youtube-dl = pkgs.youtube-dl.overrideDerivation (old: {
-    patches = old.patches or [] ++ [ ./patches/youtube-dl.patch ];
-  });
-
   xmpp-client = pkgs.callPackage (import ./xmpp-client.nix myLib.philip.home "irc/xmppOla.wtf") { inherit (pkgs) xmpp-client; };
 
 in
-{ inherit taffybar offlineimap sent mpv beets poezio vim fast-init youtube-dl xmpp-client; }
+{ inherit taffybar offlineimap sent mpv beets poezio vim fast-init xmpp-client; }