From 0e0974f0f4c2e16ce62cf560bc8b2d0f31cd2499 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 29 Aug 2016 01:49:10 +0200
Subject: machines/katara: add/rm packages

---
 machines/profpatsch/base.nix   |  3 ++-
 machines/profpatsch/katara.nix | 20 +++++++++++---------
 machines/profpatsch/pkgs.nix   | 14 +++++++-------
 3 files changed, 20 insertions(+), 17 deletions(-)

(limited to 'machines')

diff --git a/machines/profpatsch/base.nix b/machines/profpatsch/base.nix
index f367cc80..1fffd9de 100644
--- a/machines/profpatsch/base.nix
+++ b/machines/profpatsch/base.nix
@@ -60,6 +60,7 @@ in {
         manpages          # system manpages (not included by default)
         mkpasswd          # UNIX password creator
         nmap              # stats about clients in the network
+        rsync             # file syncing tool
         smartmontools     # check disk state
         stow              # dotfile management
         tmux              # detachable terminal multiplexer
@@ -92,4 +93,4 @@ in {
     users.users = { inherit philip; };
 
   };
-}
\ No newline at end of file
+}
diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix
index 67b6883c..a757127d 100644
--- a/machines/profpatsch/katara.nix
+++ b/machines/profpatsch/katara.nix
@@ -72,7 +72,7 @@ in {
         atool             # archive tools
         gnupg gnupg1compat # PGP encryption
         imagemagick       # image conversion
-        jmtpfs            # MTP fuse
+        pkgs.vuizvui.jmtpfs     # MTP fuse
         mosh              # ssh with stable connections
         nfs-utils         # the filesystem of the future for 20 years
         # TODO move into atool deps
@@ -83,9 +83,10 @@ in {
         dunst             # notification daemon (interfaces with libnotify)
         alock             # lock screen
         libnotify         # notification library
-        myPkgs.taffybar   # status bar
         xclip             # clipboard thingy
         xorg.xkill        # X11 application kill
+        # TODO get service to work (requires user dbus)
+        myPkgs.taffybar
       ];
       guiPkgs = [
         gnome3.adwaita-icon-theme
@@ -96,12 +97,12 @@ in {
       ];
       hp = haskellPackages;
       programmingTools = [
-        hp.cabal2nix          # convert cabal files to nixexprs
-        hp.cabal-install      # haskell project management
-        myPkgs.git-annex # version controlled binary file storage
-        # mercurial             # the other version control system
-        telnet                # tcp debugging
+        cabal2nix            # convert cabal files to nixexprs
+        cabal-install        # haskell project management
         myPkgs.fast-init     # fast-init of haskell projects
+        gitAndTools.git-annex     # version controlled binary file storage
+        # mercurial          # the other version control system
+        telnet               # tcp debugging
       ];
       userPrograms = [
         abcde                # high-level cd-ripper with tag support
@@ -109,8 +110,8 @@ in {
         # TODO integrate lame into audacity
         audacity lame.lib    # audio editor and mp3 codec
         myPkgs.beets         # audio file metadata tagger
-        chromium             # browser
-        # (chromium.override { enablePepperFlash = true; })
+        # chromium             # browser
+        (chromium.override { enablePepperFlash = true; })
         # droopy               # simple HTML upload server
         unfreeAndNonDistributablePkgs.dropbox-cli # dropbox.com client
         emacs                # pretty neat operating system i guess
@@ -133,6 +134,7 @@ in {
         rtorrent             # monster of a bittorrent client
         myPkgs.sent          # suckless presentation tool
         pkgs.vuizvui.show-qr-code # display a QR code
+        youtube-dl           # download videos
         zathura              # pdf viewer
       ];
       mailPkgs = [
diff --git a/machines/profpatsch/pkgs.nix b/machines/profpatsch/pkgs.nix
index 35f65a04..ecb50c67 100644
--- a/machines/profpatsch/pkgs.nix
+++ b/machines/profpatsch/pkgs.nix
@@ -45,12 +45,12 @@ let
 
   beets = pkgs.beets.override { enableAlternatives = true; };
 
-  git-annex = pkgs.gitAndTools.git-annex.overrideDerivation (old: {
-      buildInputs = old.buildInputs ++ [ pkgs.makeWrapper ];
-      postFixup = ''
-        wrapProgram $out/bin/git-annex --prefix PATH ":" "${pkgs.lsof}/bin";
-      '';
-  });
+  # git-annex = hplts.git-annex.overrideDerivation (old: {
+  #     buildInputs = old.buildInputs ++ [ pkgs.makeWrapper ];
+  #     postFixup = ''
+  #       wrapProgram $out/bin/git-annex --prefix PATH ":" "${getBin pkgs.lsof}/bin";
+  #     '';
+  # });
 
   poezio = pkgs.python34Packages.poezio;
 
@@ -66,4 +66,4 @@ let
 
 
 in
-{ inherit taffybar offlineimap sent mpv beets git-annex poezio vim fast-init; }
+{ inherit taffybar offlineimap sent mpv beets poezio vim fast-init; }
-- 
cgit 1.4.1