diff --git a/hosts/oren/flake.lock b/hosts/oren/flake.lock index b5959f7..f2defaa 100644 --- a/hosts/oren/flake.lock +++ b/hosts/oren/flake.lock @@ -3,9 +3,9 @@ "agenix": { "inputs": { "darwin": "darwin", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "nixpkgs": [ - "mod_common", + "mod_secrets", "ragenix", "nixpkgs" ], @@ -35,15 +35,14 @@ "nixpkgs-stable": [ "mod_de_cosmic", "nixpkgs-stable" - ], - "rust-overlay": "rust-overlay_2" + ] }, "locked": { - "lastModified": 1735781836, - "narHash": "sha256-3QBrsbyM1DyyXruthYJVAiK7kijJP4Mx996q1NC5FWE=", + "lastModified": 1736513564, + "narHash": "sha256-eAKwqMdGWambTbuZvAp3YYhAoWjaIFWGvxDAxxyh/Tg=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "553e7a4b77c4ddf8ed700776f9d71982a14e23c4", + "rev": "0855bf33427209e4f5e3d2d0968a14784525e929", "type": "github" }, "original": { @@ -70,7 +69,7 @@ "darwin": { "inputs": { "nixpkgs": [ - "mod_common", + "mod_secrets", "ragenix", "agenix", "nixpkgs" @@ -128,7 +127,29 @@ "home-manager": { "inputs": { "nixpkgs": [ - "mod_common", + "mod_home-manager", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", + "owner": "rycee", + "repo": "home-manager", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", + "type": "github" + }, + "original": { + "owner": "rycee", + "ref": "release-24.11", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "mod_secrets", "ragenix", "agenix", "nixpkgs" @@ -148,28 +169,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "mod_home-manager", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735344290, - "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", - "owner": "rycee", - "repo": "home-manager", - "rev": "613691f285dad87694c2ba1c9e6298d04736292d", - "type": "github" - }, - "original": { - "owner": "rycee", - "ref": "release-24.11", - "repo": "home-manager", - "type": "github" - } - }, "mod_boot_systemd": { "locked": { "lastModified": 1735793935, @@ -190,15 +189,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "ragenix": "ragenix" + ] }, "locked": { - "lastModified": 1735795919, - "narHash": "sha256-vreq5NKH6dCj9nAsR59KTHfT+i9SLDbtGbsEcv0Heuw=", + "lastModified": 1736544147, + "narHash": "sha256-WijrrGDuY8O0VUgsIbZK6PrvCMdgUGPex23hv1FmmHs=", "ref": "mod_common", - "rev": "b693858091a4a1e1135393b941ad16cbf21fa5fe", - "revCount": 1, + "rev": "780bcb7c44a274e4128af656dafce6d26463d6b8", + "revCount": 6, "type": "git", "url": "https://git.joshuabell.xyz/dotfiles" }, @@ -219,11 +217,11 @@ ] }, "locked": { - "lastModified": 1735839171, - "narHash": "sha256-yXTT8Lwbsm2ujIeK8NiVb0YUdjPT//3NK8vhXd9x8KE=", + "lastModified": 1736544162, + "narHash": "sha256-C1pkQDar5XSdZtir3EfMWtW9gX3z8vaucGg800YzMvw=", "ref": "mod_de_cosmic", - "rev": "ce85513ec5b69279aed6859bc37c78c22e5e944f", - "revCount": 2, + "rev": "6d8795b3c6ce2a640abe36801959e3af37d85a2e", + "revCount": 3, "type": "git", "url": "https://git.joshuabell.xyz/dotfiles" }, @@ -235,17 +233,17 @@ }, "mod_home-manager": { "inputs": { - "home-manager": "home-manager_2", + "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1735796212, - "narHash": "sha256-8aN/3ioMsr8IhBvo/Ym98bkFbHQ/4ODrww15W9b0i2g=", + "lastModified": 1736544172, + "narHash": "sha256-5Zp1Fg5A827aIjKrhtW84vvJmwRQqBHWzKButnaD14E=", "ref": "mod_home_manager", - "rev": "c3bcacb4ff5697c2f186c8d645c135356f68bc11", - "revCount": 1, + "rev": "df0c4e95ac6b056202c4ec6fabfcfa5bd205a0b4", + "revCount": 2, "type": "git", "url": "https://git.joshuabell.xyz/dotfiles" }, @@ -276,11 +274,11 @@ "ringofstorms-stormd": "ringofstorms-stormd" }, "locked": { - "lastModified": 1735796563, - "narHash": "sha256-YjXJu/5Hcl7YpcpiHLd5wqCFUlJp39MM9CfQKhdpkk8=", + "lastModified": 1736544199, + "narHash": "sha256-OWboCDCBHFy+PuWsFVShEqEaLEgVdZR98k9zrNIb+3s=", "ref": "mod_stormd", - "rev": "a184895fd3f32051499dfad8eb2cb18faaec4188", - "revCount": 1, + "rev": "765c7f4436db03936960373ff77dc2d41f0c4cd5", + "revCount": 2, "type": "git", "url": "https://git.joshuabell.xyz/dotfiles" }, @@ -290,6 +288,25 @@ "url": "https://git.joshuabell.xyz/dotfiles" } }, + "mod_secrets": { + "inputs": { + "ragenix": "ragenix" + }, + "locked": { + "lastModified": 1736544189, + "narHash": "sha256-itFFi1SGZRdmREBhcDpuSD93bInq2Juoj3JQ7Q/oF+8=", + "ref": "mod_secrets", + "rev": "17777b25238d4cb84b903252c49c75bd7030a3f6", + "revCount": 8, + "type": "git", + "url": "https://git.joshuabell.xyz/dotfiles" + }, + "original": { + "ref": "mod_secrets", + "type": "git", + "url": "https://git.joshuabell.xyz/dotfiles" + } + }, "nix-filter": { "locked": { "lastModified": 1710156097, @@ -323,11 +340,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735669367, - "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=", + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1736200483, + "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "type": "github" }, "original": { @@ -337,18 +370,17 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1735697839, - "narHash": "sha256-0Acw0UaLi+VNThsmeX8zOKi000DFrYXNnrgpOpk2+MM=", + "lastModified": 1735854365, + "narHash": "sha256-pNb03vdsQmn0jS5dKAdx2DFZ2QH4RRvrIzZxqpfMcS8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5eaa5fdf06d2b15d373b82c0f3a1ec1c6cab02ae", + "rev": "cd9f495ef7584a714938915d3fe9327c2735d7e4", "type": "github" }, "original": { "owner": "nixos", - "ref": "master", "repo": "nixpkgs", "type": "github" } @@ -1270,11 +1302,8 @@ "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": [ - "mod_common", - "nixpkgs" - ], - "rust-overlay": "rust-overlay" + "nixpkgs": "nixpkgs_2", + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1726755133, @@ -1294,7 +1323,7 @@ "inputs": { "nix-filter": "nix-filter", "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay" }, "locked": { "lastModified": 1735420577, @@ -1318,13 +1347,14 @@ "mod_home-manager": "mod_home-manager", "mod_nebula": "mod_nebula", "mod_ros_stormd": "mod_ros_stormd", - "nixpkgs": "nixpkgs_2", + "mod_secrets": "mod_secrets", + "nixpkgs": "nixpkgs_3", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_3", + "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", @@ -1382,14 +1412,14 @@ "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_4" + "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1735841437, - "narHash": "sha256-ZwmlaFhOlQ7f6Rq6VxRup7giPiwQlwe71HcoO/laRJo=", + "lastModified": 1735857201, + "narHash": "sha256-zyljmBv1FegF4kF2ZWdSdBCIktSHxJljPipwLOOyjrk=", "ref": "refs/heads/master", - "rev": "71d82c875fff85ae250804f45f1acf65f42cdc1e", - "revCount": 253, + "rev": "31220281739c7b6432f3533313a0fa0164f232c0", + "revCount": 254, "type": "git", "url": "https://git.joshuabell.xyz/nvim" }, @@ -1399,50 +1429,6 @@ } }, "rust-overlay": { - "inputs": { - "nixpkgs": [ - "mod_common", - "ragenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1725675754, - "narHash": "sha256-hXW3csqePOcF2e/PYnpXj72KEYyNj2HzTrVNmS/F7Ug=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "8cc45e678e914a16c8e224c3237fb07cf21e5e54", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "mod_de_cosmic", - "cosmic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735698720, - "narHash": "sha256-+skLL6mq/T7s6J5YmSp89ivQOHBPQ40GEU2n8yqp6bs=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "a00807363a8a6cae6c3fa84ff494bf9d96333674", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { "inputs": { "nixpkgs": [ "mod_ros_stormd", @@ -1464,7 +1450,29 @@ "type": "github" } }, - "rust-overlay_4": { + "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "mod_secrets", + "ragenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1725675754, + "narHash": "sha256-hXW3csqePOcF2e/PYnpXj72KEYyNj2HzTrVNmS/F7Ug=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "8cc45e678e914a16c8e224c3237fb07cf21e5e54", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { "inputs": { "nixpkgs": [ "ros_neovim",