diff options
| author | Soispha <soispha@vhack.eu> | 2023-08-19 17:38:25 +0200 |
|---|---|---|
| committer | Soispha <soispha@vhack.eu> | 2023-08-19 17:38:25 +0200 |
| commit | 665be3f4eb3f3932f73af1941c275406f1235fbe (patch) | |
| tree | fb297601d73b2b3efd745230dbe2eb7edcf39cf9 | |
| parent | Fix(hm/packages): Remove neovim as it's already added by nixvim (diff) | |
| download | nixos-config-665be3f4eb3f3932f73af1941c275406f1235fbe.tar.gz nixos-config-665be3f4eb3f3932f73af1941c275406f1235fbe.zip | |
Fix(flake): Remove Merge conflicts
| -rw-r--r-- | flake.lock | 14 | ||||
| -rw-r--r-- | flake.nix | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/flake.lock b/flake.lock index f16f16a5..2ce9fb11 100644 --- a/flake.lock +++ b/flake.lock @@ -321,11 +321,11 @@ ] }, "locked": { - "lastModified": 1692260837, - "narHash": "sha256-2FpkX1zl+7ni7djK7NeE1ZGupRUwZgjW+RPCSBgDf4k=", + "lastModified": 1692448348, + "narHash": "sha256-/Wy9Bzw59A5OD82S9dWHshg+wiSzJNh95hPXNhO5K7E=", "owner": "nix-community", "repo": "home-manager", - "rev": "6a94c1a59737783c282c4031555a289c28b961e4", + "rev": "bdb5bcad01ff7332fdcf4b128211e81905113f84", "type": "github" }, "original": { @@ -363,7 +363,7 @@ "flake-utils" ], "nixpkgs": [ - "nixpkgs_stable_release" + "nixpkgs-stable" ], "pre-commit-hooks-nix": [ "pre-commit-hooks" @@ -578,7 +578,7 @@ "type": "github" } }, - "nixpkgs_stable_release": { + "nixpkgs-stable": { "locked": { "lastModified": 1692339729, "narHash": "sha256-TUK76/Pqm9qIDjEGd27Lz9EiBIvn5F70JWDmEQ4Y5DQ=", @@ -665,7 +665,7 @@ "nixpkgs" ], "nixpkgs-stable": [ - "nixpkgs_stable_release" + "nixpkgs-stable" ] }, "locked": { @@ -768,7 +768,7 @@ "nixVim": "nixVim", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs", - "nixpkgs_stable_release": "nixpkgs_stable_release", + "nixpkgs-stable": "nixpkgs-stable", "poetry2nix": "poetry2nix", "pre-commit-hooks": "pre-commit-hooks", "ragenix": "ragenix", diff --git a/flake.nix b/flake.nix index f875c033..6be4609d 100644 --- a/flake.nix +++ b/flake.nix @@ -37,7 +37,7 @@ nixpkgs.follows = "nixpkgs"; flake-utils.follows = "flake-utils"; flake-compat.follows = "flake-compat"; - nixpkgs-stable.follows = "nixpkgs_stable_release"; + nixpkgs-stable.follows = "nixpkgs-stable"; gitignore.follows = "gitignore"; }; }; |