diff --git a/hosts/h003/configuration.nix b/hosts/h003/configuration.nix deleted file mode 100644 index eb65bdf..0000000 --- a/hosts/h003/configuration.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - ... -}: -{ - system.stateVersion = "25.05"; # Did you read the comment? -} diff --git a/hosts/h003/flake.lock b/hosts/h003/flake.lock index ddd5a37..f94a90b 100644 --- a/hosts/h003/flake.lock +++ b/hosts/h003/flake.lock @@ -5,7 +5,7 @@ "darwin": "darwin", "home-manager": "home-manager_2", "nixpkgs": [ - "common", + "secrets", "ragenix", "nixpkgs" ], @@ -26,22 +26,18 @@ } }, "common": { - "inputs": { - "home-manager": "home-manager", - "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_2", - "ragenix": "ragenix" - }, "locked": { - "lastModified": 1755746476, - "narHash": "sha256-dLpj8mNfGAjjbcVPzYW5wSIvNUBDReCVlSmm61ypZWs=", + "dir": "flakes/common", + "lastModified": 1762754048, + "narHash": "sha256-XZetYIpgMSfez/QdfcZmsEidmnufd6dJVD7VTwd8vDY=", "ref": "refs/heads/master", - "rev": "8b49688deb12ee65ed17e9432c66975d70c91d49", - "revCount": 607, + "rev": "023f3b5e1807113a16a5fe22dbf7a2c0981b7f99", + "revCount": 765, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, "original": { + "dir": "flakes/common", "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" } @@ -64,7 +60,7 @@ "darwin": { "inputs": { "nixpkgs": [ - "common", + "secrets", "ragenix", "agenix", "nixpkgs" @@ -108,11 +104,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1753592768, - "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", + "lastModified": 1758463745, + "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "owner": "rycee", "repo": "home-manager", - "rev": "fc3add429f21450359369af74c2375cb34a2d204", + "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "type": "github" }, "original": { @@ -125,7 +121,7 @@ "home-manager_2": { "inputs": { "nixpkgs": [ - "common", + "secrets", "ragenix", "agenix", "nixpkgs" @@ -145,22 +141,6 @@ "type": "github" } }, - "nix-flatpak": { - "locked": { - "lastModified": 1739444422, - "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=", - "owner": "gmodena", - "repo": "nix-flatpak", - "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177", - "type": "github" - }, - "original": { - "owner": "gmodena", - "ref": "latest", - "repo": "nix-flatpak", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1753345091, @@ -179,21 +159,36 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1753694789, - "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", + "lastModified": 1762498405, + "narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", + "rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { + "locked": { + "lastModified": 1761619080, + "narHash": "sha256-PsLFmU/CORWeCjJi9ALsegwr/SMjf2gHsooTR09az4c=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "fd644bba1d3a83169e4b312ce20928ba1b0abb02", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -209,37 +204,6 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1755704039, - "narHash": "sha256-gKlP0LbyJ3qX0KObfIWcp5nbuHSb5EHwIvU6UcNBg2A=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9cb344e96d5b6918e94e1bca2d9f3ea1e9615545", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1755648324, - "narHash": "sha256-+2TxwJEXWXGC7JBsRGUHtmQ66lRGPcDI2kFKTTU5e2s=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "226bb7c9df5f953fd7533e199b8d9e5475458a8a", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, "nvim_plugin-Almo7aya/openingh.nvim": { "flake": false, "locked": { @@ -259,11 +223,11 @@ "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": { "flake": false, "locked": { - "lastModified": 1755636100, - "narHash": "sha256-EeU6AfMISnXUmKdNHXN35srj+fuQiHoWx5uYRKCjsTE=", + "lastModified": 1761323006, + "narHash": "sha256-6BjkqZCo2DLVxW6BHyElt2cZdG6Dhzao8hPfWYm0sIQ=", "owner": "CopilotC-Nvim", "repo": "CopilotChat.nvim", - "rev": "f7bb32dbbe2ff5e26f5033e2142b5920cf427236", + "rev": "a7138a0ee04d8af42c262554eccee168bbf1454f", "type": "github" }, "original": { @@ -291,11 +255,11 @@ "nvim_plugin-L3MON4D3/LuaSnip": { "flake": false, "locked": { - "lastModified": 1754037237, - "narHash": "sha256-JhTqTGQfIryJ7MElcOGOfb48uaNDnd9RM9Fl1Fs4QV0=", + "lastModified": 1761039842, + "narHash": "sha256-ovvtTZgqL6MFvuI3byx+boWm6ErZX06+v6a3VoctREc=", "owner": "L3MON4D3", "repo": "LuaSnip", - "rev": "de10d8414235b0a8cabfeba60d07c24304e71f5c", + "rev": "ccf25a5452b8697a823de3e5ecda63ed3d723b79", "type": "github" }, "original": { @@ -307,11 +271,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1755631821, - "narHash": "sha256-+/GVSb3uQ5HktPv6HFwdywX85hScsAI1IHqXmwDH9PU=", + "lastModified": 1761343950, + "narHash": "sha256-HycEAgAsU8IxFiYfyp5ZGN+z6wYyCarIESxA9TDuJ3s=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "0087ee1d505d4fc4886d8d3121ae7848b7c0e49b", + "rev": "bfd67f1402b97ac619cb538f4bbaed12a7fa89aa", "type": "github" }, "original": { @@ -355,11 +319,11 @@ "nvim_plugin-Saecki/crates.nvim": { "flake": false, "locked": { - "lastModified": 1754466592, - "narHash": "sha256-b40E121rJrEmlor3fHmh4Y1TXKdfiqsBGBcpbY//eTw=", + "lastModified": 1755956579, + "narHash": "sha256-jfmST/S9ymwgQ99PTCOlJkk5zaxE5HiDV16TmTISDII=", "owner": "Saecki", "repo": "crates.nvim", - "rev": "a49df0f70171adc77704eac70dd2c0d179065933", + "rev": "ac9fa498a9edb96dc3056724ff69d5f40b898453", "type": "github" }, "original": { @@ -371,11 +335,11 @@ "nvim_plugin-aznhe21/actions-preview.nvim": { "flake": false, "locked": { - "lastModified": 1745779150, - "narHash": "sha256-rQjwlu5gQcOvxF72lr9ugPRl0W78wCWGWPhpN1oOMbs=", + "lastModified": 1759462626, + "narHash": "sha256-YUeWBXxxeurfWBi0PjUi6izqYAvUw9DHmvsuPXm7ohw=", "owner": "aznhe21", "repo": "actions-preview.nvim", - "rev": "36513ad213855d497b7dd3391a24d1d75d58e36f", + "rev": "cb938c25edaac38d362555f19244a9cb85d561e8", "type": "github" }, "original": { @@ -387,11 +351,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1755594039, - "narHash": "sha256-XU+PtvXlgoHFouyyceUIZ4L5AvZThUR2AegmCQAYt1A=", + "lastModified": 1761343239, + "narHash": "sha256-obGnux+K0blHROEOAy7Ct18vxiO4Qez8XJB5l23KgMs=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "e906ac3ed0bd273781759e7635b5b824393c925c", + "rev": "4341619da06779ae310ee9c3d6d70edfefed7152", "type": "github" }, "original": { @@ -403,11 +367,11 @@ "nvim_plugin-catppuccin/nvim": { "flake": false, "locked": { - "lastModified": 1755621274, - "narHash": "sha256-o8VLMPriOh4+Ay5Ff0cWQYXjmihdr3x9131bKHHTsQE=", + "lastModified": 1761396780, + "narHash": "sha256-Nz/XbItShbrnKtj0+gcEDBFO5y00g0EG5CHqdJGK2j0=", "owner": "catppuccin", "repo": "nvim", - "rev": "30fa4d122d9b22ad8b2e0ab1b533c8c26c4dde86", + "rev": "8c4125e3c746976ba025dc5d908fa22c6aa09486", "type": "github" }, "original": { @@ -419,11 +383,11 @@ "nvim_plugin-chrisgrieser/nvim-early-retirement": { "flake": false, "locked": { - "lastModified": 1755590055, - "narHash": "sha256-989Zf6SCy+vakFac4KmElUn8+ErJMtYJ8zlOi999UJI=", + "lastModified": 1760385962, + "narHash": "sha256-PtpD6Uc4GK4dSJynWH5d6c7XOWXfYODXJ3FyOY1eZNo=", "owner": "chrisgrieser", "repo": "nvim-early-retirement", - "rev": "ef9fc0267da4204432ab7bf3ab9df359874cfeb6", + "rev": "9109589b542773c9ad2a34067a085874f255577b", "type": "github" }, "original": { @@ -451,11 +415,11 @@ "nvim_plugin-folke/lazy.nvim": { "flake": false, "locked": { - "lastModified": 1740511197, - "narHash": "sha256-nQ8PR9DTdzg6Z2rViuVD6Pswc2VvDQwS3uMNgyDh5ls=", + "lastModified": 1761488113, + "narHash": "sha256-jBmtFzzdGYe3N3kvWHvR7FGXtA+/t36efxsAqhLmaxU=", "owner": "folke", "repo": "lazy.nvim", - "rev": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a", + "rev": "ed4dc336a73c18da6fea6e1cf7ad6e1b76d281eb", "type": "github" }, "original": { @@ -483,11 +447,11 @@ "nvim_plugin-folke/which-key.nvim": { "flake": false, "locked": { - "lastModified": 1740233407, - "narHash": "sha256-uvMcSduMr7Kd2oUmIOYzvWF4FIl6bZxIYm9FSw/3pCo=", + "lastModified": 1759952076, + "narHash": "sha256-N31+V5L0gd+TUo9nVtNGRmMVmM9fMxOwldCfuLYT4hU=", "owner": "folke", "repo": "which-key.nvim", - "rev": "370ec46f710e058c9c1646273e6b225acf47cbed", + "rev": "b4177e3eaf15fe5eb8357ebac2286d488be1ed00", "type": "github" }, "original": { @@ -547,11 +511,11 @@ "nvim_plugin-hrsh7th/nvim-cmp": { "flake": false, "locked": { - "lastModified": 1744514599, - "narHash": "sha256-l5z+PT4S9b09d2M+J/tHVd9W9Ss3eQQk5Ykpz2Qjxxw=", + "lastModified": 1760792454, + "narHash": "sha256-wkESSNUViVI5DE+3t4AVTaSLQ/hTB43vrm+PH6uA8H4=", "owner": "hrsh7th", "repo": "nvim-cmp", - "rev": "b5311ab3ed9c846b585c0c15b7559be131ec4be9", + "rev": "a7bcf1d88069fc67c9ace8a62ba480b8fe879025", "type": "github" }, "original": { @@ -563,11 +527,11 @@ "nvim_plugin-j-hui/fidget.nvim": { "flake": false, "locked": { - "lastModified": 1755048367, - "narHash": "sha256-Hcnbk6go2vYCYqSfXLWQ+KimpU+NPbIkjBTKGMFoNQM=", + "lastModified": 1761243883, + "narHash": "sha256-XXTeJweQRIsC/WFhFxFbepOETV8e5Wfmh513su2Wve0=", "owner": "j-hui", "repo": "fidget.nvim", - "rev": "2cb5edb2dd6700a958a446b20bb2be04d318da9d", + "rev": "e32b672d8fd343f9d6a76944fedb8c61d7d8111a", "type": "github" }, "original": { @@ -595,11 +559,11 @@ "nvim_plugin-lewis6991/gitsigns.nvim": { "flake": false, "locked": { - "lastModified": 1755014582, - "narHash": "sha256-zBUrqL+00Y8j4eVNAgI0nYn2i35zhQo2BVl4mL1cgfs=", + "lastModified": 1760888451, + "narHash": "sha256-eGpB7YYWbyCCGYXEYAM432srSp/lUo5C1b0J3OYjwnY=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "6e3c66548035e50db7bd8e360a29aec6620c3641", + "rev": "20ad4419564d6e22b189f6738116b38871082332", "type": "github" }, "original": { @@ -643,11 +607,11 @@ "nvim_plugin-m4xshen/hardtime.nvim": { "flake": false, "locked": { - "lastModified": 1753760289, - "narHash": "sha256-BgJ0gKy/zxU82L7WocXLkXwD97pnCvpGyJVzSHeUtG0=", + "lastModified": 1757738091, + "narHash": "sha256-Jy9ARUHU1ySpSxxoS3hLRjxp5Lqt7juWN5Jnbdo0rg0=", "owner": "m4xshen", "repo": "hardtime.nvim", - "rev": "6d7664d5bdfaea44c5f50b29f5239fab7b00c273", + "rev": "b4e431934af1fe224a3a801f632c008278cb7628", "type": "github" }, "original": { @@ -659,11 +623,11 @@ "nvim_plugin-mbbill/undotree": { "flake": false, "locked": { - "lastModified": 1752437854, - "narHash": "sha256-5WofUOTYE+Nmx3A5OoZBneJBHZ8bdGEYDZ6vTMx1OE0=", + "lastModified": 1759186837, + "narHash": "sha256-EWOH08KAWyoT9m45/B1d5aKQQJtd3k4orJbagVsxe08=", "owner": "mbbill", "repo": "undotree", - "rev": "28f2f54a34baff90ea6f4a735ef1813ad875c743", + "rev": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f", "type": "github" }, "original": { @@ -675,11 +639,11 @@ "nvim_plugin-mfussenegger/nvim-lint": { "flake": false, "locked": { - "lastModified": 1753951521, - "narHash": "sha256-GmXScmbXJx74RMgPhkdKtdODZqkOarFHE1XOiSnt5Bo=", + "lastModified": 1759852544, + "narHash": "sha256-wVEX0lCxeipvwCfdd2JbQwnhgg6UrTXixC8E1OiEblI=", "owner": "mfussenegger", "repo": "nvim-lint", - "rev": "7ef127aaede2a4d5ad8df8321e2eb4e567f29594", + "rev": "9da1fb942dd0668d5182f9c8dee801b9c190e2bb", "type": "github" }, "original": { @@ -691,11 +655,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1755599388, - "narHash": "sha256-4o20Hf+rFD2zejPZr5oe3ZkaynW3xAw/wtbF3sMjNnQ=", + "lastModified": 1761585884, + "narHash": "sha256-m/gd+cb7X2a7R6JSbHes0QjGs+zuj4698Qyi/OW0R1g=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "eb9beab7d80eb052f78165b28d18f55844b26aef", + "rev": "be0d1d14b8504c1c0965b608dc7ed39f2d588c91", "type": "github" }, "original": { @@ -707,11 +671,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1755617152, - "narHash": "sha256-PSu5zQi/rzBAnALX8WrYckhqM5lI6hGAhsWWgS7ln7A=", + "lastModified": 1761605346, + "narHash": "sha256-3Aulaw6KMmrcoQQxhRhQhjZ2fg6MSU4Q7qAWtrVsOcA=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "5f1c9a90c8db9c647da40ce6cf5be9e49ccbf0c7", + "rev": "2b52bc2190c8efde2e4de02d829a138666774c7c", "type": "github" }, "original": { @@ -720,22 +684,6 @@ "type": "github" } }, - "nvim_plugin-nosduco/remote-sshfs.nvim": { - "flake": false, - "locked": { - "lastModified": 1755623332, - "narHash": "sha256-hnTDzd3eRsDUYYf9WPknYZ126d0XKXO1hjlY7WH4bDI=", - "owner": "nosduco", - "repo": "remote-sshfs.nvim", - "rev": "8ab43934caea0eacc986d112e5680c316b8a7944", - "type": "github" - }, - "original": { - "owner": "nosduco", - "repo": "remote-sshfs.nvim", - "type": "github" - } - }, "nvim_plugin-numToStr/Comment.nvim": { "flake": false, "locked": { @@ -771,11 +719,11 @@ "nvim_plugin-nvim-lualine/lualine.nvim": { "flake": false, "locked": { - "lastModified": 1754970649, - "narHash": "sha256-lWt2kpW+hsTMWt8tar/+AISTDrIt4Jn27NmI9j+Xt4s=", + "lastModified": 1760596863, + "narHash": "sha256-hdrAdG3hC2sAevQ6a9xizqPgEgnNKxuc5rBYn0pKM1c=", "owner": "nvim-lualine", "repo": "lualine.nvim", - "rev": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955", + "rev": "3946f0122255bc377d14a59b27b609fb3ab25768", "type": "github" }, "original": { @@ -851,11 +799,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1755174669, - "narHash": "sha256-Cdd7m2ondica5yDgm8THEm8LttJwDWQTNPnKO4vKr2c=", + "lastModified": 1760921408, + "narHash": "sha256-QCUp/6qX/FS8LrZ6K+pvC/mHkYW8xfzQZEB2y0VOStQ=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "f0e9951778802526b14c934f7bf746e1e0ae5ed0", + "rev": "64e2192f5250796aa4a7f33c6ad888515af50640", "type": "github" }, "original": { @@ -867,11 +815,11 @@ "nvim_plugin-nvim-tree/nvim-web-devicons": { "flake": false, "locked": { - "lastModified": 1754884337, - "narHash": "sha256-Zftd4xFYdCtof6IusN+E079yY2oMTNhJ/yznvLiiur0=", + "lastModified": 1761440007, + "narHash": "sha256-klBjUtj0AvarN5a6O8Hh2t5BuOTe/m3ps2cHnlxVJvE=", "owner": "nvim-tree", "repo": "nvim-web-devicons", - "rev": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a", + "rev": "8dcb311b0c92d460fac00eac706abd43d94d68af", "type": "github" }, "original": { @@ -883,11 +831,11 @@ "nvim_plugin-nvim-treesitter/nvim-treesitter-context": { "flake": false, "locked": { - "lastModified": 1754488703, - "narHash": "sha256-f4a9Abwb265Rm+hpUXz+rKWXvaFVrmXf1h7d7eh9jJc=", + "lastModified": 1761077440, + "narHash": "sha256-QdZstxKsEILwe7eUZCmMdyLPyvNKc/e7cfdYQowHWPQ=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-context", - "rev": "dca8726fea2c14e1ce6adbaa76a04816fbfaff61", + "rev": "ec308c7827b5f8cb2dd0ad303a059c945dd21969", "type": "github" }, "original": { @@ -915,11 +863,11 @@ "nvim_plugin-rcarriga/nvim-notify": { "flake": false, "locked": { - "lastModified": 1753086914, - "narHash": "sha256-uQBB3fajHowivArxbtmEJvVU3+QO0VApYpVNMA58UkI=", + "lastModified": 1757190131, + "narHash": "sha256-h7STMjY+CBTqBkIDJXgtJz4WhNeQ02ES2Jesi3jZXeM=", "owner": "rcarriga", "repo": "nvim-notify", - "rev": "397c7c1184745fca649e5104de659e6392ef5a4d", + "rev": "8701bece920b38ea289b457f902e2ad184131a5d", "type": "github" }, "original": { @@ -931,11 +879,11 @@ "nvim_plugin-rmagatti/auto-session": { "flake": false, "locked": { - "lastModified": 1755285297, - "narHash": "sha256-x8oPN7JqcY0scFO0vGREerT3dRiQA+k/qeWsug1sGiU=", + "lastModified": 1761491368, + "narHash": "sha256-F2MtkBCVAObRwniSvFjv5MmYnCaj1YSUf0Nk5MF1F4Y=", "owner": "rmagatti", "repo": "auto-session", - "rev": "d27a29f5754e3a8b8d89a4069814e53ac583e951", + "rev": "f0eb3d69848389869572b82b336d7a6887e88e43", "type": "github" }, "original": { @@ -944,7 +892,7 @@ "type": "github" } }, - "nvim_plugin-ron/ron.vim": { + "nvim_plugin-ron-rs/ron.vim": { "flake": false, "locked": { "lastModified": 1660904719, @@ -995,11 +943,11 @@ "nvim_plugin-stevearc/conform.nvim": { "flake": false, "locked": { - "lastModified": 1755640282, - "narHash": "sha256-WYGvppnMsBaVYnMmv9WJRuKuyk4F/rzJ3DRBh+72tRY=", + "lastModified": 1761160784, + "narHash": "sha256-yUUDxYuIjbFHUscEKpFV6IaraDNOA4hdcGljPHG/+sU=", "owner": "stevearc", "repo": "conform.nvim", - "rev": "04bfa5f35706410376bf7618a01fcf44e3f35b59", + "rev": "9fd3d5e0b689ec1bf400c53cbbec72c6fdf24081", "type": "github" }, "original": { @@ -1075,11 +1023,11 @@ "nvim_plugin-windwp/nvim-ts-autotag": { "flake": false, "locked": { - "lastModified": 1739910276, - "narHash": "sha256-a3Bcql68mp3y5bH9XMiDTQB0e75T+qFB593objIGg/I=", + "lastModified": 1757545454, + "narHash": "sha256-nT2W5gKFEfzP7MztLjm7yqwam3ADk0svcMdLg2nmI/4=", "owner": "windwp", "repo": "nvim-ts-autotag", - "rev": "a1d526af391f6aebb25a8795cbc05351ed3620b5", + "rev": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc", "type": "github" }, "original": { @@ -1107,11 +1055,11 @@ "nvim_plugin-zbirenbaum/copilot.lua": { "flake": false, "locked": { - "lastModified": 1755448417, - "narHash": "sha256-KV+Wno4aB5uTSBxIZzQKC/0KfjQLM7x8wCDkVSnaPeA=", + "lastModified": 1761595323, + "narHash": "sha256-KkiU2xmpfIbpuijvcXDw+LWKWuBgxjwY7jEQIasN5Kw=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "3fd7b50810ae4cccf8b38e4c509b1608f141a9e9", + "rev": "93adf9844dcbe09a37e7a72eaa286d33d38bf628", "type": "github" }, "original": { @@ -1125,8 +1073,8 @@ "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", - "rust-overlay": "rust-overlay" + "nixpkgs": "nixpkgs_4", + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1744897914, @@ -1145,13 +1093,15 @@ "root": { "inputs": { "common": "common", - "nixpkgs": "nixpkgs_4", - "ros_neovim": "ros_neovim" + "home-manager": "home-manager", + "nixpkgs": "nixpkgs_2", + "ros_neovim": "ros_neovim", + "secrets": "secrets" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_5", + "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", @@ -1182,7 +1132,6 @@ "nvim_plugin-mfussenegger/nvim-lint": "nvim_plugin-mfussenegger/nvim-lint", "nvim_plugin-mrcjkb/rustaceanvim": "nvim_plugin-mrcjkb/rustaceanvim", "nvim_plugin-neovim/nvim-lspconfig": "nvim_plugin-neovim/nvim-lspconfig", - "nvim_plugin-nosduco/remote-sshfs.nvim": "nvim_plugin-nosduco/remote-sshfs.nvim", "nvim_plugin-numToStr/Comment.nvim": "nvim_plugin-numToStr/Comment.nvim", "nvim_plugin-nvim-lua/plenary.nvim": "nvim_plugin-nvim-lua/plenary.nvim", "nvim_plugin-nvim-lualine/lualine.nvim": "nvim_plugin-nvim-lualine/lualine.nvim", @@ -1196,7 +1145,7 @@ "nvim_plugin-rafamadriz/friendly-snippets": "nvim_plugin-rafamadriz/friendly-snippets", "nvim_plugin-rcarriga/nvim-notify": "nvim_plugin-rcarriga/nvim-notify", "nvim_plugin-rmagatti/auto-session": "nvim_plugin-rmagatti/auto-session", - "nvim_plugin-ron/ron.vim": "nvim_plugin-ron/ron.vim", + "nvim_plugin-ron-rs/ron.vim": "nvim_plugin-ron-rs/ron.vim", "nvim_plugin-saadparwaiz1/cmp_luasnip": "nvim_plugin-saadparwaiz1/cmp_luasnip", "nvim_plugin-sindrets/diffview.nvim": "nvim_plugin-sindrets/diffview.nvim", "nvim_plugin-stevearc/conform.nvim": "nvim_plugin-stevearc/conform.nvim", @@ -1207,14 +1156,14 @@ "nvim_plugin-windwp/nvim-ts-autotag": "nvim_plugin-windwp/nvim-ts-autotag", "nvim_plugin-zbirenbaum/copilot-cmp": "nvim_plugin-zbirenbaum/copilot-cmp", "nvim_plugin-zbirenbaum/copilot.lua": "nvim_plugin-zbirenbaum/copilot.lua", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1755648539, - "narHash": "sha256-zElmY3ieHOxJtn5Q3KKXZw3i6/e63jRtHowzOM4jERw=", + "lastModified": 1761712156, + "narHash": "sha256-4vU7FPZFXSFguQUIPrbLQOk3VSokp6RH8t7zQoqneow=", "ref": "refs/heads/master", - "rev": "1f8444ad78e85c902818ab48479f3f3a1e909031", - "revCount": 300, + "rev": "04f666dabbaced8d661693cfbe4eb7efa359ce7d", + "revCount": 320, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, @@ -1226,7 +1175,28 @@ "rust-overlay": { "inputs": { "nixpkgs": [ - "common", + "ros_neovim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1761619008, + "narHash": "sha256-vp97eNmi5GG/+jlvnBpmG6EVO2F1+nqMQFF9GT2TIQg=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "7bc7d2f706ebe5479d230d2c6806b5dc757ae4cd", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "secrets", "ragenix", "nixpkgs" ] @@ -1245,25 +1215,24 @@ "type": "github" } }, - "rust-overlay_2": { + "secrets": { "inputs": { - "nixpkgs": [ - "ros_neovim", - "nixpkgs" - ] + "ragenix": "ragenix" }, "locked": { - "lastModified": 1755571033, - "narHash": "sha256-V8gmZBfMiFGCyGJQx/yO81LFJ4d/I5Jxs2id96rLxrM=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "95487740bb7ac11553445e9249041a6fa4b5eccf", - "type": "github" + "dir": "flakes/secrets", + "lastModified": 1762754048, + "narHash": "sha256-XZetYIpgMSfez/QdfcZmsEidmnufd6dJVD7VTwd8vDY=", + "ref": "refs/heads/master", + "rev": "023f3b5e1807113a16a5fe22dbf7a2c0981b7f99", + "revCount": 765, + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" + "dir": "flakes/secrets", + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" } }, "systems": { diff --git a/hosts/h003/flake.nix b/hosts/h003/flake.nix index f9232d8..5bf81ea 100644 --- a/hosts/h003/flake.nix +++ b/hosts/h003/flake.nix @@ -24,7 +24,7 @@ let configuration_name = "h003"; system = "x86_64-linux"; - stateVersion = "24.11"; + stateVersion = "25.05"; primaryUser = "luser"; lib = nixpkgs.lib; in @@ -53,7 +53,6 @@ common.nixosModules.tty_caps_esc common.nixosModules.zsh - ./configuration.nix ./hardware-configuration.nix ./mods (