From 7185d24a8ba9b7176b6f742ea2ee0e57d375dc43 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Mon, 10 Nov 2025 01:07:06 -0600 Subject: [PATCH] working on o001 to new flake modules, needed root fallback for secrets for root only system --- flakes/secrets/flake.nix | 12 +- hosts/linode/l001/flake.nix | 3 - hosts/oracle/o001/configuration.nix | 2 - hosts/oracle/o001/flake.lock | 910 ++++++---------------------- hosts/oracle/o001/flake.nix | 148 +++-- 5 files changed, 286 insertions(+), 789 deletions(-) diff --git a/flakes/secrets/flake.nix b/flakes/secrets/flake.nix index 70fc8d8..ffaad6c 100644 --- a/flakes/secrets/flake.nix +++ b/flakes/secrets/flake.nix @@ -26,11 +26,13 @@ secretsRaw = import ./secrets.nix; systemName = config.networking.hostName; # TODO revisit this slightly kinda scary method for choosing owners... - user = builtins.head ( - builtins.filter (name: config.users.users.${name}.isNormalUser or false) ( - builtins.attrNames config.users.users - ) - ); + user = + let + normalUsers = builtins.filter (name: config.users.users.${name}.isNormalUser or false) ( + builtins.attrNames config.users.users + ); + in + if normalUsers == [ ] then "root" else builtins.head normalUsers; authorityMarker = "authority"; # Key matches this host if its trailing comment contains "@" diff --git a/hosts/linode/l001/flake.nix b/hosts/linode/l001/flake.nix index 4aae7be..ffcd577 100644 --- a/hosts/linode/l001/flake.nix +++ b/hosts/linode/l001/flake.nix @@ -4,9 +4,6 @@ home-manager.url = "github:rycee/home-manager/release-25.05"; deploy-rs.url = "github:serokell/deploy-rs"; - # common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?rev=39edfefa5871d07c9f88ce92a55995eb347d9b09"; - # common.inputs.home-manager.follows = "home-manager"; - # 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"; diff --git a/hosts/oracle/o001/configuration.nix b/hosts/oracle/o001/configuration.nix index 50a0d5e..f903bc4 100644 --- a/hosts/oracle/o001/configuration.nix +++ b/hosts/oracle/o001/configuration.nix @@ -4,6 +4,4 @@ zramSwap.enable = false; networking.hostName = "o001"; networking.domain = "subnet01171946.vcn01171946.oraclevcn.com"; - services.openssh.enable = true; - system.stateVersion = "23.11"; } diff --git a/hosts/oracle/o001/flake.lock b/hosts/oracle/o001/flake.lock index 29986eb..741abb3 100644 --- a/hosts/oracle/o001/flake.lock +++ b/hosts/oracle/o001/flake.lock @@ -5,7 +5,7 @@ "darwin": "darwin", "home-manager": "home-manager_2", "nixpkgs": [ - "common", + "secrets", "ragenix", "nixpkgs" ], @@ -25,61 +25,19 @@ "type": "github" } }, - "aquamarine": { - "inputs": { - "hyprutils": [ - "common", - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "common", - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1759499898, - "narHash": "sha256-UNzYHLWfkSzLHDep5Ckb5tXc0fdxwPIrT+MY4kpQttM=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "655e067f96fd44b3f5685e17f566b0e4d535d798", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "common": { - "inputs": { - "home-manager": "home-manager", - "hyprland": "hyprland", - "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_3", - "ragenix": "ragenix" - }, "locked": { - "lastModified": 1759276943, - "narHash": "sha256-/l8jI6XRejmD01IBA/yI9Kb4bgbqunJUW9EKtLLJMtw=", + "dir": "flakes/common", + "lastModified": 1762756017, + "narHash": "sha256-rXEK/vfgna34c/cJi5W5xbfMXA7rZSDHxs1j9k0UMp8=", "ref": "refs/heads/master", - "rev": "24b716ec9d68866f4c0171ab5b9571e9e014dde1", - "revCount": 673, + "rev": "9b8c26f558c7495d6581e4c97fce206152a36a3d", + "revCount": 768, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, "original": { + "dir": "flakes/common", "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" } @@ -102,7 +60,7 @@ "darwin": { "inputs": { "nixpkgs": [ - "common", + "secrets", "ragenix", "agenix", "nixpkgs" @@ -125,16 +83,16 @@ }, "deploy-rs": { "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_5", + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs", "utils": "utils" }, "locked": { - "lastModified": 1749105467, - "narHash": "sha256-hXh76y/wDl15almBcqvjryB50B0BaiXJKk20f314RoE=", + "lastModified": 1762286984, + "narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=", "owner": "serokell", "repo": "deploy-rs", - "rev": "6bc76b872374845ba9d645a2f012b764fecd765f", + "rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f", "type": "github" }, "original": { @@ -144,22 +102,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1733328505, @@ -193,39 +135,16 @@ "type": "github" } }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "common", - "hyprland", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "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": { @@ -238,7 +157,7 @@ "home-manager_2": { "inputs": { "nixpkgs": [ - "common", + "secrets", "ragenix", "agenix", "nixpkgs" @@ -258,368 +177,7 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "common", - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1753964049, - "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprgraphics": { - "inputs": { - "hyprutils": [ - "common", - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1759490292, - "narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "9431db625cd9bb66ac55525479dce694101d6d7a", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprgraphics": "hyprgraphics", - "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": "hyprland-qtutils", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1759521131, - "narHash": "sha256-24RveTqV09t0RvTDUHBcrgrQ3D3734DG7XzvNohCV3M=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "b7ef892ecf9c07e742239102056da950ebb42eee", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1749046714, - "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": [ - "common", - "hyprland", - "hyprland-qtutils", - "hyprlang" - ], - "nixpkgs": [ - "common", - "hyprland", - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "common", - "hyprland", - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1749154592, - "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprlang": [ - "common", - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "common", - "hyprland", - "hyprland-qtutils", - "hyprlang", - "hyprutils" - ], - "nixpkgs": [ - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1759080228, - "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "common", - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1758927902, - "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1759490926, - "narHash": "sha256-7IbZGJ5qAAfZsGhBHIsP8MBsfuFYS0hsxYHVkkeDG5Q=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "94cce794344538c4d865e38682684ec2bbdb2ef3", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1755184602, - "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "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, - "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1741379970, - "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1743014863, "narHash": "sha256-jAIUqsiN2r3hCuHji80U7NNEafpIMBXiwKlSrjWMlpg=", @@ -635,7 +193,23 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_2": { + "locked": { + "lastModified": 1753345091, + "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1750622754, "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=", @@ -651,13 +225,13 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_4": { "locked": { - "lastModified": 1750188666, - "narHash": "sha256-yAfLvtbCzSigTfbsJeOrvljS7VYLAwi2RZ6F+qd+A5E=", + "lastModified": 1761619080, + "narHash": "sha256-PsLFmU/CORWeCjJi9ALsegwr/SMjf2gHsooTR09az4c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "aa36c6c05d04f90cf890f87845be9380cf7b83c2", + "rev": "fd644bba1d3a83169e4b312ce20928ba1b0abb02", "type": "github" }, "original": { @@ -666,6 +240,22 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1741379970, + "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nvim_plugin-Almo7aya/openingh.nvim": { "flake": false, "locked": { @@ -685,11 +275,11 @@ "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": { "flake": false, "locked": { - "lastModified": 1750069301, - "narHash": "sha256-lIAsudDunKOY69r00czO+rmMbM+woIdIGroT4dUZAFc=", + "lastModified": 1761323006, + "narHash": "sha256-6BjkqZCo2DLVxW6BHyElt2cZdG6Dhzao8hPfWYm0sIQ=", "owner": "CopilotC-Nvim", "repo": "CopilotChat.nvim", - "rev": "5df0b668d23c05c173f6bc79bb19642215b8b66a", + "rev": "a7138a0ee04d8af42c262554eccee168bbf1454f", "type": "github" }, "original": { @@ -717,11 +307,11 @@ "nvim_plugin-L3MON4D3/LuaSnip": { "flake": false, "locked": { - "lastModified": 1749564222, - "narHash": "sha256-StttV19d5gWbFPxerCOX3dXIaRwg1oeUANIbNztALps=", + "lastModified": 1761039842, + "narHash": "sha256-ovvtTZgqL6MFvuI3byx+boWm6ErZX06+v6a3VoctREc=", "owner": "L3MON4D3", "repo": "LuaSnip", - "rev": "fb525166ccc30296fb3457441eb979113de46b00", + "rev": "ccf25a5452b8697a823de3e5ecda63ed3d723b79", "type": "github" }, "original": { @@ -733,11 +323,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1749846779, - "narHash": "sha256-j1aslQ3SPD9ZuhQDEt9e5GD+VZ6N6Re7IjVFXycaxWI=", + "lastModified": 1761343950, + "narHash": "sha256-HycEAgAsU8IxFiYfyp5ZGN+z6wYyCarIESxA9TDuJ3s=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "76f7ce56ccb913632745714f160faa53164c5574", + "rev": "bfd67f1402b97ac619cb538f4bbaed12a7fa89aa", "type": "github" }, "original": { @@ -781,11 +371,11 @@ "nvim_plugin-Saecki/crates.nvim": { "flake": false, "locked": { - "lastModified": 1748637634, - "narHash": "sha256-sDjG6fjnQsyYtdf7xpmOW193e7USh6ghrFzo6NoLyP8=", + "lastModified": 1755956579, + "narHash": "sha256-jfmST/S9ymwgQ99PTCOlJkk5zaxE5HiDV16TmTISDII=", "owner": "Saecki", "repo": "crates.nvim", - "rev": "5d8b1bef686db0fabe5f1bb593744b617e8f1405", + "rev": "ac9fa498a9edb96dc3056724ff69d5f40b898453", "type": "github" }, "original": { @@ -797,11 +387,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": { @@ -813,11 +403,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1750179699, - "narHash": "sha256-EGt75z/NbjzDXxsyXT9Qj2wWOf06ijUr1If5ljmfLqo=", + "lastModified": 1761343239, + "narHash": "sha256-obGnux+K0blHROEOAy7Ct18vxiO4Qez8XJB5l23KgMs=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "45fd6c22f30487586c771072dc8c5230931e4c7b", + "rev": "4341619da06779ae310ee9c3d6d70edfefed7152", "type": "github" }, "original": { @@ -829,11 +419,11 @@ "nvim_plugin-catppuccin/nvim": { "flake": false, "locked": { - "lastModified": 1749271780, - "narHash": "sha256-wt/Ybjgr4N80B+QsyANs1QezM7PpFceUWSweRFgkhl0=", + "lastModified": 1761396780, + "narHash": "sha256-Nz/XbItShbrnKtj0+gcEDBFO5y00g0EG5CHqdJGK2j0=", "owner": "catppuccin", "repo": "nvim", - "rev": "fa42eb5e26819ef58884257d5ae95dd0552b9a66", + "rev": "8c4125e3c746976ba025dc5d908fa22c6aa09486", "type": "github" }, "original": { @@ -845,11 +435,11 @@ "nvim_plugin-chrisgrieser/nvim-early-retirement": { "flake": false, "locked": { - "lastModified": 1750108178, - "narHash": "sha256-3I7Xup+v9Yq9/nJQ1F5CDW99oFQcxbinv7VQcKeA16Y=", + "lastModified": 1760385962, + "narHash": "sha256-PtpD6Uc4GK4dSJynWH5d6c7XOWXfYODXJ3FyOY1eZNo=", "owner": "chrisgrieser", "repo": "nvim-early-retirement", - "rev": "d9ffd8f70ed6d466cecd3e7e2dd1425b0010932f", + "rev": "9109589b542773c9ad2a34067a085874f255577b", "type": "github" }, "original": { @@ -877,11 +467,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": { @@ -909,11 +499,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": { @@ -941,11 +531,11 @@ "nvim_plugin-hrsh7th/cmp-nvim-lsp": { "flake": false, "locked": { - "lastModified": 1743496195, - "narHash": "sha256-iaihXNCF5bB5MdeoosD/kc3QtpA/QaIDZVLiLIurBSM=", + "lastModified": 1755085771, + "narHash": "sha256-X1rppwf2xBPrmB93ptXukOnEBDZmfjJd4F5ObNa1DHs=", "owner": "hrsh7th", "repo": "cmp-nvim-lsp", - "rev": "a8912b88ce488f411177fc8aed358b04dc246d7b", + "rev": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3", "type": "github" }, "original": { @@ -957,11 +547,11 @@ "nvim_plugin-hrsh7th/cmp-path": { "flake": false, "locked": { - "lastModified": 1743497173, - "narHash": "sha256-thppiiV3wjIaZnAXmsh7j3DUc6ceSCvGzviwFUnoPaI=", + "lastModified": 1753844861, + "narHash": "sha256-e4Rd2y1Wekp7aobpTGaUeoSBnlfIASDaBR8js5dh2Vw=", "owner": "hrsh7th", "repo": "cmp-path", - "rev": "c6635aae33a50d6010bf1aa756ac2398a2d54c32", + "rev": "c642487086dbd9a93160e1679a1327be111cbc25", "type": "github" }, "original": { @@ -973,11 +563,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": { @@ -989,11 +579,11 @@ "nvim_plugin-j-hui/fidget.nvim": { "flake": false, "locked": { - "lastModified": 1738817426, - "narHash": "sha256-AFUx/ZQVWV7s5Wlppjk6N9QXoJKNKqxtf990FFlTEhw=", + "lastModified": 1761243883, + "narHash": "sha256-XXTeJweQRIsC/WFhFxFbepOETV8e5Wfmh513su2Wve0=", "owner": "j-hui", "repo": "fidget.nvim", - "rev": "d9ba6b7bfe29b3119a610892af67602641da778e", + "rev": "e32b672d8fd343f9d6a76944fedb8c61d7d8111a", "type": "github" }, "original": { @@ -1021,11 +611,11 @@ "nvim_plugin-lewis6991/gitsigns.nvim": { "flake": false, "locked": { - "lastModified": 1750058704, - "narHash": "sha256-V9aXXR9ZP2G/XInHt07RylC4rS+AyMXAAfODvC6pVxw=", + "lastModified": 1760888451, + "narHash": "sha256-eGpB7YYWbyCCGYXEYAM432srSp/lUo5C1b0J3OYjwnY=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "88205953bd748322b49b26e1dfb0389932520dc9", + "rev": "20ad4419564d6e22b189f6738116b38871082332", "type": "github" }, "original": { @@ -1069,11 +659,11 @@ "nvim_plugin-m4xshen/hardtime.nvim": { "flake": false, "locked": { - "lastModified": 1750160168, - "narHash": "sha256-hzFX5mZRxTDDIp/iBVl4lqEaQryLQOe7jFJmXDwq4J8=", + "lastModified": 1757738091, + "narHash": "sha256-Jy9ARUHU1ySpSxxoS3hLRjxp5Lqt7juWN5Jnbdo0rg0=", "owner": "m4xshen", "repo": "hardtime.nvim", - "rev": "b9a989191b3a97c9316a0efea02341c4cdab845a", + "rev": "b4e431934af1fe224a3a801f632c008278cb7628", "type": "github" }, "original": { @@ -1085,11 +675,11 @@ "nvim_plugin-mbbill/undotree": { "flake": false, "locked": { - "lastModified": 1741878850, - "narHash": "sha256-HGf4Toe+12YZtIalvANDXAtksCsnxQkZbcevOAnl5G4=", + "lastModified": 1759186837, + "narHash": "sha256-EWOH08KAWyoT9m45/B1d5aKQQJtd3k4orJbagVsxe08=", "owner": "mbbill", "repo": "undotree", - "rev": "b951b87b46c34356d44aa71886aecf9dd7f5788a", + "rev": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f", "type": "github" }, "original": { @@ -1101,11 +691,11 @@ "nvim_plugin-mfussenegger/nvim-lint": { "flake": false, "locked": { - "lastModified": 1749731021, - "narHash": "sha256-V4JJ1VQXoIsUBTxe6ykbkyo6LxEAr+QEIqIV3mA9phs=", + "lastModified": 1759852544, + "narHash": "sha256-wVEX0lCxeipvwCfdd2JbQwnhgg6UrTXixC8E1OiEblI=", "owner": "mfussenegger", "repo": "nvim-lint", - "rev": "2b0039b8be9583704591a13129c600891ac2c596", + "rev": "9da1fb942dd0668d5182f9c8dee801b9c190e2bb", "type": "github" }, "original": { @@ -1117,11 +707,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1750024924, - "narHash": "sha256-gmOqCnSLGDNerXyuuNhkyL/pSJitnyqBdWC3LejZoS4=", + "lastModified": 1761585884, + "narHash": "sha256-m/gd+cb7X2a7R6JSbHes0QjGs+zuj4698Qyi/OW0R1g=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "2fdf224107e5bc29fb5c3a175f5f2c9161b34741", + "rev": "be0d1d14b8504c1c0965b608dc7ed39f2d588c91", "type": "github" }, "original": { @@ -1133,11 +723,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1750169575, - "narHash": "sha256-lJWMFgQLQhKUuv50WrYXlJ3TFqT04nVbmcBGVDaSz0k=", + "lastModified": 1761605346, + "narHash": "sha256-3Aulaw6KMmrcoQQxhRhQhjZ2fg6MSU4Q7qAWtrVsOcA=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "99d3a0f26bfe402f45257c1398287aef252cbe2d", + "rev": "2b52bc2190c8efde2e4de02d829a138666774c7c", "type": "github" }, "original": { @@ -1146,22 +736,6 @@ "type": "github" } }, - "nvim_plugin-nosduco/remote-sshfs.nvim": { - "flake": false, - "locked": { - "lastModified": 1748880705, - "narHash": "sha256-eTnVFOR7FHlkU9kwrk3q3pNo/U8OR2gJrnrMUQKGi2A=", - "owner": "nosduco", - "repo": "remote-sshfs.nvim", - "rev": "6e893c32ff7c5b8d0d501b748c525fa53963fb35", - "type": "github" - }, - "original": { - "owner": "nosduco", - "repo": "remote-sshfs.nvim", - "type": "github" - } - }, "nvim_plugin-numToStr/Comment.nvim": { "flake": false, "locked": { @@ -1181,11 +755,11 @@ "nvim_plugin-nvim-lua/plenary.nvim": { "flake": false, "locked": { - "lastModified": 1739311008, - "narHash": "sha256-8FV5RjF7QbDmQOQynpK7uRKONKbPRYbOPugf9ZxNvUs=", + "lastModified": 1753570668, + "narHash": "sha256-9Un7ekhBxcnmFE1xjCCFTZ7eqIbmXvQexpnhduAg4M0=", "owner": "nvim-lua", "repo": "plenary.nvim", - "rev": "857c5ac632080dba10aae49dba902ce3abf91b35", + "rev": "b9fd5226c2f76c951fc8ed5923d85e4de065e509", "type": "github" }, "original": { @@ -1197,11 +771,11 @@ "nvim_plugin-nvim-lualine/lualine.nvim": { "flake": false, "locked": { - "lastModified": 1749383457, - "narHash": "sha256-2aPgA7riA/FubQpTkqsxLKl7OZ8L6FkucNHc2QEx2HQ=", + "lastModified": 1760596863, + "narHash": "sha256-hdrAdG3hC2sAevQ6a9xizqPgEgnNKxuc5rBYn0pKM1c=", "owner": "nvim-lualine", "repo": "lualine.nvim", - "rev": "a94fc68960665e54408fe37dcf573193c4ce82c9", + "rev": "3946f0122255bc377d14a59b27b609fb3ab25768", "type": "github" }, "original": { @@ -1213,11 +787,11 @@ "nvim_plugin-nvim-telescope/telescope-file-browser.nvim": { "flake": false, "locked": { - "lastModified": 1750040034, - "narHash": "sha256-NHcU3c+1pLeypHr9xXKmqvdwB1QM/vj5axzjpFEQCLQ=", + "lastModified": 1754424906, + "narHash": "sha256-FlJ7w5Ywwq03E0oYdnFJFb+MMUMQMa+5QhDMy2O9tGQ=", "owner": "nvim-telescope", "repo": "telescope-file-browser.nvim", - "rev": "7bf55ed0ff5be182ad3301cff266581fc1c56cce", + "rev": "3610dc7dc91f06aa98b11dca5cc30dfa98626b7e", "type": "github" }, "original": { @@ -1277,11 +851,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1750143568, - "narHash": "sha256-E2YdGlvvpnT/PiayfQldwpbCnjsyNDcoTzxgMf2ajV8=", + "lastModified": 1760921408, + "narHash": "sha256-QCUp/6qX/FS8LrZ6K+pvC/mHkYW8xfzQZEB2y0VOStQ=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "d54a1875a91e1a705795ea26074795210b92ce7f", + "rev": "64e2192f5250796aa4a7f33c6ad888515af50640", "type": "github" }, "original": { @@ -1293,11 +867,11 @@ "nvim_plugin-nvim-tree/nvim-web-devicons": { "flake": false, "locked": { - "lastModified": 1747360641, - "narHash": "sha256-+RHeFaeCF/iwAf8qAOjbEIl3YcnrBMVfkQnnzDNhyTA=", + "lastModified": 1761440007, + "narHash": "sha256-klBjUtj0AvarN5a6O8Hh2t5BuOTe/m3ps2cHnlxVJvE=", "owner": "nvim-tree", "repo": "nvim-web-devicons", - "rev": "1fb58cca9aebbc4fd32b086cb413548ce132c127", + "rev": "8dcb311b0c92d460fac00eac706abd43d94d68af", "type": "github" }, "original": { @@ -1309,11 +883,11 @@ "nvim_plugin-nvim-treesitter/nvim-treesitter-context": { "flake": false, "locked": { - "lastModified": 1749893617, - "narHash": "sha256-QJAfpVdTHTxjUgggQekRLvNYuvG12gjtfTGybfcFdyo=", + "lastModified": 1761077440, + "narHash": "sha256-QdZstxKsEILwe7eUZCmMdyLPyvNKc/e7cfdYQowHWPQ=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-context", - "rev": "1a1a7c5d6d75cb49bf64049dafab15ebe294a79f", + "rev": "ec308c7827b5f8cb2dd0ad303a059c945dd21969", "type": "github" }, "original": { @@ -1341,11 +915,11 @@ "nvim_plugin-rcarriga/nvim-notify": { "flake": false, "locked": { - "lastModified": 1744548826, - "narHash": "sha256-m4dQ8KuMhbEpRh6zLTlIUDN9ojFj69LZnXXLepmdFI8=", + "lastModified": 1757190131, + "narHash": "sha256-h7STMjY+CBTqBkIDJXgtJz4WhNeQ02ES2Jesi3jZXeM=", "owner": "rcarriga", "repo": "nvim-notify", - "rev": "b5825cf9ee881dd8e43309c93374ed5b87b7a896", + "rev": "8701bece920b38ea289b457f902e2ad184131a5d", "type": "github" }, "original": { @@ -1357,11 +931,11 @@ "nvim_plugin-rmagatti/auto-session": { "flake": false, "locked": { - "lastModified": 1749967462, - "narHash": "sha256-1pIGu/GJ4FiMH/yHhoo6Gu0HLC3rFQiesJBuv8uE7Vw=", + "lastModified": 1761491368, + "narHash": "sha256-F2MtkBCVAObRwniSvFjv5MmYnCaj1YSUf0Nk5MF1F4Y=", "owner": "rmagatti", "repo": "auto-session", - "rev": "fffb13dcbe8731b8650e5bf1caa749a485d20556", + "rev": "f0eb3d69848389869572b82b336d7a6887e88e43", "type": "github" }, "original": { @@ -1370,7 +944,7 @@ "type": "github" } }, - "nvim_plugin-ron/ron.vim": { + "nvim_plugin-ron-rs/ron.vim": { "flake": false, "locked": { "lastModified": 1660904719, @@ -1421,11 +995,11 @@ "nvim_plugin-stevearc/conform.nvim": { "flake": false, "locked": { - "lastModified": 1749498876, - "narHash": "sha256-n1IPUNwD14WlDU4zbgfJuhXQcVMt8oc4wCuUJBPJ+y4=", + "lastModified": 1761160784, + "narHash": "sha256-yUUDxYuIjbFHUscEKpFV6IaraDNOA4hdcGljPHG/+sU=", "owner": "stevearc", "repo": "conform.nvim", - "rev": "8132ec733eed3bf415b97b76797ca41b59f51d7d", + "rev": "9fd3d5e0b689ec1bf400c53cbbec72c6fdf24081", "type": "github" }, "original": { @@ -1450,22 +1024,6 @@ "type": "github" } }, - "nvim_plugin-supermaven-inc/supermaven-nvim": { - "flake": false, - "locked": { - "lastModified": 1728314930, - "narHash": "sha256-1z3WKIiikQqoweReUyK5O8MWSRN5y95qcxM6qzlKMME=", - "owner": "supermaven-inc", - "repo": "supermaven-nvim", - "rev": "07d20fce48a5629686aefb0a7cd4b25e33947d50", - "type": "github" - }, - "original": { - "owner": "supermaven-inc", - "repo": "supermaven-nvim", - "type": "github" - } - }, "nvim_plugin-tpope/vim-sleuth": { "flake": false, "locked": { @@ -1517,11 +1075,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": { @@ -1549,11 +1107,11 @@ "nvim_plugin-zbirenbaum/copilot.lua": { "flake": false, "locked": { - "lastModified": 1749137204, - "narHash": "sha256-qxHpIsFFLDG/jtk6e1hkOZgDSRA5Q0+DMxxAxckNhIc=", + "lastModified": 1761595323, + "narHash": "sha256-KkiU2xmpfIbpuijvcXDw+LWKWuBgxjwY7jEQIasN5Kw=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "c1bb86abbed1a52a11ab3944ef00c8410520543d", + "rev": "93adf9844dcbe09a37e7a72eaa286d33d38bf628", "type": "github" }, "original": { @@ -1562,37 +1120,13 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "common", - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "ragenix": { "inputs": { "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_4", - "rust-overlay": "rust-overlay" + "nixpkgs": "nixpkgs_5", + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1744897914, @@ -1612,13 +1146,15 @@ "inputs": { "common": "common", "deploy-rs": "deploy-rs", - "nixpkgs": "nixpkgs_6", - "ros_neovim": "ros_neovim" + "home-manager": "home-manager", + "nixpkgs": "nixpkgs_3", + "ros_neovim": "ros_neovim", + "secrets": "secrets" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_7", + "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", @@ -1649,7 +1185,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", @@ -1663,26 +1198,25 @@ "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", "nvim_plugin-stevearc/dressing.nvim": "nvim_plugin-stevearc/dressing.nvim", - "nvim_plugin-supermaven-inc/supermaven-nvim": "nvim_plugin-supermaven-inc/supermaven-nvim", "nvim_plugin-tpope/vim-sleuth": "nvim_plugin-tpope/vim-sleuth", "nvim_plugin-tpope/vim-surround": "nvim_plugin-tpope/vim-surround", "nvim_plugin-uga-rosa/ccc.nvim": "nvim_plugin-uga-rosa/ccc.nvim", "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": 1750190298, - "narHash": "sha256-ero30lVvCzmdKkY0lZR/RO+oTNTY1WXQh6vhfbcbTIk=", + "lastModified": 1761712156, + "narHash": "sha256-4vU7FPZFXSFguQUIPrbLQOk3VSokp6RH8t7zQoqneow=", "ref": "refs/heads/master", - "rev": "1ed03dac446683ef42035b53a410d857855d82d9", - "revCount": 291, + "rev": "04f666dabbaced8d661693cfbe4eb7efa359ce7d", + "revCount": 320, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, @@ -1694,7 +1228,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" ] @@ -1713,39 +1268,32 @@ "type": "github" } }, - "rust-overlay_2": { + "secrets": { "inputs": { - "nixpkgs": [ - "ros_neovim", - "nixpkgs" - ] + "ragenix": "ragenix" }, "locked": { - "lastModified": 1750127910, - "narHash": "sha256-FIgEIS0RAlOyXGqoj/OufTfcKItYq668yPYL4SXdU0M=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "45418795a73b77b7726c62ce265d68cf541ffb49", - "type": "github" + "path": "../../../flakes/secrets", + "type": "path" }, "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } + "path": "../../../flakes/secrets", + "type": "path" + }, + "parent": [] }, "systems": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1779,24 +1327,9 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "utils": { "inputs": { - "systems": "systems_4" + "systems": "systems" }, "locked": { "lastModified": 1731533236, @@ -1811,53 +1344,6 @@ "repo": "flake-utils", "type": "github" } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "common", - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "common", - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "common", - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "common", - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1755354946, - "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/hosts/oracle/o001/flake.nix b/hosts/oracle/o001/flake.nix index 8cc5889..cee29f8 100644 --- a/hosts/oracle/o001/flake.nix +++ b/hosts/oracle/o001/flake.nix @@ -1,25 +1,33 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + home-manager.url = "github:rycee/home-manager/release-25.05"; deploy-rs.url = "github:serokell/deploy-rs"; - - # common.url = "path:../../../common"; - common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; + + # 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"; + secrets.url = "path:../../../flakes/secrets"; + # secrets.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/secrets"; }; outputs = { self, nixpkgs, + home-manager, common, + secrets, ros_neovim, deploy-rs, ... - }: + }@inputs: let configuration_name = "o001"; system = "aarch64-linux"; + stateVersion = "23.11"; + primaryUser = "root"; lib = nixpkgs.lib; in { @@ -40,73 +48,79 @@ }; nixosConfigurations = { - nixos = self.nixosConfigurations.${configuration_name}; - "${configuration_name}" = lib.nixosSystem { - inherit system; - modules = [ - common.nixosModules.default - ros_neovim.nixosModules.default - ./configuration.nix - ./hardware-configuration.nix - ./nginx.nix - ./containers/vaultwarden.nix - ./mods/postgresql.nix - ./mods/atuin.nix - ./mods/rustdesk-server.nix - ( - { pkgs, ... }: - { - environment.systemPackages = with pkgs; [ - bitwarden - vaultwarden - ]; + "${configuration_name}" = ( + lib.nixosSystem { + inherit system; + specialArgs = { + inherit inputs; + }; + modules = [ + home-manager.nixosModules.default + secrets.nixosModules.default - ringofstorms_common = { - systemName = configuration_name; - secrets.enable = true; - general = { - disableRemoteBuildsOnLio = true; - readWindowsDrives = false; - jetbrainsMonoFont = false; - ttyCapsEscape = false; - reporting.enable = true; + common.nixosModules.essentials + common.nixosModules.git + common.nixosModules.hardening + common.nixosModules.nix_options + common.nixosModules.docker + common.nixosModules.tailnet + common.nixosModules.zsh + + ros_neovim.nixosModules.default + ./configuration.nix + ./hardware-configuration.nix + ./nginx.nix + ./containers/vaultwarden.nix + ./mods/postgresql.nix + ./mods/atuin.nix + ./mods/rustdesk-server.nix + ( + { pkgs, ... }: + rec { + # Home Manager + home-manager = { + useUserPackages = true; + useGlobalPkgs = true; + backupFileExtension = "bak"; + # add all normal users to home manager so it applies to them + users = lib.mapAttrs (name: user: { + home.stateVersion = stateVersion; + programs.home-manager.enable = true; + }) (lib.filterAttrs (name: user: name == "root" || (user.isNormalUser or false)) users.users); + + sharedModules = [ + common.homeManagerModules.tmux + common.homeManagerModules.atuin + common.homeManagerModules.git + common.homeManagerModules.postgres_cli_options + common.homeManagerModules.starship + common.homeManagerModules.zoxide + common.homeManagerModules.zsh + ]; }; - programs = { - tailnet.enable = true; - ssh.enable = true; - docker.enable = true; - }; - users = { - users = { - root = { - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG90Gg6dV3yhZ5+X40vICbeBwV9rfD39/8l9QSqluTw8 nix2oracle" - ]; - shell = pkgs.zsh; - }; + + # System configuration + system.stateVersion = stateVersion; + networking.hostName = configuration_name; + programs.nh.flake = "/home/${primaryUser}/.config/nixos-config/hosts/${configuration_name}"; + nixpkgs.config.allowUnfree = true; + users.users = { + "${primaryUser}" = { + shell = pkgs.zsh; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG90Gg6dV3yhZ5+X40vICbeBwV9rfD39/8l9QSqluTw8 nix2oracle" + ]; }; }; - homeManager = { - users = { - root = { - programs.atuin.settings.sync_address = "http://localhost:8888"; - imports = with common.homeManagerModules; [ - tmux - atuin - git - postgres - starship - zoxide - zsh - ]; - }; - }; - }; - }; - } - ) - ]; - }; + + environment.systemPackages = with pkgs; [ + vaultwarden + ]; + } + ) + ]; + } + ); }; }; }