From 4d6165dd3a15c7d53ffdc28f1a3f225187588009 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Tue, 17 Dec 2024 22:13:15 -0600 Subject: [PATCH] the great syncthing update --- flake.nix | 6 +- pkgs/base-packages.nix | 2 +- systems/dalinar/configuration.nix | 148 +++++++++++++++--------------- 3 files changed, 80 insertions(+), 76 deletions(-) diff --git a/flake.nix b/flake.nix index e3bb751..0f3328c 100644 --- a/flake.nix +++ b/flake.nix @@ -150,17 +150,19 @@ }; dalinar = nixpkgs-stable.lib.nixosSystem { inherit system; + specialArgs = { inherit inputs; }; modules = [ ./systems/dalinar/configuration.nix - nix-bitcoin.nixosModules.default + # nix-bitcoin.nixosModules.default # simple-nixos-mailserver.nixosModules.default ]; }; kohlin = nixpkgs-stable.lib.nixosSystem { inherit system; + specialArgs = { inherit inputs; }; modules = [ ./systems/kohlin/configuration.nix - nix-bitcoin.nixosModules.default + # nix-bitcoin.nixosModules.default ]; }; }; diff --git a/pkgs/base-packages.nix b/pkgs/base-packages.nix index 8faacf3..e7d1553 100644 --- a/pkgs/base-packages.nix +++ b/pkgs/base-packages.nix @@ -23,7 +23,7 @@ guile-json guile-lib scsh - radicle-node + # radicle-node # unrar p7zip zip diff --git a/systems/dalinar/configuration.nix b/systems/dalinar/configuration.nix index c577787..7dc914b 100644 --- a/systems/dalinar/configuration.nix +++ b/systems/dalinar/configuration.nix @@ -75,75 +75,77 @@ guiAddress = "0.0.0.0:8384"; overrideDevices = true; overrideFolders = true; - devices = { - syl = { - id = "FPELBL2-Y6BMDOB-4TXM75K-VZV7IR3-JDMM35Z-TUEZKXX-YAPUTL6-K5SFQAN"; - }; - kaladin = { - id = "LH6523Z-QQ5F3A4-SINZDOI-UFMQBIX-ZV6Q5BQ-LTKVMDB-CRI6QG5-RRKJFQS"; - }; - shadow = { - id = "B24VU6Z-URTMEXN-ZYKRWX7-XWSTHXD-XKX67EB-XSKMT4V-KWKGX7Q-W7DB2QV"; - }; - tablet = { - id = "4HEXCNH-MCVBZQX-LQ735TG-P2VTJ7N-CZ5MK4P-ICZAPC7-YCXVEWV-7NILMA5"; - }; - kohlin = { - id = "BSWKBRR-2IJBCHA-UQY7DE7-CV2U2IL-PMFQFCJ-D5ZZJMU-FPYRUPC-MCC32QQ"; - }; - }; - folders = { - music = { - id = "teqqy-rzvec"; - path = "/storage/syncthing/Music"; - devices = [ "syl" "kaladin" "shadow" "kohlin"]; - versioning = { - type = "trashcan"; - params.cleanoutDays = "100"; + settings = { + devices = { + syl = { + id = "FPELBL2-Y6BMDOB-4TXM75K-VZV7IR3-JDMM35Z-TUEZKXX-YAPUTL6-K5SFQAN"; + }; + kaladin = { + id = "LH6523Z-QQ5F3A4-SINZDOI-UFMQBIX-ZV6Q5BQ-LTKVMDB-CRI6QG5-RRKJFQS"; + }; + shadow = { + id = "B24VU6Z-URTMEXN-ZYKRWX7-XWSTHXD-XKX67EB-XSKMT4V-KWKGX7Q-W7DB2QV"; + }; + tablet = { + id = "4HEXCNH-MCVBZQX-LQ735TG-P2VTJ7N-CZ5MK4P-ICZAPC7-YCXVEWV-7NILMA5"; + }; + kohlin = { + id = "BSWKBRR-2IJBCHA-UQY7DE7-CV2U2IL-PMFQFCJ-D5ZZJMU-FPYRUPC-MCC32QQ"; }; }; - ebooks = { - id = "wziqy-7hyv9"; - path = "/storage/syncthing/ebooks"; - devices = [ "kaladin" "shadow" "tablet" "kohlin"]; - versioning = { - type = "trashcan"; - params.cleanoutDays = "100"; + folders = { + music = { + id = "teqqy-rzvec"; + path = "/storage/syncthing/Music"; + devices = [ "syl" "kaladin" "shadow" "kohlin"]; + versioning = { + type = "trashcan"; + params.cleanoutDays = "100"; + }; }; - }; - docs = { - path = "/storage/syncthing/docs"; - devices = [ "syl" "kaladin" "shadow" "kohlin"]; - versioning = { - type = "trashcan"; - params.cleanoutDays = "100"; + ebooks = { + id = "wziqy-7hyv9"; + path = "/storage/syncthing/ebooks"; + devices = [ "kaladin" "shadow" "tablet" "kohlin"]; + versioning = { + type = "trashcan"; + params.cleanoutDays = "100"; + }; }; - }; - librera = { - id = "vvtvj-osndy"; - path = "/storage/syncthing/librera"; - devices = [ "tablet" "shadow" "kohlin"]; - versioning = { - type = "trashcan"; - params.cleanoutDays = "100"; + docs = { + path = "/storage/syncthing/docs"; + devices = [ "syl" "kaladin" "shadow" "kohlin"]; + versioning = { + type = "trashcan"; + params.cleanoutDays = "100"; + }; + }; + librera = { + id = "vvtvj-osndy"; + path = "/storage/syncthing/librera"; + devices = [ "tablet" "shadow" "kohlin"]; + versioning = { + type = "trashcan"; + params.cleanoutDays = "100"; + }; }; }; }; }; - nix-bitcoin = { - generateSecrets = true; - operator = { - enable = false; - name = "chris"; - }; - }; + # nix-bitcoin = { + # generateSecrets = true; + # operator = { + # enable = false; + # name = "chris"; + # }; + # }; # List services that you want to enable: services.locate = { enable = true; - locate = pkgs.plocate; + package = pkgs.plocate; localuser = null; }; @@ -160,25 +162,25 @@ dataDir = "/storage/monero"; }; - services.bitcoind = { - enable = false; - listen = true; - dataDir = "/storage/bitcoind"; - dbCache = 5000; - }; + # services.bitcoind = { + # enable = false; + # listen = true; + # dataDir = "/storage/bitcoind"; + # dbCache = 5000; + # }; - services.clightning = { - enable = false; - dataDir = "/storage/clightning"; - }; + # services.clightning = { + # enable = false; + # dataDir = "/storage/clightning"; + # }; - services.rtl = { - enable = false; - dataDir = "/storage/rtl"; - nightTheme = true; - extraCurrency = "USD"; - nodes.clightning.enable = true; - }; + # services.rtl = { + # enable = false; + # dataDir = "/storage/rtl"; + # nightTheme = true; + # extraCurrency = "USD"; + # nodes.clightning.enable = true; + # }; #mailserver = { # enable = true; @@ -518,5 +520,5 @@ # The nix-bitcoin release version that your config is compatible with. # When upgrading to a backwards-incompatible release, nix-bitcoin will display an # an error and provide instructions for migrating your config to the new release. - nix-bitcoin.configVersion = "0.0.77"; + # nix-bitcoin.configVersion = "0.0.77"; }