From 9b5dfa16e29d52efe627de82e074591c1285527e Mon Sep 17 00:00:00 2001 From: Leyla Becker Date: Thu, 6 Mar 2025 11:50:18 -0600 Subject: [PATCH] updated flake lock --- .../nixos/defiant/configuration.nix | 7 --- .../nixos/horizon/configuration.nix | 5 -- .../nixos/twilight/configuration.nix | 5 -- flake.lock | 50 +++++++++---------- modules/nixos-modules/sync.nix | 22 -------- nix-config-secrets | 1 + 6 files changed, 26 insertions(+), 64 deletions(-) create mode 160000 nix-config-secrets diff --git a/configurations/nixos/defiant/configuration.nix b/configurations/nixos/defiant/configuration.nix index a524e96..de267d3 100644 --- a/configurations/nixos/defiant/configuration.nix +++ b/configurations/nixos/defiant/configuration.nix @@ -121,13 +121,6 @@ }; sync = { enable = true; - devices = { - ceder.autoAcceptFolders = true; - coven.autoAcceptFolders = true; - twilight.autoAcceptFolders = true; - horizon.autoAcceptFolders = true; - shale.autoAcceptFolders = true; - }; folders = { share = { enable = true; diff --git a/configurations/nixos/horizon/configuration.nix b/configurations/nixos/horizon/configuration.nix index 05c1b50..8a26487 100644 --- a/configurations/nixos/horizon/configuration.nix +++ b/configurations/nixos/horizon/configuration.nix @@ -19,11 +19,6 @@ }; sync = { enable = true; - devices = { - ceder.autoAcceptFolders = true; - coven.autoAcceptFolders = true; - twilight.autoAcceptFolders = true; - }; folders = { share.enable = true; leyla = { diff --git a/configurations/nixos/twilight/configuration.nix b/configurations/nixos/twilight/configuration.nix index 7f5d01b..555eb05 100644 --- a/configurations/nixos/twilight/configuration.nix +++ b/configurations/nixos/twilight/configuration.nix @@ -31,11 +31,6 @@ }; sync = { enable = true; - devices = { - ceder.autoAcceptFolders = true; - coven.autoAcceptFolders = true; - horizon.autoAcceptFolders = true; - }; folders = { share.enable = true; leyla = { diff --git a/flake.lock b/flake.lock index 1b96238..ce9b77d 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1739841949, - "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", + "lastModified": 1740485968, + "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", "owner": "nix-community", "repo": "disko", - "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0", + "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", "type": "github" }, "original": { @@ -29,11 +29,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1740212040, - "narHash": "sha256-Gpvn9Z+ZgKPyb6qaAbahLbo6ZVj7VuLzSCmHZRvsACA=", + "lastModified": 1741233805, + "narHash": "sha256-aNmlbxeKPUfuOynHvIMBPrNgEs1ldHDIz1wbkitKDSs=", "owner": "rycee", "repo": "nur-expressions", - "rev": "9a8a0914000e4453c99a4c12e9862a0a40075851", + "rev": "a1cc22e90f45f6075a991348e896f1595c4efce9", "type": "gitlab" }, "original": { @@ -112,11 +112,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -147,11 +147,11 @@ ] }, "locked": { - "lastModified": 1740347597, - "narHash": "sha256-st5q9egkPGz8TUcVVlIQX7y6G3AzHob+6M963bwVq74=", + "lastModified": 1741217763, + "narHash": "sha256-g/TrltIjFHIjtzKY5CJpoPANfHQWDD43G5U1a/v5oVg=", "owner": "nix-community", "repo": "home-manager", - "rev": "12e26a74e5eb1a31e13daaa08858689e25ebd449", + "rev": "486b066025dccd8af7fbe5dd2cc79e46b88c80da", "type": "github" }, "original": { @@ -203,7 +203,7 @@ "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=", "rev": "a3573779c9ba3d55b90aee6e9b4e70e23d34c1ba", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/a3573779c9ba3d55b90aee6e9b4e70e23d34c1ba.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/a3573779c9ba3d55b90aee6e9b4e70e23d34c1ba.tar.gz?rev=a3573779c9ba3d55b90aee6e9b4e70e23d34c1ba" }, "original": { "type": "tarball", @@ -217,11 +217,11 @@ ] }, "locked": { - "lastModified": 1739933872, - "narHash": "sha256-UhuvTR4OrWR+WBaRCZm4YMkvjJhZ1KZo/jRjE41m+Ek=", + "lastModified": 1741229100, + "narHash": "sha256-0HwrTDXp9buEwal/1ymK9uQmzUD5ozIA7CJGqnT/gLs=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "6ab392f626a19f1122d1955c401286e1b7cf6b53", + "rev": "adf5c88ba1fe21af5c083b4d655004431f20c5ab", "type": "github" }, "original": { @@ -254,11 +254,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1740089251, - "narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=", + "lastModified": 1740646007, + "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30", + "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", "type": "github" }, "original": { @@ -270,11 +270,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740126099, - "narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=", + "lastModified": 1741173522, + "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "32fb99ba93fea2798be0e997ea331dd78167f814", + "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", "type": "github" }, "original": { @@ -323,11 +323,11 @@ ] }, "locked": { - "lastModified": 1739262228, - "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", + "lastModified": 1741043164, + "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", + "rev": "3f2412536eeece783f0d0ad3861417f347219f4d", "type": "github" }, "original": { diff --git a/modules/nixos-modules/sync.nix b/modules/nixos-modules/sync.nix index 50c4ae3..516e141 100644 --- a/modules/nixos-modules/sync.nix +++ b/modules/nixos-modules/sync.nix @@ -8,23 +8,6 @@ in { options.host.sync = { enable = lib.mkEnableOption "should sync thing be enabled on this device"; - devices = { - ceder = { - autoAcceptFolders = lib.mkEnableOption "should sync thing auto accept folders from ceder"; - }; - coven = { - autoAcceptFolders = lib.mkEnableOption "should sync thing auto accept folders from coven"; - }; - twilight = { - autoAcceptFolders = lib.mkEnableOption "should sync thing auto accept folders from twilight"; - }; - horizon = { - autoAcceptFolders = lib.mkEnableOption "should sync thing auto accept folders from horizon"; - }; - shale = { - autoAcceptFolders = lib.mkEnableOption "should sync thing auto accept folders from shale"; - }; - }; folders = { share = { enable = lib.mkEnableOption "should the share folder by synced"; @@ -80,26 +63,21 @@ in { devices = { ceder = { id = "MGXUJBS-7AENXHB-7YQRNWG-QILKEJD-5462U2E-WAQW4R4-I2TVK5H-SMK6LAA"; - autoAcceptFolders = config.host.sync.devices.ceder.autoAcceptFolders; }; coven = { id = "QGU7NN6-OMXTWVA-YCZ73S5-2O7ECTS-MUCTN4M-YH6WLEL-U4U577I-7PBNCA5"; - autoAcceptFolders = config.host.sync.devices.coven.autoAcceptFolders; }; defiant = lib.mkIf (config.networking.hostName != "defiant") { id = "3R6E6Y4-2F7MF2I-IGB4WE6-A3SQSMV-LIBYSAM-2OXHHU2-KJ6CGIV-QNMCPAR"; }; twilight = lib.mkIf (config.networking.hostName != "twilight") { id = "UDIYL7V-OAZ2BI3-EJRAWFB-GZYVDWR-JNUYW3F-FFQ35MU-XBTGWEF-QD6K6QN"; - autoAcceptFolders = config.host.sync.devices.twilight.autoAcceptFolders; }; horizon = lib.mkIf (config.networking.hostName != "horizon") { id = "OGPAEU6-5UR56VL-SP7YC4Y-IMVCRTO-XFD4CYN-Z6T5TZO-PFZNAT6-4MKWPQS"; - autoAcceptFolders = config.host.sync.devices.horizon.autoAcceptFolders; }; shale = { id = "AOAXEVD-QJ2IVRA-6G44Q7Q-TGUPXU2-FWWKOBH-DPKWC5N-LBAEHWJ-7EQF4AM"; - autoAcceptFolders = config.host.sync.devices.shale.autoAcceptFolders; }; }; folders = let diff --git a/nix-config-secrets b/nix-config-secrets new file mode 160000 index 0000000..db6d65e --- /dev/null +++ b/nix-config-secrets @@ -0,0 +1 @@ +Subproject commit db6d65e814bc0c99f6e9b95308184b004038243e