From 65444ae4759d16ecfb059b9552c5e9094f1da70b Mon Sep 17 00:00:00 2001 From: alina sireneva Date: Wed, 1 May 2024 04:52:53 +0300 Subject: [PATCH] chore: use `nil` from nixpkgs --- flake.lock | 83 +--------------------------------------- flake.nix | 5 --- users/teidesu/common.nix | 2 +- 3 files changed, 2 insertions(+), 88 deletions(-) diff --git a/flake.lock b/flake.lock index 1d7dd05..1287683 100644 --- a/flake.lock +++ b/flake.lock @@ -47,24 +47,6 @@ "inputs": { "systems": "systems_2" }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -121,28 +103,6 @@ "type": "github" } }, - "nil": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1704611696, - "narHash": "sha256-4ZCgV5oHdEc3q+XaIzy//gh20uC/aSuAtMU9bsfgLZk=", - "owner": "oxalica", - "repo": "nil", - "rev": "059d33a24bb76d2048740bcce936362bf54b5bc9", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "nil", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -234,7 +194,6 @@ "agenix": "agenix", "bootspec-secureboot": "bootspec-secureboot", "home-manager": "home-manager_2", - "nil": "nil", "nix-darwin": "nix-darwin", "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs", @@ -242,31 +201,6 @@ "vscode-server": "vscode-server" } }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "nil", - "flake-utils" - ], - "nixpkgs": [ - "nil", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1704593904, - "narHash": "sha256-nDoXZDTRdgF3b4n3m011y99nYFewvOl9UpzFvP8Rb3c=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "c36fd70a99decfa6e110c86f296a97613034a680", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -297,24 +231,9 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_2" }, "locked": { diff --git a/flake.nix b/flake.nix index f2f8896..9bd9de6 100755 --- a/flake.nix +++ b/flake.nix @@ -17,11 +17,6 @@ nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11"; vscode-server.url = "github:Ten0/nixos-vscode-server"; - nil = { - url = "github:oxalica/nil"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/users/teidesu/common.nix b/users/teidesu/common.nix index 8dde867..844543a 100644 --- a/users/teidesu/common.nix +++ b/users/teidesu/common.nix @@ -15,7 +15,7 @@ jq micro carapace - inputs.nil.packages.${system}.default + nil inputs.agenix.packages.${system}.default ]; } \ No newline at end of file