[feat] Fix name conflict

This commit is contained in:
Uttarayan
2024-02-15 03:50:48 +05:30
parent 504af4026f
commit 6a009ef91c
2 changed files with 24 additions and 24 deletions

42
config/nix/flake.lock generated
View File

@@ -1,25 +1,5 @@
{ {
"nodes": { "nodes": {
"darwin": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1707707289,
"narHash": "sha256-YuDt/eSTXMEHv8jS8BEZJgqCcG8Tr3cyqaZjJFXZHsw=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "44f50a5ecaab72a61d5fd8e5c5717bc4bf9c25dd",
"type": "github"
},
"original": {
"owner": "LnL7",
"repo": "nix-darwin",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@@ -202,6 +182,26 @@
"type": "github" "type": "github"
} }
}, },
"nix-darwin": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1707707289,
"narHash": "sha256-YuDt/eSTXMEHv8jS8BEZJgqCcG8Tr3cyqaZjJFXZHsw=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "44f50a5ecaab72a61d5fd8e5c5717bc4bf9c25dd",
"type": "github"
},
"original": {
"owner": "LnL7",
"repo": "nix-darwin",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1707877513, "lastModified": 1707877513,
@@ -236,10 +236,10 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"darwin": "darwin",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"neovim-nightly-overlay": "neovim-nightly-overlay", "neovim-nightly-overlay": "neovim-nightly-overlay",
"nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
} }
}, },

View File

@@ -8,7 +8,7 @@
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
darwin = { nix-darwin = {
url = "github:LnL7/nix-darwin"; url = "github:LnL7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@@ -19,7 +19,7 @@
outputs = { outputs = {
nixpkgs, nixpkgs,
home-manager, home-manager,
darwin, nix-darwin,
flake-utils, flake-utils,
... ...
} @ inputs: let } @ inputs: let
@@ -71,7 +71,7 @@
value = let value = let
pkgs = nixpkgs.legacyPackages.${device.system}; pkgs = nixpkgs.legacyPackages.${device.system};
in { in {
"Uttarayans-MacBook-Pro" = darwin.lib.darwinSystem { "Uttarayans-MacBook-Pro" = nix-darwin.lib.darwinSystem {
modules = [ modules = [
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
./darwin.nix ./darwin.nix