diff --git a/flake.lock b/flake.lock index 2d562ee..c665a4d 100644 --- a/flake.lock +++ b/flake.lock @@ -204,11 +204,11 @@ ] }, "locked": { - "lastModified": 1780943742, - "narHash": "sha256-01bTMR9ZPG+uxPaZBeOwagg5uxIaFYs2/3YIrOX+bCA=", + "lastModified": 1781009359, + "narHash": "sha256-w/mZkRscTatf8NWyUstli8ROzM/eopxZzi0WRjoeYkU=", "owner": "nix-community", "repo": "home-manager", - "rev": "df39142474950e42d5fc3bf2fef9d6c62abbe8d7", + "rev": "c58ead12efcac436afffa93a22099a5595eb4157", "type": "github" }, "original": { @@ -266,22 +266,6 @@ "type": "github" } }, - "nixpkgs-master": { - "locked": { - "lastModified": 1780999776, - "narHash": "sha256-NOkSLf3ACyzdfqHXeWJGSfDzrAHhQ/KUKjeZZYzTw4M=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "4743e51d1866167bd26e1241096d7aa52d4b29fc", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "darwin": "darwin", @@ -291,7 +275,6 @@ "jail-nix": "jail-nix", "nix-homebrew": "nix-homebrew", "nixpkgs": "nixpkgs", - "nixpkgs-master": "nixpkgs-master", "systems": "systems_2", "vscode-server": "vscode-server" } diff --git a/flake.nix b/flake.nix index 3a808b3..83d2d66 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-master.url = "github:nixos/nixpkgs/master"; systems.url = "github:nix-systems/default"; home-manager = { url = "github:nix-community/home-manager"; @@ -33,7 +32,6 @@ { self, nixpkgs, - nixpkgs-master, systems, home-manager, vscode-server, @@ -43,20 +41,6 @@ let homeManagerUser = "artem"; eachSystem = nixpkgs.lib.genAttrs (import systems); - overlay-master = _: prev: { - inherit - (import nixpkgs-master { - system = prev.stdenv.hostPlatform.system; - config = { - allowUnfree = true; - } - // nixpkgs.lib.optionalAttrs (prev.stdenv.hostPlatform.system == "x86_64-darwin") { - allowDeprecatedx86_64Darwin = true; - }; - }) - antigravity-cli - ; - }; in { checks = eachSystem (system: { @@ -83,7 +67,6 @@ homeConfigurations."${homeManagerUser}@deimos" = home-manager.lib.homeManagerConfiguration { pkgs = import nixpkgs { system = "x86_64-linux"; - overlays = [ overlay-master ]; }; extraSpecialArgs.primaryUser = homeManagerUser; modules = [ @@ -97,7 +80,6 @@ homeConfigurations."${homeManagerUser}@mars" = home-manager.lib.homeManagerConfiguration { pkgs = import nixpkgs { system = "x86_64-darwin"; - overlays = [ overlay-master ]; config.allowDeprecatedx86_64Darwin = true; }; extraSpecialArgs = { @@ -122,10 +104,9 @@ inputs.fw_nix.nixosModules.futureware inputs.nix-homebrew.darwinModules.nix-homebrew ./hosts/mars/darwin.nix - (_: { - nixpkgs.overlays = [ overlay-master ]; + { nixpkgs.config.allowDeprecatedx86_64Darwin = true; - }) + } ]; }; @@ -145,9 +126,6 @@ inputs.fw_nix.nixosModules.sshd inputs.fw_nix.nixosModules.futureware ./hosts/deimos/nixos.nix - (_: { - nixpkgs.overlays = [ overlay-master ]; - }) ]; };