From aaff66142abb7de5ba6becf00baf4bd8301760bf Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Sun, 17 Jan 2021 17:17:25 -0500 Subject: [PATCH] Import overlays --- README.md | 2 +- flake.nix | 8 ++------ main/packages.nix | 6 +++--- overlays/default.nix | 1 + 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index c14ce66..61babd9 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![built with nix](https://builtwithnix.org/badge.svg)](https://builtwithnix.org) -This repo stores nix to manage my machines. The initial structure was inspired from [here](https://gitlab.com/samuelgrf/nixos-config/-/tree/master/). +This repo stores nix to manage my machines. The initial structure was inspired by [samuelgrf/nixos-config](https://gitlab.com/samuelgrf/nixos-config/-/tree/master/). ## Setup diff --git a/flake.nix b/flake.nix index bd5b5c3..068f381 100644 --- a/flake.nix +++ b/flake.nix @@ -19,11 +19,6 @@ ./main/kernel.nix ./main/packages.nix ./main/printing.nix - # ./main/hardware.nix - # ./main/misc.nix - # ./main/networking.nix - # ./main/services.nix - # ./main/terminal.nix ({ config, lib, lib', ... }: { config = { @@ -38,7 +33,8 @@ nixpkgs-unstable.flake = nixpkgs-unstable; }; - # nixpkgs.overlays = [ (import ./overlays) ]; + # nixpkgs.overlays = (import ./overlays); + nixpkgs.overlays = import ./overlays { inherit nixpkgs; }; home-manager = { useGlobalPkgs = true; diff --git a/main/packages.nix b/main/packages.nix index 71d6cee..8e3edd3 100644 --- a/main/packages.nix +++ b/main/packages.nix @@ -141,9 +141,9 @@ gnome3.gnome-tweaks # overlays - # lpass - # rfd - # vpngate + lpass + rfd + vpngate ]; in common; diff --git a/overlays/default.nix b/overlays/default.nix index 7ceafd0..06ad3ff 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -5,3 +5,4 @@ (import ./lastpass.nix) (import ./vpngate.nix) ] +