diff --git a/common/flake.lock b/common/flake.lock index 9dd0792..124cfa5 100644 --- a/common/flake.lock +++ b/common/flake.lock @@ -171,11 +171,11 @@ }, "nixpkgs_opencode": { "locked": { - "lastModified": 1751563480, - "narHash": "sha256-XahfJ/qXmajlyjomfq+qmeIhR0RoXRVAdG+cB3CZuJc=", + "lastModified": 1751724765, + "narHash": "sha256-vszZ/Y5i9KrnSm5MGxD+wTMKUMx+tpvn694vjygKuqg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "78a7685519345736f6d5b717f49e4289a8f7ec7e", + "rev": "04232b5277c9f24ab1b1b07de65fe0e886c5faf0", "type": "github" }, "original": { diff --git a/flake.lock b/flake.lock index 5fcf63d..b772e02 100644 --- a/flake.lock +++ b/flake.lock @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1749154018, - "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", + "lastModified": 1751468302, + "narHash": "sha256-tWosziZTT039x6PgEZUhzGlV8oLvdDmIgKTE8ESMaEA=", "owner": "rycee", "repo": "home-manager", - "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", + "rev": "501cfec8277f931a9c9af9f23d3105c537faeafe", "type": "github" }, "original": { @@ -139,11 +139,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749024892, - "narHash": "sha256-OGcDEz60TXQC+gVz5sdtgGJdKVYr6rwdzQKuZAJQpCA=", + "lastModified": 1751211869, + "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef", + "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", "type": "github" }, "original": { @@ -155,11 +155,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -187,11 +187,11 @@ }, "nixpkgs_opencode": { "locked": { - "lastModified": 1751351490, - "narHash": "sha256-ctx8/MHA43rXv7R7aLIi2K/yQDusChswqTm1ngHis0A=", + "lastModified": 1751724765, + "narHash": "sha256-vszZ/Y5i9KrnSm5MGxD+wTMKUMx+tpvn694vjygKuqg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7aeaddc3ad9186427b3ffea49dd36b5893993e2d", + "rev": "04232b5277c9f24ab1b1b07de65fe0e886c5faf0", "type": "github" }, "original": { diff --git a/hosts/gpdPocket3/flake.lock b/hosts/gpdPocket3/flake.lock index 70016b0..269ff0b 100644 --- a/hosts/gpdPocket3/flake.lock +++ b/hosts/gpdPocket3/flake.lock @@ -29,22 +29,18 @@ "inputs": { "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_2", + "nixpkgs_opencode": "nixpkgs_opencode", "ragenix": "ragenix" }, "locked": { - "lastModified": 1750257405, - "narHash": "sha256-Ztt+5z2BmPqxvpQT4yLV/8gaWD5Txedr3Gd38gTXOGU=", - "ref": "refs/heads/master", - "rev": "b715d8b5335b2302fefde329723bd3b4a0986c70", - "revCount": 483, - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" + "path": "../../common", + "type": "path" }, "original": { - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" - } + "path": "../../common", + "type": "path" + }, + "parent": [] }, "crane": { "locked": { @@ -108,11 +104,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1749154018, - "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", + "lastModified": 1751468302, + "narHash": "sha256-tWosziZTT039x6PgEZUhzGlV8oLvdDmIgKTE8ESMaEA=", "owner": "rycee", "repo": "home-manager", - "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", + "rev": "501cfec8277f931a9c9af9f23d3105c537faeafe", "type": "github" }, "original": { @@ -163,11 +159,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749024892, - "narHash": "sha256-OGcDEz60TXQC+gVz5sdtgGJdKVYr6rwdzQKuZAJQpCA=", + "lastModified": 1751211869, + "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef", + "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", "type": "github" }, "original": { @@ -178,22 +174,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -209,13 +189,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1750133334, - "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", + "lastModified": 1751582995, + "narHash": "sha256-u7ubvtxdTnFPpV27AHpgoKn7qHuE7sgWgza/1oj5nzA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "36ab78dab7da2e4e27911007033713bab534187b", + "rev": "7a732ed41ca0dd64b4b71b563ab9805a80a7d693", "type": "github" }, "original": { @@ -225,7 +205,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1750188666, "narHash": "sha256-yAfLvtbCzSigTfbsJeOrvljS7VYLAwi2RZ6F+qd+A5E=", @@ -240,6 +220,22 @@ "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" + } + }, "nvim_plugin-Almo7aya/openingh.nvim": { "flake": false, "locked": { @@ -1141,7 +1137,7 @@ "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay" }, "locked": { @@ -1161,13 +1157,13 @@ "root": { "inputs": { "common": "common", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "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", @@ -1227,11 +1223,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/gpdPocket3/flake.nix b/hosts/gpdPocket3/flake.nix index 866957a..b99d59c 100644 --- a/hosts/gpdPocket3/flake.nix +++ b/hosts/gpdPocket3/flake.nix @@ -3,8 +3,8 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; # for local 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"; }; @@ -52,6 +52,7 @@ tailnet.enable = true; ssh.enable = true; docker.enable = true; + opencode.enable = true; flatpaks = { enable = true; packages = [