From e9ab9fdf76481229fe0235bbdfc80f152647c292 Mon Sep 17 00:00:00 2001 From: Adithya Nair Date: Fri, 12 Jan 2024 13:44:59 +0530 Subject: [PATCH] remove flake_env --- flake.lock | 65 ++-------------------------------------- flake.nix | 8 ----- home/programs/direnv.nix | 5 +--- 3 files changed, 4 insertions(+), 74 deletions(-) diff --git a/flake.lock b/flake.lock index 7520d7f..30b0504 100644 --- a/flake.lock +++ b/flake.lock @@ -54,27 +54,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "flake_env", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -95,7 +74,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -152,28 +131,6 @@ "type": "github" } }, - "flake_env": { - "inputs": { - "flake-parts": "flake-parts", - "nix-filter": "nix-filter", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1704308731, - "narHash": "sha256-OEEFi+rPrkpJYRzmp62nSmrGwb+H/nA4fgGEqj6h7oY=", - "ref": "refs/heads/main", - "rev": "31cac9373c708a99698f461006f94e3216e53d04", - "revCount": 13, - "type": "git", - "url": "https://git.sr.ht/~bryan_bennett/flake_env" - }, - "original": { - "type": "git", - "url": "https://git.sr.ht/~bryan_bennett/flake_env" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -257,7 +214,7 @@ "inputs": { "crane": "crane", "flake-compat": "flake-compat", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "flake-utils": [ "flake-utils" ], @@ -302,21 +259,6 @@ "type": "github" } }, - "nix-filter": { - "locked": { - "lastModified": 1701697642, - "narHash": "sha256-L217WytWZHSY8GW9Gx1A64OnNctbuDbfslaTEofXXRw=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "c843418ecfd0344ecb85844b082ff5675e02c443", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1704722960, @@ -351,7 +293,7 @@ }, "nixvim": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "home-manager": [ "home-manager" ], @@ -437,7 +379,6 @@ "root": { "inputs": { "flake-utils": "flake-utils", - "flake_env": "flake_env", "home-manager": "home-manager", "impermanence": "impermanence", "lanzaboote": "lanzaboote", diff --git a/flake.nix b/flake.nix index faee0ae..a3fdc3f 100644 --- a/flake.nix +++ b/flake.nix @@ -34,13 +34,6 @@ nixpkgs.follows = "nixpkgs"; }; }; - - flake_env = { - url = "git+https://git.sr.ht/~bryan_bennett/flake_env"; - inputs = { - nixpkgs.follows = "nixpkgs"; - }; - }; }; outputs = @@ -51,7 +44,6 @@ , impermanence , lanzaboote , nixvim - , flake_env , } @ inputs: let diff --git a/home/programs/direnv.nix b/home/programs/direnv.nix index 37e30fd..37f6d99 100644 --- a/home/programs/direnv.nix +++ b/home/programs/direnv.nix @@ -1,9 +1,6 @@ -{ pkgs, flake_env, ... }: { +_: { programs.direnv = { enable = true; nix-direnv.enable = true; - stdlib = '' - source ${flake_env.packages.${pkgs.system}.flake_env}/share/flake_env/direnvrc - ''; }; }