From 274d59ce4b0d54c8518514e299a7cf8dcc776571 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Thu, 4 Dec 2025 09:29:10 -0600 Subject: [PATCH] update pins --- flakes/common/nix_modules/timezone_auto.nix | 10 + hosts/h003/flake.nix | 2 - hosts/linode/l001/flake.nix | 2 - hosts/lio/flake.lock | 182 +++++++++--------- hosts/lio/flake.nix | 7 +- hosts/oracle/o001/flake.nix | 1 - hosts/oren/flake.lock | 132 ++++++------- hosts/oren/flake.nix | 2 - hosts/template.josh.nix | 2 - hosts/template.luser.nix | 2 - .../examples/testbed/flake.nix | 2 - utilities/nixos-installers/new-flake.nix | 2 - 12 files changed, 172 insertions(+), 174 deletions(-) diff --git a/flakes/common/nix_modules/timezone_auto.nix b/flakes/common/nix_modules/timezone_auto.nix index 223aef1c..d7c0b580 100644 --- a/flakes/common/nix_modules/timezone_auto.nix +++ b/flakes/common/nix_modules/timezone_auto.nix @@ -4,4 +4,14 @@ { time.timeZone = null; services.automatic-timezoned.enable = true; + + # Add a polkit rule so automatic-timezoned can change timezone + security.polkit.extraConfig = '' + polkit.addRule(function(action, subject) { + if (action.id == "org.freedesktop.timedate1.set-timezone" && + subject.isInGroup("wheel")) { + return polkit.Result.YES; + } + }); + ''; } diff --git a/hosts/h003/flake.nix b/hosts/h003/flake.nix index 9c83ebaa..d3de030d 100644 --- a/hosts/h003/flake.nix +++ b/hosts/h003/flake.nix @@ -26,7 +26,6 @@ }@inputs: let configurationName = "h003"; - system = "x86_64-linux"; stateVersion = "25.05"; primaryUser = "luser"; overlayIp = "100.64.0.14"; @@ -36,7 +35,6 @@ nixosConfigurations = { "${configurationName}" = ( lib.nixosSystem { - inherit system; specialArgs = { inherit inputs; }; diff --git a/hosts/linode/l001/flake.nix b/hosts/linode/l001/flake.nix index c779f9f5..4a7f856a 100644 --- a/hosts/linode/l001/flake.nix +++ b/hosts/linode/l001/flake.nix @@ -20,7 +20,6 @@ }@inputs: let configuration_name = "l001"; - system = "x86_64-linux"; stateVersion = "24.11"; primaryUser = "root"; lib = nixpkgs.lib; @@ -44,7 +43,6 @@ nixosConfigurations = { "${configuration_name}" = ( lib.nixosSystem { - inherit system; specialArgs = { inherit inputs; }; diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index ad886ac8..981467d5 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1736955230, - "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "lastModified": 1761656077, + "narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=", "owner": "ryantm", "repo": "agenix", - "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5", "type": "github" }, "original": { @@ -31,11 +31,11 @@ }, "locked": { "dir": "flakes/beszel", - "lastModified": 1764656426, - "narHash": "sha256-mQCosSOCXRFs2tOsPMAQRjDrbCaXCL3XlonCwlltyIc=", + "lastModified": 1764783399, + "narHash": "sha256-6d10SeMBTyogUZBiCJdzsm5+9fJ9fzYzfcKkYn5cNbQ=", "ref": "refs/heads/master", - "rev": "22b4c5755d1411a9cc40ee56e6fe5ee19da31967", - "revCount": 832, + "rev": "10cb42ba2109fd52c787efa1e8fc6dffab90e169", + "revCount": 841, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -63,22 +63,28 @@ }, "common": { "locked": { - "path": "../../flakes/common", - "type": "path" + "dir": "flakes/common", + "lastModified": 1764783399, + "narHash": "sha256-6d10SeMBTyogUZBiCJdzsm5+9fJ9fzYzfcKkYn5cNbQ=", + "ref": "refs/heads/master", + "rev": "10cb42ba2109fd52c787efa1e8fc6dffab90e169", + "revCount": 841, + "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": { - "lastModified": 1741481578, - "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=", + "lastModified": 1760924934, + "narHash": "sha256-tuuqY5aU7cUkR71sO2TraVKK2boYrdW3gCSXUkF4i44=", "owner": "ipetkov", "repo": "crane", - "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5", + "rev": "c6b4d5308293d0d04fcfeee92705017537cad02f", "type": "github" }, "original": { @@ -97,11 +103,11 @@ ] }, "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "lastModified": 1744478979, + "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "rev": "43975d782b418ebf4969e9ccba82466728c2851b", "type": "github" }, "original": { @@ -135,11 +141,11 @@ }, "locked": { "dir": "flakes/flatpaks", - "lastModified": 1764656426, - "narHash": "sha256-mQCosSOCXRFs2tOsPMAQRjDrbCaXCL3XlonCwlltyIc=", + "lastModified": 1764783399, + "narHash": "sha256-6d10SeMBTyogUZBiCJdzsm5+9fJ9fzYzfcKkYn5cNbQ=", "ref": "refs/heads/master", - "rev": "22b4c5755d1411a9cc40ee56e6fe5ee19da31967", - "revCount": 832, + "rev": "10cb42ba2109fd52c787efa1e8fc6dffab90e169", + "revCount": 841, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -154,11 +160,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1764613336, - "narHash": "sha256-L979az28t/+SXvYw9qhOno5HLlDwkZOpz6LzCLnjmRM=", + "lastModified": 1764776959, + "narHash": "sha256-d+5CGloq7Lo1u2SkzhF8oiOdUc6Z5emh22nTXUB9CFA=", "owner": "rycee", "repo": "home-manager", - "rev": "f3902b5d8767985680875ad86d028371100faeb3", + "rev": "e1680d594a9281651cbf7d126941a8c8e2396183", "type": "github" }, "original": { @@ -178,11 +184,11 @@ ] }, "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "lastModified": 1745494811, + "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", "owner": "nix-community", "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", "type": "github" }, "original": { @@ -209,11 +215,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764406085, - "narHash": "sha256-CYbMp8hwuOf4umokSNp+t1s4Hjd4vxXq4S5CD+xvgNs=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9561691c9f450fad7c3526916e1c4f44be0d1192", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { @@ -257,11 +263,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1764040936, - "narHash": "sha256-d1NFBVGQZ/Xb0pMviuzenqrfXymJs0m/pKrEg1tDGsE=", + "lastModified": 1764776358, + "narHash": "sha256-MxXSCRiV7DI5U3Ra1UxVJTTUyKsONAE8+8QdSXsGIhA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b9491974f02dadeb5acca22649ccbd89a6a81afb", + "rev": "0b8cec1eb2241336971009cdd4af641b930d0d97", "type": "github" }, "original": { @@ -272,11 +278,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1741379970, - "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", + "lastModified": 1761672384, + "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", + "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", "type": "github" }, "original": { @@ -353,11 +359,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1763430554, - "narHash": "sha256-0DwPuzqR+7R4lJFQ9f2xN26YhdQKg85Hw6+bPvloZoc=", + "lastModified": 1764732647, + "narHash": "sha256-jya61X22LbcT4hpeio3qE/oOI/lvqKpf09oGEHHvQdA=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "6e0e8902dac70fecbdd8ce557d142062a621ec38", + "rev": "b2b135347e299ffbf7f4123fb7811899b0c9f4b8", "type": "github" }, "original": { @@ -433,11 +439,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1763748041, - "narHash": "sha256-4KKj1zp+5Z2zbC31hpvw73BIuf4dW7rimepGOggmUp4=", + "lastModified": 1764655248, + "narHash": "sha256-9nUBzwbMkzLySMW/Y0EkFpvFgHeW5YDQ3J3moVQarjQ=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "aa25399c48236b77af71d4b64cdf157d2ba4e990", + "rev": "e9c00ea7813006dfa29f35c174f83f0184d45a93", "type": "github" }, "original": { @@ -449,11 +455,11 @@ "nvim_plugin-catppuccin/nvim": { "flake": false, "locked": { - "lastModified": 1763995197, - "narHash": "sha256-i4WmQzSNWeR5rh61yonzR55yyklJ3xOL8D/XyEnDa+E=", + "lastModified": 1764084803, + "narHash": "sha256-ds+Rm9H00s++RC1dH4OQpCg1FXSm4HuwDGzr4ah0YBU=", "owner": "catppuccin", "repo": "nvim", - "rev": "180e0435707cf1fed09a98a9739e5807d92b69be", + "rev": "ce4a8e0d5267e67056f9f4dcf6cb1d0933c8ca00", "type": "github" }, "original": { @@ -465,11 +471,11 @@ "nvim_plugin-chrisgrieser/nvim-early-retirement": { "flake": false, "locked": { - "lastModified": 1764013541, - "narHash": "sha256-Mzz1y7YYTYUWv9S/Yr26to7AuDCZ+9asHa3qzDz06D0=", + "lastModified": 1764104935, + "narHash": "sha256-mvs0uIoxidy3jfC6oymwhaZVRbJrW+/kuMcIpR8TI6M=", "owner": "chrisgrieser", "repo": "nvim-early-retirement", - "rev": "6fb7d87a965e439cfb4e04a5c0e5038010fc015b", + "rev": "cd29cf40af7473530a8598245ba1d348fd5e1fa0", "type": "github" }, "original": { @@ -641,11 +647,11 @@ "nvim_plugin-lewis6991/gitsigns.nvim": { "flake": false, "locked": { - "lastModified": 1763280728, - "narHash": "sha256-w2/osNJwbtmUxxQIXBsyqMYrvyNUaVzXrUNGYqGmzi4=", + "lastModified": 1764322768, + "narHash": "sha256-w3Q7nMFEbcjP6RmSTONg2Nw1dBXDEHnjQ69FuAPJRD8=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "cdafc320f03f2572c40ab93a4eecb733d4016d07", + "rev": "5813e4878748805f1518cee7abb50fd7205a3a48", "type": "github" }, "original": { @@ -737,11 +743,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1763539887, - "narHash": "sha256-aMyjQEEY6MlTBMMxjR6NxNhdbWmvRhOcfpgE1w712nE=", + "lastModified": 1764542305, + "narHash": "sha256-t7xAQ9sczLyA1zODmD+nEuWuLnhrfSOoPu/4G/YTGdU=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "6b7e0e18ad8fa0598bc038aef7bb6bba288adbad", + "rev": "6c3785d6a230bec63f70c98bf8e2842bed924245", "type": "github" }, "original": { @@ -753,11 +759,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1763880753, - "narHash": "sha256-huuWVUKo6CmxjXYRnGv8tUs+7bo85gNyL8vVnreiTAU=", + "lastModified": 1764477618, + "narHash": "sha256-IpVDEOr//Jy+r3Z5Qo8nxDa3fNO+BTBKzAmbqvxtCQE=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "30a2b191bccf541ce1797946324c9329e90ec448", + "rev": "effe4bf2e1afb881ea67291c648b68dd3dfc927a", "type": "github" }, "original": { @@ -865,11 +871,11 @@ "nvim_plugin-nvim-telescope/telescope.nvim": { "flake": false, "locked": { - "lastModified": 1763414201, - "narHash": "sha256-6hrylUCc6KlcbnMgcJNJhbX2Cgu0YHKoMPOqpaKRljE=", + "lastModified": 1764418954, + "narHash": "sha256-e6XSJRv4KB0z+nzGWmlV/YZNwWsyrrpQTloePRKWmw4=", "owner": "nvim-telescope", "repo": "telescope.nvim", - "rev": "83a3a713d6b2d2a408491a1b959e55a7fa8678e8", + "rev": "e69b434b968a33815e2f02a5c7bd7b8dd4c7d4b2", "type": "github" }, "original": { @@ -881,11 +887,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1763712665, - "narHash": "sha256-YwaWMPQ3IC+z/utnkZ1Tfs5tZFex9Gdf/vS9sUaMDCA=", + "lastModified": 1764713359, + "narHash": "sha256-dSaO5esPKj1y4vNyLb3AK9egmFJsmWxkGOT+etJsbRA=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "3fb91e18a727ecc0385637895ec397dea90be42a", + "rev": "59088b96a32ea47caf4976e164dbd88b86447fb7", "type": "github" }, "original": { @@ -1025,11 +1031,11 @@ "nvim_plugin-stevearc/conform.nvim": { "flake": false, "locked": { - "lastModified": 1763939276, - "narHash": "sha256-2TLMJdbSbMbdGn6zhZwNSUZnxVGu+Y0ZYhTjinTc7Hs=", + "lastModified": 1764743081, + "narHash": "sha256-qCjrMt3fsRbLr/iM7nFHG7oKtyTTGcse4/cJbm3odJE=", "owner": "stevearc", "repo": "conform.nvim", - "rev": "6208aefd675939cc7c8f1a57176135974dad269f", + "rev": "ffe26e8df8115c9665d24231f8a49fadb2d611ce", "type": "github" }, "original": { @@ -1137,11 +1143,11 @@ "nvim_plugin-zbirenbaum/copilot.lua": { "flake": false, "locked": { - "lastModified": 1763512274, - "narHash": "sha256-NMIXOb/20aEmXvPgSDPzVuRIV+OUnJyfXVaVEuVAaTM=", + "lastModified": 1764638966, + "narHash": "sha256-wQ6SfAunVMd5tNeM7RMvrfPC2ELRibyEQboVQlU/fBs=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "4383e05a47493d7ff77b058c0548129eb38ec7fb", + "rev": "881f99b827d65b41f522eecc21b112cf518028ac", "type": "github" }, "original": { @@ -1159,11 +1165,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1744897914, - "narHash": "sha256-GIVU92o2TZBnKQXTb76zpQbWR4zjU2rFqWKNIIpXnqA=", + "lastModified": 1761832913, + "narHash": "sha256-VCNVjjuRvrKPiYYwqhE3BAKIaReiKXGpxGp27lZ0MFM=", "owner": "yaxitech", "repo": "ragenix", - "rev": "40f2e17ecaeab4d78ec323e96a04548c0aaa5223", + "rev": "83bccfdea758241999f32869fb6b36f7ac72f1ac", "type": "github" }, "original": { @@ -1244,11 +1250,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1764112623, - "narHash": "sha256-IBjor1S6fq2nwmzi7sRwJg6mRFlO9qwA1OhJhyHvwlw=", + "lastModified": 1764777428, + "narHash": "sha256-wFfPnXo1P+NwSK+Y7xYVwt0mbYhe9uBrf80T5KpBV5Q=", "ref": "refs/heads/master", - "rev": "d85f1e831e400b2d1ea574fe6e40deba39d4d750", - "revCount": 323, + "rev": "ee642c429fced7d51c5f9c9694034f6222a1186f", + "revCount": 324, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, @@ -1265,11 +1271,11 @@ ] }, "locked": { - "lastModified": 1764038373, - "narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=", + "lastModified": 1764729618, + "narHash": "sha256-z4RA80HCWv2los1KD346c+PwNPzMl79qgl7bCVgz8X0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9", + "rev": "52764074a85145d5001bf0aa30cb71936e9ad5b8", "type": "github" }, "original": { @@ -1287,11 +1293,11 @@ ] }, "locked": { - "lastModified": 1741400194, - "narHash": "sha256-tEpgT+q5KlGjHSm8MnINgTPErEl8YDzX3Eps8PVc09g=", + "lastModified": 1761791894, + "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "16b6045a232fea0e9e4c69e55a6e269607dd8e3f", + "rev": "59c45eb69d9222a4362673141e00ff77842cd219", "type": "github" }, "original": { @@ -1306,11 +1312,11 @@ }, "locked": { "dir": "flakes/secrets", - "lastModified": 1764656426, - "narHash": "sha256-mQCosSOCXRFs2tOsPMAQRjDrbCaXCL3XlonCwlltyIc=", + "lastModified": 1764783399, + "narHash": "sha256-6d10SeMBTyogUZBiCJdzsm5+9fJ9fzYzfcKkYn5cNbQ=", "ref": "refs/heads/master", - "rev": "22b4c5755d1411a9cc40ee56e6fe5ee19da31967", - "revCount": 832, + "rev": "10cb42ba2109fd52c787efa1e8fc6dffab90e169", + "revCount": 841, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index 313b1136..42bff686 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -6,8 +6,8 @@ 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"; @@ -31,7 +31,6 @@ }@inputs: let configuration_name = "lio"; - system = "x86_64-linux"; primaryUser = "josh"; overlayIp = "100.64.0.1"; lib = nixpkgs.lib; @@ -40,11 +39,9 @@ nixosConfigurations = { "${configuration_name}" = ( lib.nixosSystem { - inherit system; specialArgs = { inherit inputs; upkgs = import inputs.nixpkgs-unstable { - inherit system; config.allowUnfree = true; }; }; diff --git a/hosts/oracle/o001/flake.nix b/hosts/oracle/o001/flake.nix index 8efb60e6..2e5e0eba 100644 --- a/hosts/oracle/o001/flake.nix +++ b/hosts/oracle/o001/flake.nix @@ -54,7 +54,6 @@ nixosConfigurations = { "${configuration_name}" = ( lib.nixosSystem { - inherit system; specialArgs = { inherit inputs; }; diff --git a/hosts/oren/flake.lock b/hosts/oren/flake.lock index 7249c23f..f278ed8f 100644 --- a/hosts/oren/flake.lock +++ b/hosts/oren/flake.lock @@ -68,11 +68,11 @@ }, "locked": { "dir": "flakes/beszel", - "lastModified": 1764738853, - "narHash": "sha256-5kFTVXpO07txxGJeXlBYb7PTCSqZR9bSWikyfOlPK/o=", + "lastModified": 1764743245, + "narHash": "sha256-SYH3szHJiTKjeRwECXgy4Ukj1fzNtRzC3mqJzIES07Y=", "ref": "refs/heads/master", - "rev": "a5ccd38f32cb485cf9d3a461f5e972fdc4266d18", - "revCount": 837, + "rev": "dd70b4ba812551c9a14055542888cc28b9b1429b", + "revCount": 840, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -101,11 +101,11 @@ "common": { "locked": { "dir": "flakes/common", - "lastModified": 1764738853, - "narHash": "sha256-5kFTVXpO07txxGJeXlBYb7PTCSqZR9bSWikyfOlPK/o=", + "lastModified": 1764743245, + "narHash": "sha256-SYH3szHJiTKjeRwECXgy4Ukj1fzNtRzC3mqJzIES07Y=", "ref": "refs/heads/master", - "rev": "a5ccd38f32cb485cf9d3a461f5e972fdc4266d18", - "revCount": 837, + "rev": "dd70b4ba812551c9a14055542888cc28b9b1429b", + "revCount": 840, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -194,11 +194,11 @@ }, "locked": { "dir": "flakes/flatpaks", - "lastModified": 1764738853, - "narHash": "sha256-5kFTVXpO07txxGJeXlBYb7PTCSqZR9bSWikyfOlPK/o=", + "lastModified": 1764743245, + "narHash": "sha256-SYH3szHJiTKjeRwECXgy4Ukj1fzNtRzC3mqJzIES07Y=", "ref": "refs/heads/master", - "rev": "a5ccd38f32cb485cf9d3a461f5e972fdc4266d18", - "revCount": 837, + "rev": "dd70b4ba812551c9a14055542888cc28b9b1429b", + "revCount": 840, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -236,11 +236,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1764736872, - "narHash": "sha256-4mqLegNQeD54X7enm6EI9aNWl6CaIfyhl5PaYoGYwqk=", + "lastModified": 1764776959, + "narHash": "sha256-d+5CGloq7Lo1u2SkzhF8oiOdUc6Z5emh22nTXUB9CFA=", "owner": "rycee", "repo": "home-manager", - "rev": "3366918730bb6b699395a9d237397f1d710a94b3", + "rev": "e1680d594a9281651cbf7d126941a8c8e2396183", "type": "github" }, "original": { @@ -343,11 +343,11 @@ }, "locked": { "dir": "flakes/hyprland", - "lastModified": 1764738853, - "narHash": "sha256-5kFTVXpO07txxGJeXlBYb7PTCSqZR9bSWikyfOlPK/o=", + "lastModified": 1764743245, + "narHash": "sha256-SYH3szHJiTKjeRwECXgy4Ukj1fzNtRzC3mqJzIES07Y=", "ref": "refs/heads/master", - "rev": "a5ccd38f32cb485cf9d3a461f5e972fdc4266d18", - "revCount": 837, + "rev": "dd70b4ba812551c9a14055542888cc28b9b1429b", + "revCount": 840, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -677,11 +677,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1764040936, - "narHash": "sha256-d1NFBVGQZ/Xb0pMviuzenqrfXymJs0m/pKrEg1tDGsE=", + "lastModified": 1764776358, + "narHash": "sha256-MxXSCRiV7DI5U3Ra1UxVJTTUyKsONAE8+8QdSXsGIhA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b9491974f02dadeb5acca22649ccbd89a6a81afb", + "rev": "0b8cec1eb2241336971009cdd4af641b930d0d97", "type": "github" }, "original": { @@ -773,11 +773,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1763430554, - "narHash": "sha256-0DwPuzqR+7R4lJFQ9f2xN26YhdQKg85Hw6+bPvloZoc=", + "lastModified": 1764732647, + "narHash": "sha256-jya61X22LbcT4hpeio3qE/oOI/lvqKpf09oGEHHvQdA=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "6e0e8902dac70fecbdd8ce557d142062a621ec38", + "rev": "b2b135347e299ffbf7f4123fb7811899b0c9f4b8", "type": "github" }, "original": { @@ -853,11 +853,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1763748041, - "narHash": "sha256-4KKj1zp+5Z2zbC31hpvw73BIuf4dW7rimepGOggmUp4=", + "lastModified": 1764655248, + "narHash": "sha256-9nUBzwbMkzLySMW/Y0EkFpvFgHeW5YDQ3J3moVQarjQ=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "aa25399c48236b77af71d4b64cdf157d2ba4e990", + "rev": "e9c00ea7813006dfa29f35c174f83f0184d45a93", "type": "github" }, "original": { @@ -869,11 +869,11 @@ "nvim_plugin-catppuccin/nvim": { "flake": false, "locked": { - "lastModified": 1763995197, - "narHash": "sha256-i4WmQzSNWeR5rh61yonzR55yyklJ3xOL8D/XyEnDa+E=", + "lastModified": 1764084803, + "narHash": "sha256-ds+Rm9H00s++RC1dH4OQpCg1FXSm4HuwDGzr4ah0YBU=", "owner": "catppuccin", "repo": "nvim", - "rev": "180e0435707cf1fed09a98a9739e5807d92b69be", + "rev": "ce4a8e0d5267e67056f9f4dcf6cb1d0933c8ca00", "type": "github" }, "original": { @@ -885,11 +885,11 @@ "nvim_plugin-chrisgrieser/nvim-early-retirement": { "flake": false, "locked": { - "lastModified": 1764013541, - "narHash": "sha256-Mzz1y7YYTYUWv9S/Yr26to7AuDCZ+9asHa3qzDz06D0=", + "lastModified": 1764104935, + "narHash": "sha256-mvs0uIoxidy3jfC6oymwhaZVRbJrW+/kuMcIpR8TI6M=", "owner": "chrisgrieser", "repo": "nvim-early-retirement", - "rev": "6fb7d87a965e439cfb4e04a5c0e5038010fc015b", + "rev": "cd29cf40af7473530a8598245ba1d348fd5e1fa0", "type": "github" }, "original": { @@ -1061,11 +1061,11 @@ "nvim_plugin-lewis6991/gitsigns.nvim": { "flake": false, "locked": { - "lastModified": 1763280728, - "narHash": "sha256-w2/osNJwbtmUxxQIXBsyqMYrvyNUaVzXrUNGYqGmzi4=", + "lastModified": 1764322768, + "narHash": "sha256-w3Q7nMFEbcjP6RmSTONg2Nw1dBXDEHnjQ69FuAPJRD8=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "cdafc320f03f2572c40ab93a4eecb733d4016d07", + "rev": "5813e4878748805f1518cee7abb50fd7205a3a48", "type": "github" }, "original": { @@ -1157,11 +1157,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1763539887, - "narHash": "sha256-aMyjQEEY6MlTBMMxjR6NxNhdbWmvRhOcfpgE1w712nE=", + "lastModified": 1764542305, + "narHash": "sha256-t7xAQ9sczLyA1zODmD+nEuWuLnhrfSOoPu/4G/YTGdU=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "6b7e0e18ad8fa0598bc038aef7bb6bba288adbad", + "rev": "6c3785d6a230bec63f70c98bf8e2842bed924245", "type": "github" }, "original": { @@ -1173,11 +1173,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1763880753, - "narHash": "sha256-huuWVUKo6CmxjXYRnGv8tUs+7bo85gNyL8vVnreiTAU=", + "lastModified": 1764477618, + "narHash": "sha256-IpVDEOr//Jy+r3Z5Qo8nxDa3fNO+BTBKzAmbqvxtCQE=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "30a2b191bccf541ce1797946324c9329e90ec448", + "rev": "effe4bf2e1afb881ea67291c648b68dd3dfc927a", "type": "github" }, "original": { @@ -1285,11 +1285,11 @@ "nvim_plugin-nvim-telescope/telescope.nvim": { "flake": false, "locked": { - "lastModified": 1763414201, - "narHash": "sha256-6hrylUCc6KlcbnMgcJNJhbX2Cgu0YHKoMPOqpaKRljE=", + "lastModified": 1764418954, + "narHash": "sha256-e6XSJRv4KB0z+nzGWmlV/YZNwWsyrrpQTloePRKWmw4=", "owner": "nvim-telescope", "repo": "telescope.nvim", - "rev": "83a3a713d6b2d2a408491a1b959e55a7fa8678e8", + "rev": "e69b434b968a33815e2f02a5c7bd7b8dd4c7d4b2", "type": "github" }, "original": { @@ -1301,11 +1301,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1763712665, - "narHash": "sha256-YwaWMPQ3IC+z/utnkZ1Tfs5tZFex9Gdf/vS9sUaMDCA=", + "lastModified": 1764713359, + "narHash": "sha256-dSaO5esPKj1y4vNyLb3AK9egmFJsmWxkGOT+etJsbRA=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "3fb91e18a727ecc0385637895ec397dea90be42a", + "rev": "59088b96a32ea47caf4976e164dbd88b86447fb7", "type": "github" }, "original": { @@ -1445,11 +1445,11 @@ "nvim_plugin-stevearc/conform.nvim": { "flake": false, "locked": { - "lastModified": 1763939276, - "narHash": "sha256-2TLMJdbSbMbdGn6zhZwNSUZnxVGu+Y0ZYhTjinTc7Hs=", + "lastModified": 1764743081, + "narHash": "sha256-qCjrMt3fsRbLr/iM7nFHG7oKtyTTGcse4/cJbm3odJE=", "owner": "stevearc", "repo": "conform.nvim", - "rev": "6208aefd675939cc7c8f1a57176135974dad269f", + "rev": "ffe26e8df8115c9665d24231f8a49fadb2d611ce", "type": "github" }, "original": { @@ -1557,11 +1557,11 @@ "nvim_plugin-zbirenbaum/copilot.lua": { "flake": false, "locked": { - "lastModified": 1763512274, - "narHash": "sha256-NMIXOb/20aEmXvPgSDPzVuRIV+OUnJyfXVaVEuVAaTM=", + "lastModified": 1764638966, + "narHash": "sha256-wQ6SfAunVMd5tNeM7RMvrfPC2ELRibyEQboVQlU/fBs=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "4383e05a47493d7ff77b058c0548129eb38ec7fb", + "rev": "881f99b827d65b41f522eecc21b112cf518028ac", "type": "github" }, "original": { @@ -1688,11 +1688,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1764112623, - "narHash": "sha256-IBjor1S6fq2nwmzi7sRwJg6mRFlO9qwA1OhJhyHvwlw=", + "lastModified": 1764777428, + "narHash": "sha256-wFfPnXo1P+NwSK+Y7xYVwt0mbYhe9uBrf80T5KpBV5Q=", "ref": "refs/heads/master", - "rev": "d85f1e831e400b2d1ea574fe6e40deba39d4d750", - "revCount": 323, + "rev": "ee642c429fced7d51c5f9c9694034f6222a1186f", + "revCount": 324, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, @@ -1709,11 +1709,11 @@ ] }, "locked": { - "lastModified": 1764038373, - "narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=", + "lastModified": 1764729618, + "narHash": "sha256-z4RA80HCWv2los1KD346c+PwNPzMl79qgl7bCVgz8X0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9", + "rev": "52764074a85145d5001bf0aa30cb71936e9ad5b8", "type": "github" }, "original": { @@ -1750,11 +1750,11 @@ }, "locked": { "dir": "flakes/secrets", - "lastModified": 1764738853, - "narHash": "sha256-5kFTVXpO07txxGJeXlBYb7PTCSqZR9bSWikyfOlPK/o=", + "lastModified": 1764743245, + "narHash": "sha256-SYH3szHJiTKjeRwECXgy4Ukj1fzNtRzC3mqJzIES07Y=", "ref": "refs/heads/master", - "rev": "a5ccd38f32cb485cf9d3a461f5e972fdc4266d18", - "revCount": 837, + "rev": "dd70b4ba812551c9a14055542888cc28b9b1429b", + "revCount": 840, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, diff --git a/hosts/oren/flake.nix b/hosts/oren/flake.nix index 5db9c05d..57ee6d70 100644 --- a/hosts/oren/flake.nix +++ b/hosts/oren/flake.nix @@ -32,7 +32,6 @@ }: let configuration_name = "oren"; - system = "x86_64-linux"; stateVersion = "25.05"; primaryUser = "josh"; overlayIp = "100.64.0.5"; @@ -42,7 +41,6 @@ nixosConfigurations = { "${configuration_name}" = ( lib.nixosSystem { - inherit system; modules = [ home-manager.nixosModules.default diff --git a/hosts/template.josh.nix b/hosts/template.josh.nix index fba7b684..162f164b 100644 --- a/hosts/template.josh.nix +++ b/hosts/template.josh.nix @@ -26,7 +26,6 @@ }: let configuration_name = "SYSTEM_NAME"; - system = "x86_64-linux"; stateVersion = "25.05"; primaryUser = "josh"; lib = nixpkgs.lib; @@ -35,7 +34,6 @@ nixosConfigurations = { "${configuration_name}" = ( lib.nixosSystem { - inherit system; modules = [ home-manager.nixosModules.default diff --git a/hosts/template.luser.nix b/hosts/template.luser.nix index 8e3c2568..791dd69a 100644 --- a/hosts/template.luser.nix +++ b/hosts/template.luser.nix @@ -23,7 +23,6 @@ }: let configuration_name = "SYSTEM_NAME"; - system = "x86_64-linux"; stateVersion = "25.05"; primaryUser = "luser"; lib = nixpkgs.lib; @@ -32,7 +31,6 @@ nixosConfigurations = { "${configuration_name}" = ( lib.nixosSystem { - inherit system; modules = [ home-manager.nixosModules.default diff --git a/utilities/nixos-installers/examples/testbed/flake.nix b/utilities/nixos-installers/examples/testbed/flake.nix index 68d818c7..e677c11a 100644 --- a/utilities/nixos-installers/examples/testbed/flake.nix +++ b/utilities/nixos-installers/examples/testbed/flake.nix @@ -16,7 +16,6 @@ }@inputs: let configurationName = "testbed"; - system = "x86_64-linux"; primaryUser = "luser"; configLocation = "/home/${primaryUser}/.config/nixos-config/utilities/nixos-installers/examples/${configurationName}"; # configLocation = "/home/${primaryUser}/.config/nixos-config/hosts/${configurationName}"; @@ -26,7 +25,6 @@ nixosConfigurations = { "${configurationName}" = ( lib.nixosSystem { - inherit system; specialArgs = { inherit inputs; }; diff --git a/utilities/nixos-installers/new-flake.nix b/utilities/nixos-installers/new-flake.nix index 807a3a6b..5717ee92 100644 --- a/utilities/nixos-installers/new-flake.nix +++ b/utilities/nixos-installers/new-flake.nix @@ -15,7 +15,6 @@ }@inputs: let configurationName = "MACHINE_HOST_NAME"; - system = "x86_64-linux"; primaryUser = "luser"; configLocation = "/etc/nixos"; # configLocation = "/home/${primaryUser}/.config/nixos-config/hosts/${configurationName}"; @@ -25,7 +24,6 @@ nixosConfigurations = { "${configurationName}" = ( lib.nixosSystem { - inherit system; specialArgs = { inherit inputs; };