From 5fd523965e1211ade3e3e5ece6df04cfb3c7cdf2 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Mon, 7 Jul 2025 07:34:31 -0500 Subject: [PATCH] add opencode from unstable --- hosts/lio/flake.lock | 103 ++++++++++++++++++++++++++----------------- hosts/lio/flake.nix | 19 +++++++- 2 files changed, 79 insertions(+), 43 deletions(-) diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index 66afdca..102a5da 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -29,18 +29,22 @@ "inputs": { "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", - "nixpkgs_opencode": "nixpkgs_opencode", + "nixpkgs": "nixpkgs_2", "ragenix": "ragenix" }, "locked": { - "path": "../../common", - "type": "path" + "lastModified": 1751857867, + "narHash": "sha256-i6AQ0VVngzaHL0/lysQCrjAxCEwRmwUY6VD4aJ/Ujks=", + "ref": "refs/heads/master", + "rev": "6ac4495912d92052b93aebdd0625b204b6a91fd1", + "revCount": 526, + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, "original": { - "path": "../../common", - "type": "path" - }, - "parent": [] + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" + } }, "crane": { "locked": { @@ -104,11 +108,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": { @@ -159,11 +163,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": { @@ -173,7 +177,39 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { + "locked": { + "lastModified": 1751637120, + "narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -189,13 +225,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1751211869, - "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", + "lastModified": 1751741127, + "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", + "rev": "29e290002bfff26af1db6f64d070698019460302", "type": "github" }, "original": { @@ -205,7 +241,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1750188666, "narHash": "sha256-yAfLvtbCzSigTfbsJeOrvljS7VYLAwi2RZ6F+qd+A5E=", @@ -220,22 +256,6 @@ "type": "github" } }, - "nixpkgs_opencode": { - "locked": { - "lastModified": 1751563480, - "narHash": "sha256-XahfJ/qXmajlyjomfq+qmeIhR0RoXRVAdG+cB3CZuJc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "78a7685519345736f6d5b717f49e4289a8f7ec7e", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "pull/419604/head", - "repo": "nixpkgs", - "type": "github" - } - }, "nvim_plugin-Almo7aya/openingh.nvim": { "flake": false, "locked": { @@ -1137,7 +1157,7 @@ "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay" }, "locked": { @@ -1157,13 +1177,14 @@ "root": { "inputs": { "common": "common", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", + "nixpkgs-unstable": "nixpkgs-unstable", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", @@ -1223,11 +1244,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1750190298, - "narHash": "sha256-ero30lVvCzmdKkY0lZR/RO+oTNTY1WXQh6vhfbcbTIk=", + "lastModified": 1751604642, + "narHash": "sha256-i+fTQx8jYMa+nAMmyLB1TXgqRQCEjvxEPPlksptxpkY=", "ref": "refs/heads/master", - "rev": "1ed03dac446683ef42035b53a410d857855d82d9", - "revCount": 291, + "rev": "86a29f880ecadb99c51d98ee0f454ae0230ff19e", + "revCount": 292, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index 35c5e66..f6f752c 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -1,10 +1,11 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Use relative to get current version for testing - common.url = "path:../../common"; - # common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; + # common.url = "path:../../common"; + common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; }; @@ -12,6 +13,7 @@ outputs = { nixpkgs, + nixpkgs-unstable, common, ros_neovim, ... @@ -39,6 +41,19 @@ ... }: { + + imports = [ + ( + { ... }: + { + nixpkgs.overlays = [ + (final: prev: { + opencode = nixpkgs-unstable.legacyPackages.${prev.system}.opencode; + }) + ]; + } + ) + ]; programs = { steam.enable = true; };