From 6ac4495912d92052b93aebdd0625b204b6a91fd1 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Sun, 6 Jul 2025 22:11:07 -0500 Subject: [PATCH] update common dont use overlay it is merged in upstream --- common/flake.lock | 29 ++++++----------------------- common/flake.nix | 13 ------------- flake.lock | 35 +++++++++-------------------------- flake.nix | 1 - 4 files changed, 15 insertions(+), 63 deletions(-) diff --git a/common/flake.lock b/common/flake.lock index 124cfa5..9133d18 100644 --- a/common/flake.lock +++ b/common/flake.lock @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1751468302, - "narHash": "sha256-tWosziZTT039x6PgEZUhzGlV8oLvdDmIgKTE8ESMaEA=", + "lastModified": 1751810233, + "narHash": "sha256-kllkNbIqQi3VplgTMeGzuh1t8Gk8TauvkTRt93Km+tQ=", "owner": "rycee", "repo": "home-manager", - "rev": "501cfec8277f931a9c9af9f23d3105c537faeafe", + "rev": "9b0873b46c9f9e4b7aa01eb634952c206af53068", "type": "github" }, "original": { @@ -139,11 +139,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751211869, - "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", + "lastModified": 1751582995, + "narHash": "sha256-u7ubvtxdTnFPpV27AHpgoKn7qHuE7sgWgza/1oj5nzA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", + "rev": "7a732ed41ca0dd64b4b71b563ab9805a80a7d693", "type": "github" }, "original": { @@ -169,22 +169,6 @@ "type": "github" } }, - "nixpkgs_opencode": { - "locked": { - "lastModified": 1751724765, - "narHash": "sha256-vszZ/Y5i9KrnSm5MGxD+wTMKUMx+tpvn694vjygKuqg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "04232b5277c9f24ab1b1b07de65fe0e886c5faf0", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "pull/419604/head", - "repo": "nixpkgs", - "type": "github" - } - }, "ragenix": { "inputs": { "agenix": "agenix", @@ -211,7 +195,6 @@ "inputs": { "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", - "nixpkgs_opencode": "nixpkgs_opencode", "ragenix": "ragenix" } }, diff --git a/common/flake.nix b/common/flake.nix index db0bc17..cf11ae7 100644 --- a/common/flake.nix +++ b/common/flake.nix @@ -4,8 +4,6 @@ home-manager.url = "github:rycee/home-manager/release-25.05"; ragenix.url = "github:yaxitech/ragenix"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; - - nixpkgs_opencode.url = "github:nixos/nixpkgs/pull/419604/head"; }; outputs = @@ -13,7 +11,6 @@ home-manager, ragenix, nix-flatpak, - nixpkgs_opencode, ... }: { @@ -26,16 +23,6 @@ }: { imports = [ - ( - { ... }: - { - nixpkgs.overlays = [ - (final: prev: { - opencode = nixpkgs_opencode.legacyPackages.${prev.system}.opencode; - }) - ]; - } - ) home-manager.nixosModules.home-manager ragenix.nixosModules.age nix-flatpak.nixosModules.nix-flatpak diff --git a/flake.lock b/flake.lock index b772e02..d60a1e2 100644 --- a/flake.lock +++ b/flake.lock @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1751468302, - "narHash": "sha256-tWosziZTT039x6PgEZUhzGlV8oLvdDmIgKTE8ESMaEA=", + "lastModified": 1751810233, + "narHash": "sha256-kllkNbIqQi3VplgTMeGzuh1t8Gk8TauvkTRt93Km+tQ=", "owner": "rycee", "repo": "home-manager", - "rev": "501cfec8277f931a9c9af9f23d3105c537faeafe", + "rev": "9b0873b46c9f9e4b7aa01eb634952c206af53068", "type": "github" }, "original": { @@ -139,11 +139,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751211869, - "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", + "lastModified": 1751582995, + "narHash": "sha256-u7ubvtxdTnFPpV27AHpgoKn7qHuE7sgWgza/1oj5nzA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", + "rev": "7a732ed41ca0dd64b4b71b563ab9805a80a7d693", "type": "github" }, "original": { @@ -155,11 +155,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "lastModified": 1751637120, + "narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3", "type": "github" }, "original": { @@ -185,22 +185,6 @@ "type": "github" } }, - "nixpkgs_opencode": { - "locked": { - "lastModified": 1751724765, - "narHash": "sha256-vszZ/Y5i9KrnSm5MGxD+wTMKUMx+tpvn694vjygKuqg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "04232b5277c9f24ab1b1b07de65fe0e886c5faf0", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "pull/419604/head", - "repo": "nixpkgs", - "type": "github" - } - }, "ragenix": { "inputs": { "agenix": "agenix", @@ -228,7 +212,6 @@ "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs_2", - "nixpkgs_opencode": "nixpkgs_opencode", "ragenix": "ragenix" } }, diff --git a/flake.nix b/flake.nix index 4654b15..8dab2ba 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,6 @@ home-manager.url = "github:rycee/home-manager/release-25.05"; ragenix.url = "github:yaxitech/ragenix"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; - nixpkgs_opencode.url = "github:nixos/nixpkgs/pull/419604/head"; # ====== };