diff --git a/hosts/h003/mods/networking.nix b/hosts/h003/mods/networking.nix index 5756efa1..2e6c8fa7 100644 --- a/hosts/h003/mods/networking.nix +++ b/hosts/h003/mods/networking.nix @@ -197,7 +197,7 @@ # Static DHCP reservations dhcp-host = [ "00:be:43:b9:f4:e0,H001,10.12.14.10" - # TODO add H002 for .11 + "54:04:a6:32:d1:71,H002,10.12.14.10" "c8:c9:a3:2b:7b:19,PRUSA-MK4,10.12.14.21" "24:e8:53:73:a3:c6,LGWEBOSTV,10.12.14.30" "2c:cf:67:6a:45:47,HOMEASSISTANT,10.12.14.22" diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index dc330ebb..04973b85 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -31,11 +31,11 @@ }, "locked": { "dir": "flakes/beszel", - "lastModified": 1765998800, - "narHash": "sha256-tFJsYcZQMuin4gtqjPpdg4V4QlCvpzLQ0H1ct5LM9Rg=", + "lastModified": 1766961967, + "narHash": "sha256-ccLRTjpQ3tqvNMMhCn02+WS74KE0i8bYLI/Jh4GdoiQ=", "ref": "refs/heads/master", - "rev": "03487772acd9e0865207baf281f7a0478f6dbc16", - "revCount": 944, + "rev": "6b023457ec9053e748bc49ac3e28ea82e2f998d4", + "revCount": 975, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -63,14 +63,20 @@ }, "common": { "locked": { - "path": "../../flakes/common", - "type": "path" + "dir": "flakes/common", + "lastModified": 1766961967, + "narHash": "sha256-ccLRTjpQ3tqvNMMhCn02+WS74KE0i8bYLI/Jh4GdoiQ=", + "ref": "refs/heads/master", + "rev": "6b023457ec9053e748bc49ac3e28ea82e2f998d4", + "revCount": 975, + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, "original": { - "path": "../../flakes/common", - "type": "path" - }, - "parent": [] + "dir": "flakes/common", + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" + } }, "crane": { "locked": { @@ -116,14 +122,20 @@ "plasma-manager": "plasma-manager" }, "locked": { - "path": "../../flakes/de_plasma", - "type": "path" + "dir": "flakes/de_plasma", + "lastModified": 1766961967, + "narHash": "sha256-ccLRTjpQ3tqvNMMhCn02+WS74KE0i8bYLI/Jh4GdoiQ=", + "ref": "refs/heads/master", + "rev": "6b023457ec9053e748bc49ac3e28ea82e2f998d4", + "revCount": 975, + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, "original": { - "path": "../../flakes/de_plasma", - "type": "path" - }, - "parent": [] + "dir": "flakes/de_plasma", + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" + } }, "flake-utils": { "inputs": { @@ -149,11 +161,11 @@ }, "locked": { "dir": "flakes/flatpaks", - "lastModified": 1765998800, - "narHash": "sha256-tFJsYcZQMuin4gtqjPpdg4V4QlCvpzLQ0H1ct5LM9Rg=", + "lastModified": 1766961967, + "narHash": "sha256-ccLRTjpQ3tqvNMMhCn02+WS74KE0i8bYLI/Jh4GdoiQ=", "ref": "refs/heads/master", - "rev": "03487772acd9e0865207baf281f7a0478f6dbc16", - "revCount": 944, + "rev": "6b023457ec9053e748bc49ac3e28ea82e2f998d4", + "revCount": 975, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -190,11 +202,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1765979862, - "narHash": "sha256-/r9/1KamvbHJx6I40H4HsSXnEcBAkj46ZwibhBx9kg0=", + "lastModified": 1766939458, + "narHash": "sha256-VvZeAKyB3vhyHStSO8ACKzWRKNQPmVWktjfuSVdvtUA=", "owner": "rycee", "repo": "home-manager", - "rev": "d3135ab747fd9dac250ffb90b4a7e80634eacbe9", + "rev": "e298a148013c980e3c8c0ac075295fab5074d643", "type": "github" }, "original": { @@ -261,11 +273,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1765779637, - "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", + "lastModified": 1766651565, + "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", + "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", "type": "github" }, "original": { @@ -277,11 +289,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1765762245, - "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=", + "lastModified": 1766736597, + "narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d", + "rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852", "type": "github" }, "original": { @@ -293,11 +305,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1765838191, - "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=", + "lastModified": 1766736597, + "narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6", + "rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852", "type": "github" }, "original": { @@ -309,11 +321,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1766025857, - "narHash": "sha256-Lav5jJazCW4mdg1iHcROpuXqmM94BWJvabLFWaJVJp0=", + "lastModified": 1766125104, + "narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "def3da69945bbe338c373fddad5a1bb49cf199ce", + "rev": "7d853e518814cca2a657b72eeba67ae20ebf7059", "type": "github" }, "original": { @@ -325,15 +337,16 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1764776358, - "narHash": "sha256-MxXSCRiV7DI5U3Ra1UxVJTTUyKsONAE8+8QdSXsGIhA=", + "lastModified": 1766309749, + "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0b8cec1eb2241336971009cdd4af641b930d0d97", + "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -373,11 +386,11 @@ "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": { "flake": false, "locked": { - "lastModified": 1763599441, - "narHash": "sha256-RwCQQfgQIQITVSJSX+QOSIOChT7E2AXdIwfU07S9GaU=", + "lastModified": 1766398838, + "narHash": "sha256-pO+bnwywDmhEpmU3Zw2VCAT8uLEgRlpHcAfW9NwqWis=", "owner": "CopilotC-Nvim", "repo": "CopilotChat.nvim", - "rev": "df5376c132382dd47e3e552612940cbf25b3580c", + "rev": "ed94e56ee8292f5df351e17709ff4b178ca84200", "type": "github" }, "original": { @@ -421,11 +434,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1764732647, - "narHash": "sha256-jya61X22LbcT4hpeio3qE/oOI/lvqKpf09oGEHHvQdA=", + "lastModified": 1765914395, + "narHash": "sha256-A7pm8sBQWsZl3Kc7JBh3gBUyKb6GfJ5J0zfn3mSGjKs=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "b2b135347e299ffbf7f4123fb7811899b0c9f4b8", + "rev": "07d088bf8bdadd159eb807b90eaee86a4778383f", "type": "github" }, "original": { @@ -501,11 +514,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1764655248, - "narHash": "sha256-9nUBzwbMkzLySMW/Y0EkFpvFgHeW5YDQ3J3moVQarjQ=", + "lastModified": 1766167236, + "narHash": "sha256-+Z1foMyKMxyMmYqmyu1KWiyL4Fc0Zm2SYV7RoZ9Ut2I=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "e9c00ea7813006dfa29f35c174f83f0184d45a93", + "rev": "8b92ea89835b8e5dbc779a675ebb0e5fcb9a1993", "type": "github" }, "original": { @@ -517,11 +530,11 @@ "nvim_plugin-catppuccin/nvim": { "flake": false, "locked": { - "lastModified": 1764084803, - "narHash": "sha256-ds+Rm9H00s++RC1dH4OQpCg1FXSm4HuwDGzr4ah0YBU=", + "lastModified": 1765701669, + "narHash": "sha256-8GKpGGdeBwxuMrheojyl162CzUntRcq9AktQVmKbpuI=", "owner": "catppuccin", "repo": "nvim", - "rev": "ce4a8e0d5267e67056f9f4dcf6cb1d0933c8ca00", + "rev": "ce8d176faa4643e026e597ae3c31db59b63cef09", "type": "github" }, "original": { @@ -533,11 +546,11 @@ "nvim_plugin-chrisgrieser/nvim-early-retirement": { "flake": false, "locked": { - "lastModified": 1764104935, - "narHash": "sha256-mvs0uIoxidy3jfC6oymwhaZVRbJrW+/kuMcIpR8TI6M=", + "lastModified": 1766186911, + "narHash": "sha256-COYpFOZTMGpZVfSJFMix/6TM5Eeemngcx1iukMa2nDE=", "owner": "chrisgrieser", "repo": "nvim-early-retirement", - "rev": "cd29cf40af7473530a8598245ba1d348fd5e1fa0", + "rev": "86edd80026e4eea2cef7d1e5dadcf34432e6098d", "type": "github" }, "original": { @@ -565,11 +578,11 @@ "nvim_plugin-folke/lazy.nvim": { "flake": false, "locked": { - "lastModified": 1762421181, - "narHash": "sha256-h5404njTAfqMJFQ3MAr2PWSbV81eS4aIs0cxAXkT0EM=", + "lastModified": 1765971162, + "narHash": "sha256-5A4kducPwKb5fKX4oSUFvo898P0dqfsqqLxFaXBsbQY=", "owner": "folke", "repo": "lazy.nvim", - "rev": "85c7ff3711b730b4030d03144f6db6375044ae82", + "rev": "306a05526ada86a7b30af95c5cc81ffba93fef97", "type": "github" }, "original": { @@ -677,11 +690,11 @@ "nvim_plugin-j-hui/fidget.nvim": { "flake": false, "locked": { - "lastModified": 1761243883, - "narHash": "sha256-XXTeJweQRIsC/WFhFxFbepOETV8e5Wfmh513su2Wve0=", + "lastModified": 1766143069, + "narHash": "sha256-uy2Z6vn9UYDN7Dr7iuiTrualRQdmUT0dwHP/eZXA/uA=", "owner": "j-hui", "repo": "fidget.nvim", - "rev": "e32b672d8fd343f9d6a76944fedb8c61d7d8111a", + "rev": "64463022a1f2ff1318ab22a2ea4125ed9313a483", "type": "github" }, "original": { @@ -789,11 +802,11 @@ "nvim_plugin-mfussenegger/nvim-lint": { "flake": false, "locked": { - "lastModified": 1763729870, - "narHash": "sha256-9fIZPUZhnQEHJtvboCs+A2QXo4UMTFejuHNagDkfkRk=", + "lastModified": 1766127989, + "narHash": "sha256-ysIoJ8uMAHu/OCemQ3yUYMhKIVnSDLQCvJH0SaGIOK4=", "owner": "mfussenegger", "repo": "nvim-lint", - "rev": "d1118791070d090777398792a73032a0ca5c79ff", + "rev": "7a64f4067065c16a355d40d0d599b8ca6b25de6d", "type": "github" }, "original": { @@ -805,11 +818,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1764542305, - "narHash": "sha256-t7xAQ9sczLyA1zODmD+nEuWuLnhrfSOoPu/4G/YTGdU=", + "lastModified": 1766276825, + "narHash": "sha256-dcXnh5SYPh1VRctTuCnuVPKFQuAI4XEvQasolCOv+Xw=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "6c3785d6a230bec63f70c98bf8e2842bed924245", + "rev": "0fa0462a2d6c9629e0bd03d1902e6a1472ceac3e", "type": "github" }, "original": { @@ -821,11 +834,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1764477618, - "narHash": "sha256-IpVDEOr//Jy+r3Z5Qo8nxDa3fNO+BTBKzAmbqvxtCQE=", + "lastModified": 1766443238, + "narHash": "sha256-P95gPOwJ+rRofLb8iV5UOnh26to1I3sFrWGlGxHyz1M=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "effe4bf2e1afb881ea67291c648b68dd3dfc927a", + "rev": "b34c08e0ea22bac67798f00238318fd16bd99b7c", "type": "github" }, "original": { @@ -933,11 +946,11 @@ "nvim_plugin-nvim-telescope/telescope.nvim": { "flake": false, "locked": { - "lastModified": 1764418954, - "narHash": "sha256-e6XSJRv4KB0z+nzGWmlV/YZNwWsyrrpQTloePRKWmw4=", + "lastModified": 1766268405, + "narHash": "sha256-O1rUiVKpDSvKMkZMFaEd8/ACcSgO/lfa1+Hc8uHbFOI=", "owner": "nvim-telescope", "repo": "telescope.nvim", - "rev": "e69b434b968a33815e2f02a5c7bd7b8dd4c7d4b2", + "rev": "e709d31454ee6e6157f0537f861f797bd44c0bad", "type": "github" }, "original": { @@ -949,11 +962,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1764713359, - "narHash": "sha256-dSaO5esPKj1y4vNyLb3AK9egmFJsmWxkGOT+etJsbRA=", + "lastModified": 1766192360, + "narHash": "sha256-Br+r9f/2o0AkewnGm7kFNfl3uYm1Akkklof0Sm5AL2M=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "59088b96a32ea47caf4976e164dbd88b86447fb7", + "rev": "b8b44b6a2494d086a9177251a119f9daec6cace8", "type": "github" }, "original": { @@ -965,11 +978,11 @@ "nvim_plugin-nvim-tree/nvim-web-devicons": { "flake": false, "locked": { - "lastModified": 1761440007, - "narHash": "sha256-klBjUtj0AvarN5a6O8Hh2t5BuOTe/m3ps2cHnlxVJvE=", + "lastModified": 1766287594, + "narHash": "sha256-ZdFRd0//C0Lle4cYIoAHBdz/yvQqmeylLNwvSifaWm4=", "owner": "nvim-tree", "repo": "nvim-web-devicons", - "rev": "8dcb311b0c92d460fac00eac706abd43d94d68af", + "rev": "6788013bb9cb784e606ada44206b0e755e4323d7", "type": "github" }, "original": { @@ -981,11 +994,11 @@ "nvim_plugin-nvim-treesitter/nvim-treesitter-context": { "flake": false, "locked": { - "lastModified": 1762769683, - "narHash": "sha256-ICwAUXKngSPsJ6VV+84KUPqtAwlGPrm4FIf9ioisiz8=", + "lastModified": 1765030629, + "narHash": "sha256-3NtwOA9d2ezLoo7qnzKAr6gwEdcpUqLc7ou4QI+9rDY=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-context", - "rev": "660861b1849256398f70450afdf93908d28dc945", + "rev": "64dd4cf3f6fd0ab17622c5ce15c91fc539c3f24a", "type": "github" }, "original": { @@ -1093,11 +1106,11 @@ "nvim_plugin-stevearc/conform.nvim": { "flake": false, "locked": { - "lastModified": 1764743081, - "narHash": "sha256-qCjrMt3fsRbLr/iM7nFHG7oKtyTTGcse4/cJbm3odJE=", + "lastModified": 1766346125, + "narHash": "sha256-Pp4bGTlZEqxHoHqVCEekDdg2jvNayxAuBReK4HJ6yGg=", "owner": "stevearc", "repo": "conform.nvim", - "rev": "ffe26e8df8115c9665d24231f8a49fadb2d611ce", + "rev": "5420c4b5ea0aeb99c09cfbd4fd0b70d257b44f25", "type": "github" }, "original": { @@ -1205,11 +1218,11 @@ "nvim_plugin-zbirenbaum/copilot.lua": { "flake": false, "locked": { - "lastModified": 1764638966, - "narHash": "sha256-wQ6SfAunVMd5tNeM7RMvrfPC2ELRibyEQboVQlU/fBs=", + "lastModified": 1766207702, + "narHash": "sha256-879050VUJpWBrHxUA3hRpcYbn3KgBGpVpKLdSVOwbIA=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "881f99b827d65b41f522eecc21b112cf518028ac", + "rev": "e78d1ffebdf6ccb6fd8be4e6898030c1cf5f9b64", "type": "github" }, "original": { @@ -1224,11 +1237,11 @@ }, "locked": { "dir": "flakes/opencode", - "lastModified": 1766262996, - "narHash": "sha256-GSYssVoqZrk1VyEoHKkFVRSuIB9ns/VpqT5wiXhlK3U=", + "lastModified": 1766961967, + "narHash": "sha256-ccLRTjpQ3tqvNMMhCn02+WS74KE0i8bYLI/Jh4GdoiQ=", "ref": "refs/heads/master", - "rev": "643895afdb16d15fb5c8c2c3f4d301925aeb6aee", - "revCount": 965, + "rev": "6b023457ec9053e748bc49ac3e28ea82e2f998d4", + "revCount": 975, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -1243,11 +1256,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1766260273, - "narHash": "sha256-jY7aB0sRBJy1g36mPu5yb+3h7IMx7/fY3pKI10KcJ6A=", + "lastModified": 1766426038, + "narHash": "sha256-3TxsJjL5M83q9nOa4ls6rWfbECYUE6llzBAgqCYQml8=", "owner": "sst", "repo": "opencode", - "rev": "6c40bfe04322c14350c9bd3447174986800a57d7", + "rev": "6baee0791f48bcf32eef1e199d0cadca57772b9b", "type": "github" }, "original": { @@ -1371,11 +1384,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1765641080, - "narHash": "sha256-AyPi7rZVfjTjQrhPHP+ugpVY8tcUzF3Lw1RjACuxAms=", + "lastModified": 1766468664, + "narHash": "sha256-QfAZCWfwIDiOvikyMb9Tsg2X0n659zd6DxDT88ILE4I=", "ref": "refs/heads/master", - "rev": "224ad4e3ecd9421c7469c4f06ff5faf7f6e8bedb", - "revCount": 325, + "rev": "99a57f25b959d7226d68f1b53ff60f0c4cc5b210", + "revCount": 326, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, @@ -1392,11 +1405,11 @@ ] }, "locked": { - "lastModified": 1764729618, - "narHash": "sha256-z4RA80HCWv2los1KD346c+PwNPzMl79qgl7bCVgz8X0=", + "lastModified": 1766457837, + "narHash": "sha256-aeBbkQ0HPFNOIsUeEsXmZHXbYq4bG8ipT9JRlCcKHgU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "52764074a85145d5001bf0aa30cb71936e9ad5b8", + "rev": "2c7510a559416d07242621d036847152d970612b", "type": "github" }, "original": { @@ -1433,11 +1446,11 @@ }, "locked": { "dir": "flakes/secrets", - "lastModified": 1765998800, - "narHash": "sha256-tFJsYcZQMuin4gtqjPpdg4V4QlCvpzLQ0H1ct5LM9Rg=", + "lastModified": 1766961967, + "narHash": "sha256-ccLRTjpQ3tqvNMMhCn02+WS74KE0i8bYLI/Jh4GdoiQ=", "ref": "refs/heads/master", - "rev": "03487772acd9e0865207baf281f7a0478f6dbc16", - "revCount": 944, + "rev": "6b023457ec9053e748bc49ac3e28ea82e2f998d4", + "revCount": 975, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index 13229d03..7b1be4d7 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -6,16 +6,16 @@ nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Use relative to get current version for testing - common.url = "path:../../flakes/common"; - # common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/common"; + # common.url = "path:../../flakes/common"; + common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/common"; # secrets.url = "path:../../flakes/secrets"; secrets.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/secrets"; # flatpaks.url = "path:../../flakes/flatpaks"; flatpaks.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/flatpaks"; # beszel.url = "path:../../flakes/beszel"; beszel.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/beszel"; - de_plasma.url = "path:../../flakes/de_plasma"; - # de_plasma.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/de_plasma"; + # de_plasma.url = "path:../../flakes/de_plasma"; + de_plasma.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/de_plasma"; # opencode.url = "path:../../flakes/opencode"; opencode.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/opencode";