From 667fad8f1e45ecb2ee1de91dc387d84666569f8e Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Thu, 26 Dec 2019 18:25:02 -0700 Subject: [PATCH] pkgs: import all packages into core overlay --- pkgs/data/fonts/dejavu-nerdfont/default.nix | 2 +- pkgs/default.nix | 5 +++++ profiles/core.nix | 5 +++++ profiles/develop/default.nix | 9 +-------- profiles/develop/zsh/default.nix | 7 ------- profiles/graphical/default.nix | 2 -- 6 files changed, 12 insertions(+), 18 deletions(-) create mode 100644 pkgs/default.nix diff --git a/pkgs/data/fonts/dejavu-nerdfont/default.nix b/pkgs/data/fonts/dejavu-nerdfont/default.nix index 240850c..fe2f717 100644 --- a/pkgs/data/fonts/dejavu-nerdfont/default.nix +++ b/pkgs/data/fonts/dejavu-nerdfont/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "dejavu-sans-mono-nerdfonts-${version}"; + name = "dejavu-nerdfont-${version}"; version = "2.0.0"; src = fetchzip { diff --git a/pkgs/default.nix b/pkgs/default.nix new file mode 100644 index 0000000..6060c8d --- /dev/null +++ b/pkgs/default.nix @@ -0,0 +1,5 @@ +self: super: { + sddm-chili = super.callPackage ./applications/display-managers/sddm/themes/chili {}; + dejavu_nerdfont = super.callPackage ./data/fonts/dejavu-nerdfont {}; + purs = super.callPackage ./shells/zsh/purs {}; +} diff --git a/profiles/core.nix b/profiles/core.nix index 960e9d1..5d41048 100644 --- a/profiles/core.nix +++ b/profiles/core.nix @@ -142,6 +142,11 @@ in nixpkgs.config.allowUnfree = true; + nixpkgs.overlays = let + overlay = import ../pkgs; + in + [ overlay ]; + programs.mtr.enable = true; diff --git a/profiles/develop/default.nix b/profiles/develop/default.nix index cf476f8..18506f7 100644 --- a/profiles/develop/default.nix +++ b/profiles/develop/default.nix @@ -31,19 +31,12 @@ ]; fonts = { - fonts = [ pkgs.dejaVuNerdFont ]; + fonts = [ pkgs.dejavu_nerdfont ]; fontconfig.defaultFonts.monospace = [ "DejaVu Sans Mono Nerd Font Complete Mono" ]; }; - nixpkgs.overlays = let - font = self: super: { - dejaVuNerdFont = super.callPackage ../../pkgs/data/fonts/dejavu-nerdfont {}; - }; - in - [ font ]; - documentation.dev.enable = true; programs.thefuck.enable = true; diff --git a/profiles/develop/zsh/default.nix b/profiles/develop/zsh/default.nix index 17187ca..06e3f96 100644 --- a/profiles/develop/zsh/default.nix +++ b/profiles/develop/zsh/default.nix @@ -63,13 +63,6 @@ in }; - nixpkgs.overlays = let - purs = self: super: - { purs = super.callPackage ../../../pkgs/shells/zsh/purs {}; }; - in - [ purs ]; - - programs.zsh = { enable = true; diff --git a/profiles/graphical/default.nix b/profiles/graphical/default.nix index ee667c2..aeabc77 100644 --- a/profiles/graphical/default.nix +++ b/profiles/graphical/default.nix @@ -102,8 +102,6 @@ in [icon theme] Inherits=Adwaita ''; - - sddm-chili = super.callPackage ../../pkgs/applications/display-managers/sddm/themes/chili {}; }; in [ overlay ];