From 4ceba930001259c6b4e3e7189a86b1463a2ccb9d Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 16 Feb 2020 03:05:47 +0100
Subject: machines/profpatsch/pkgs: clean up
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove everything I haven’t been using:
- nix with an override
- some containerization attempt
- taffybar with patches
- git-annex with override
- poezio
- searx with patches
- ghci with additional packages
---
 machines/profpatsch/pkgs.nix | 74 +-------------------------------------------
 1 file changed, 1 insertion(+), 73 deletions(-)

(limited to 'machines/profpatsch/pkgs.nix')

diff --git a/machines/profpatsch/pkgs.nix b/machines/profpatsch/pkgs.nix
index 24d089c0..98a7988c 100644
--- a/machines/profpatsch/pkgs.nix
+++ b/machines/profpatsch/pkgs.nix
@@ -2,63 +2,12 @@
 
 let
 
-  nix = pkgs.nix.overrideAttrs (old: {
-    patches = old.patches or [] ++ [
-      (pkgs.fetchpatch {
-        url = "https://github.com/NixOS/nix/commit/486872150638d56483c2bc429ba9e137d9974ee8.patch";
-        sha256 = "0g0bp7gw6aqrscxkfmg6ykw91vm7b602h2dwbl53ycsa92bqfayq";
-      }) ];
-  });
-
-  addPythonRuntimeDeps = drv: deps: drv.overrideDerivation (old: {
-    propagatedNativeBuildInputs = old.propagatedNativeBuildInputs ++ deps;
-  });
-
-  # containered = name: packages: users: { ... }:
-  #   {
-  #     containers."${name}" = {
-  #       config = {
-  #         environment.systemPackages = packages;
-  #         users.users = users;
-  #         services.sshd.enable = true;
-  #       };
-  #       privateNetwork = true;
-  #       localAddress = "127.0.0.2";
-  #     };
-  #     nixpkgs.config.allowUnfree = true;
-  #   };
-
-  # pkgs
-
-  taffybar = pkgs.taffybar.override {
-    ghcWithPackages = (pkgs.haskellPackages.override {
-      overrides = _: super: {
-        taffybar = super.taffybar.overrideDerivation (old: {
-          name = old.name + "foo";
-          patches = (old.patches or []) ++ [ ./patches/taffybar.patch ];
-          postPatch = old.postPathPhase or "" + ''
-            patch -R ${./patches/taffybar-color.patch}
-          '';
-        });
-      };
-    }).ghcWithPackages;
-  };
-
   mpv = pkgs.mpv-with-scripts.override {
     scripts = [ pkgs.mpvScripts.convert ];
   };
 
   beets = pkgs.beets.override { enableAlternatives = true; };
 
-  # 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;
-
   vim = pkgs.vim_configurable;
 
   fast-init = pkgs.haskellPackages.callPackage (import "${(pkgs.fetchFromGitHub {
@@ -69,22 +18,6 @@ let
     sha256 = "03006xzs250knzcyr6j564kn9jf2a6cp3mxkpqsqmmyp6v28w90z";
   })}/overrides.nix") {};
 
-  # searx = pkgs.searx.overrideAttrs (old: {
-  #   propagatedBuildInputs = old.propagatedBuildInputs ++ [ pythonPackages.pyxdg ];
-  #   patches = old.patches or [] ++ [
-  #     ./patches/searx-secret-key.patch
-  #     ./patches/searx-rm-soundcloud.patch
-  #   ];
-  #   # xdg.BaseDirectory.save_cache_path() will try to create leading dirs, but
-  #   # within the builder we don't have a writable home directory.
-  #   preCheck = (old.preCheck or "") + ''
-  #     export XDG_CACHE_HOME="$TMPDIR/cache"
-  #   '';
-  # });
-
-  # A ghci with some sane default packages in scope, & hoogle
-  saneGhci = pkgs.haskellPackages.ghcWithHoogle (h: with h; [ protolude pretty-show ]);
-
   pyrnotify =
     let src = pkgs.fetchFromGitHub {
           owner = "arnottcr";
@@ -102,15 +35,10 @@ let
 
 in
 { inherit
-    nix
-    taffybar
     mpv
     beets
-    poezio
     vim
-    fast-init
-    saneGhci
-    /*searx*/
+    # fast-init
     pyrnotify
     ;
 }
-- 
cgit 1.4.1