diff --git a/hosts/gpdPocket3/flake.lock b/hosts/gpdPocket3/flake.lock index 4188cb7..b5959f7 100644 --- a/hosts/gpdPocket3/flake.lock +++ b/hosts/gpdPocket3/flake.lock @@ -271,25 +271,6 @@ "url": "https://git.joshuabell.xyz/dotfiles" } }, - "mod_ros_neovim": { - "inputs": { - "ringofstorms-nvim": "ringofstorms-nvim" - }, - "locked": { - "lastModified": 1735796481, - "narHash": "sha256-DvenriWxmFoh/hJ0nxpTKEr4lzgD+exLPboN4CK8Zyk=", - "ref": "mod_neovim", - "rev": "311a994ebb87242d55b9f00eed0232aa5b4c51d8", - "revCount": 1, - "type": "git", - "url": "https://git.joshuabell.xyz/dotfiles" - }, - "original": { - "ref": "mod_neovim", - "type": "git", - "url": "https://git.joshuabell.xyz/dotfiles" - } - }, "mod_ros_stormd": { "inputs": { "ringofstorms-stormd": "ringofstorms-stormd" @@ -325,38 +306,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1735697839, - "narHash": "sha256-0Acw0UaLi+VNThsmeX8zOKi000DFrYXNnrgpOpk2+MM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5eaa5fdf06d2b15d373b82c0f3a1ec1c6cab02ae", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1735531152, - "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1728888510, "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", @@ -372,7 +321,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_2": { "locked": { "lastModified": 1735669367, "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=", @@ -388,6 +337,22 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1735697839, + "narHash": "sha256-0Acw0UaLi+VNThsmeX8zOKi000DFrYXNnrgpOpk2+MM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5eaa5fdf06d2b15d373b82c0f3a1ec1c6cab02ae", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, "nvim_plugin-Almo7aya/openingh.nvim": { "flake": false, "locked": { @@ -1325,10 +1290,41 @@ "type": "github" } }, - "ringofstorms-nvim": { + "ringofstorms-stormd": { "inputs": { + "nix-filter": "nix-filter", "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable", + "rust-overlay": "rust-overlay_3" + }, + "locked": { + "lastModified": 1735420577, + "narHash": "sha256-2HWEALz0PVJCiP/2iZuDMj4qyukXR5IxNKFxT1NAMlQ=", + "ref": "refs/heads/master", + "rev": "7edf6888a460708889fabea2c762d4dfed4fa64f", + "revCount": 51, + "type": "git", + "url": "ssh://git.joshuabell.xyz:3032/stormd" + }, + "original": { + "type": "git", + "url": "ssh://git.joshuabell.xyz:3032/stormd" + } + }, + "root": { + "inputs": { + "mod_boot_systemd": "mod_boot_systemd", + "mod_common": "mod_common", + "mod_de_cosmic": "mod_de_cosmic", + "mod_home-manager": "mod_home-manager", + "mod_nebula": "mod_nebula", + "mod_ros_stormd": "mod_ros_stormd", + "nixpkgs": "nixpkgs_2", + "ros_neovim": "ros_neovim" + } + }, + "ros_neovim": { + "inputs": { + "nixpkgs": "nixpkgs_3", "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", @@ -1386,52 +1382,20 @@ "nvim_plugin-yetone/avante.nvim": "nvim_plugin-yetone/avante.nvim", "nvim_plugin-zbirenbaum/copilot-cmp": "nvim_plugin-zbirenbaum/copilot-cmp", "nvim_plugin-zbirenbaum/copilot.lua": "nvim_plugin-zbirenbaum/copilot.lua", - "rust-overlay": "rust-overlay_3" - }, - "locked": { - "lastModified": 1735698506, - "narHash": "sha256-S1lVjc2wayhC50B4Wo3p958bTjd1kqiMSiWnc4hdWZg=", - "ref": "refs/heads/master", - "rev": "3d9d5258b72ea19863a53d6ac69e6dffc4ad2ba6", - "revCount": 250, - "type": "git", - "url": "https://git.joshuabell.xyz/nvim" - }, - "original": { - "type": "git", - "url": "https://git.joshuabell.xyz/nvim" - } - }, - "ringofstorms-stormd": { - "inputs": { - "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1735420577, - "narHash": "sha256-2HWEALz0PVJCiP/2iZuDMj4qyukXR5IxNKFxT1NAMlQ=", + "lastModified": 1735841437, + "narHash": "sha256-ZwmlaFhOlQ7f6Rq6VxRup7giPiwQlwe71HcoO/laRJo=", "ref": "refs/heads/master", - "rev": "7edf6888a460708889fabea2c762d4dfed4fa64f", - "revCount": 51, + "rev": "71d82c875fff85ae250804f45f1acf65f42cdc1e", + "revCount": 253, "type": "git", - "url": "ssh://git.joshuabell.xyz:3032/stormd" + "url": "https://git.joshuabell.xyz/nvim" }, "original": { "type": "git", - "url": "ssh://git.joshuabell.xyz:3032/stormd" - } - }, - "root": { - "inputs": { - "mod_boot_systemd": "mod_boot_systemd", - "mod_common": "mod_common", - "mod_de_cosmic": "mod_de_cosmic", - "mod_home-manager": "mod_home-manager", - "mod_nebula": "mod_nebula", - "mod_ros_neovim": "mod_ros_neovim", - "mod_ros_stormd": "mod_ros_stormd", - "nixpkgs": "nixpkgs_3" + "url": "https://git.joshuabell.xyz/nvim" } }, "rust-overlay": { @@ -1479,28 +1443,6 @@ } }, "rust-overlay_3": { - "inputs": { - "nixpkgs": [ - "mod_ros_neovim", - "ringofstorms-nvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735612067, - "narHash": "sha256-rsjojgfPUf9tWuMXuuo2KAIoUZ49XGZQJSjFGOO8Cq4=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "d199142e84bfaae476ffb4e09a70879d7918784d", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_4": { "inputs": { "nixpkgs": [ "mod_ros_stormd", @@ -1522,6 +1464,27 @@ "type": "github" } }, + "rust-overlay_4": { + "inputs": { + "nixpkgs": [ + "ros_neovim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1735612067, + "narHash": "sha256-rsjojgfPUf9tWuMXuuo2KAIoUZ49XGZQJSjFGOO8Cq4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "d199142e84bfaae476ffb4e09a70879d7918784d", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828,