From 973300f70f773b9a3d3377de10eb71e52c14ccf0 Mon Sep 17 00:00:00 2001 From: coolneng Date: Tue, 6 Oct 2020 16:02:21 +0200 Subject: [PATCH] Revert "Replace lorri with nix-direnv" This reverts commit 1337c894b6e022804b26da5c4285ee31ab528ab1. --- configuration.nix | 1 - modules/development.nix | 2 +- modules/software.nix | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configuration.nix b/configuration.nix index 5d113b3..053e5e3 100644 --- a/configuration.nix +++ b/configuration.nix @@ -41,7 +41,6 @@ }; extraOptions = '' keep-outputs = true - keep-derivations = true gc-keep-outputs = true ''; }; diff --git a/modules/development.nix b/modules/development.nix index 52db4c7..9175bcc 100644 --- a/modules/development.nix +++ b/modules/development.nix @@ -2,7 +2,7 @@ { # Improve nix-shell and direnv integration - environment.pathsToLink = [ "/share/nix-direnv" ]; + services.lorri.enable = true; # Enable virtualisation virtualisation.libvirtd = { diff --git a/modules/software.nix b/modules/software.nix index 1489fa9..25a5a12 100644 --- a/modules/software.nix +++ b/modules/software.nix @@ -32,7 +32,7 @@ # Development git direnv - nix-direnv + lorri podman-compose gnumake gitAndTools.pre-commit