From ebaff40268065f6a79b899761a02fecc1e465f57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Thu, 9 Apr 2020 17:51:16 +0200 Subject: [PATCH] feat: move to NUR --- configs/default.nix | 9 ++++++++- configs/packages/default.nix | 20 +------------------- packages/scripts/default.nix | 10 ---------- 3 files changed, 9 insertions(+), 30 deletions(-) diff --git a/configs/default.nix b/configs/default.nix index 6a9ec79..5dd88ae 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -96,7 +96,14 @@ in } { nixpkgs = { - config.allowUnfree = true; + config = { + allowUnfree = true; + packageOverrides = pkgs: { + nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") { + inherit pkgs; + }; + }; + }; overlays = [ # (import ) (import ) diff --git a/configs/packages/default.nix b/configs/packages/default.nix index 97d9d47..e794faa 100644 --- a/configs/packages/default.nix +++ b/configs/packages/default.nix @@ -29,20 +29,6 @@ shellcheck ]; } - { - /* - environment.systemPackages = - let - package = pkgs.fetchFromGitHub { - owner = "kmein"; - repo = "mahlzeit"; - rev = "954c0fb3f45815999bc65d003794af6a850b069c"; - sha256 = "046yrr40hjmxkjmwzcvmwb39fxx2v2i6hgdxrjfiwilzvhikarrg"; - }; - mahlzeit = pkgs.haskellPackages.callPackage package {}; - in [ mahlzeit ]; - */ - } ]; environment.systemPackages = with pkgs; [ @@ -119,10 +105,7 @@ pass gnupg kmein.favicon - # kmein.bvg - kmein.daybook - kmein.depp - # kmein.dirmir + nur.repos.kmein.daybook kmein.genius kmein.instaget kmein.literature-quote @@ -131,7 +114,6 @@ kmein.vf kmein.vg kmein.fkill - kmein.odyssey kmein.wttr # kmein.slide kmein.tolino-screensaver diff --git a/packages/scripts/default.nix b/packages/scripts/default.nix index 9a5fd13..a0ee8ff 100644 --- a/packages/scripts/default.nix +++ b/packages/scripts/default.nix @@ -87,15 +87,5 @@ in }; bvg = pkgs.callPackage ./bvg.nix {}; - daybook = pkgs.callPackage ./daybook.nix {}; - depp = pkgs.callPackage ./depp.nix {}; nav = pkgs.callPackage ./nav.nix {}; - slide = - let slide-package = pkgs.fetchFromGitHub { - owner = "kmein"; - repo = "slide"; - rev = "0470583d22212745eab4f46076267addf4d2346c"; - sha256 = "0skcp3va9v4hmxy5ramghpz53gnyxv10wsacgmc2jr0v1wrqlzbh"; - }; - in pkgs.callPackage slide-package {}; }