From 9686e92320b058fbaa4318a5144fcfa1b8573dd1 Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Wed, 21 Aug 2019 23:45:09 +0200
Subject: [PATCH] move package overrides to overlay

---
 home/config.nix   | 35 +----------------------------------
 home/home.nix     |  5 ++++-
 home/overlays.nix | 31 ++++++++++++++++++++++++++++++-
 3 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/home/config.nix b/home/config.nix
index 7d5f6ed..c4e15d4 100644
--- a/home/config.nix
+++ b/home/config.nix
@@ -4,6 +4,7 @@ let
 in
   {
 
+    firefox.enablePlasmaBrowserIntegration = true;
     clementine.spotify = false;
     whitelistedLicenses = with lib.licenses; [ wtfpl ];
     vim =
@@ -11,38 +12,4 @@ in
       python = true;
       multibyteSupport = true;
     };
-
-    packageOverrides = pkgs: with pkgs;
-    rec {
-      myVim = (vim_configurable.override {python = python3;}).customize {
-            # executable/ package name
-            name = "vim";
-            vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; {
-          # loaded on start
-          start = [
-            ale
-            ctrlp
-            #deoplete-jedi
-            direnv-vim
-            fugitive
-            jedi-vim
-            nerdtree
-            nerdtree-git-plugin
-            supertab
-            vim-pandoc
-            vim-pandoc-syntax
-            vim-nix
-            vim-jinja
-          ];
-        };
-        vimrcConfig.customRC = 
-          ''if filereadable($HOME . "/.vimrc")
-            source ~/.vimrc
-          endif
-          '';
-      };
-      # build with debug symbols and in debug mode (less optimized)
-      opencvDebug = enableDebugging ((opencv3.override {enablePython=true; enableGtk3=true; enableDocs=true; pythonPackages=pkgs.python3Packages; }).overrideAttrs (oldAttrs: rec {cmakeBuildType = "Debug";}));
-    };
-
   }
diff --git a/home/home.nix b/home/home.nix
index d596d7f..b0cc240 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -5,6 +5,7 @@ with pkgs;
 let
   unstable = import <nixos-unstable> {};
   mybrowser = firefox;
+  lorri = import (fetchTarball { url = "https://github.com/target/lorri/archive/rolling-release.tar.gz"; }) { };
 
   desktopApps = [
     mybrowser
@@ -119,6 +120,7 @@ let
 
   nixHelpers = [
     nox
+    lorri
     ];
 
   kdeTools = with kdeApplications; [
@@ -172,6 +174,7 @@ let
     mtr
     wireshark
     ripgrep
+    ghc
     ];
 
 
@@ -233,7 +236,7 @@ let
   ];
 
   games = [
-    superTuxKart
+    unstable.superTuxKart
     hedgewars
     steam-run-native
   ];
diff --git a/home/overlays.nix b/home/overlays.nix
index 69febdf..e62addb 100644
--- a/home/overlays.nix
+++ b/home/overlays.nix
@@ -1,7 +1,36 @@
 [(self: super:
 {
   amarok = super.libsForQt5.callPackage ./ov/amarok.nix {};
-  stapler = super.python2.callPackage ./ov/stapler.nix {};
+  #stapler = super.python2.callPackage ./ov/stapler.nix {};
   #tor-browser-bundle-bin = super.callPackage ./ov/tor-browser-bundle-bin.nix { inherit (super.gnome3) defaultIconTheme; };
+  myVim = with super; (vim_configurable.override {python = python3;}).customize {
+        # executable/ package name
+        name = "vim";
+        vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; {
+      # loaded on start
+      start = [
+        ale
+        ctrlp
+        #deoplete-jedi
+        direnv-vim
+        fugitive
+        jedi-vim
+        nerdtree
+        nerdtree-git-plugin
+        supertab
+        vim-pandoc
+        vim-pandoc-syntax
+        vim-nix
+        vim-jinja
+      ];
+    };
+    vimrcConfig.customRC = 
+      ''if filereadable($HOME . "/.vimrc")
+        source ~/.vimrc
+      endif
+      '';
+  };
+  # build with debug symbols and in debug mode (less optimized)
+  opencvDebug = with super; enableDebugging ((opencv3.override {enablePython=true; enableGtk3=true; enableDocs=true; pythonPackages=pkgs.python3Packages; }).overrideAttrs (oldAttrs: rec {cmakeBuildType = "Debug";}));
 }
 )]