diff --git a/hosts/Anton/default.nix b/hosts/Anton/default.nix index d755ee7..c1128c9 100644 --- a/hosts/Anton/default.nix +++ b/hosts/Anton/default.nix @@ -23,7 +23,6 @@ common.syncthing = { enable = true; - basePath = "/mnt/data/services/syncthing/data"; devices = { Lenni = { id = "XS6NR2Q-DHVB5G4-P43CHWR-TVBIY5A-FCIS7CU-S5UVNZA-5YPJYST-2EO2GAG"; }; Puenktchen = { id = "VP3YVIM-JNSZTXV-7AS7FA2-3W5QKH6-XOWXX7N-STUR4JR-PR6SPCV-HJZMAAN"; }; diff --git a/modules/default/common/syncthing.nix b/modules/default/common/syncthing.nix index 3a9df1d..12b5eae 100644 --- a/modules/default/common/syncthing.nix +++ b/modules/default/common/syncthing.nix @@ -15,13 +15,8 @@ in options.id = lib.mkOption { type = lib.types.str; }; }); + }; - - basePath = lib.mkOption { - type = lib.types.str; - default = "/mnt/data"; - }; - }; }; @@ -36,32 +31,32 @@ in folders = lib.mkDefault { "Documents" = { id = "jtl6g-qjmwo"; - path = config.common.syncthing.basePath + "/Documents"; + path = "/mnt/data/Documents"; devices = deviceList; }; "Enpass" = lib.mkDefault { id = "ciksm-xsw4m"; - path = config.common.syncthing.basePath + "/Enpass"; + path = "/mnt/data/Enpass"; devices = deviceList; }; "Pictures" = lib.mkDefault { id = "po4qj-q9t0t"; - path = config.common.syncthing.basePath + "/Pictures"; + path = "/mnt/data/Pictures"; devices = deviceList; }; "Videos" = lib.mkDefault { id = "4wqf5-xasng"; - path = config.common.syncthing.basePath + "/Videos"; + path = "/mnt/data/Videos"; devices = deviceList; }; "Notes" = lib.mkDefault { id = "oc61n-iewgj"; - path = config.common.syncthing.basePath + "/Notes"; + path = "/mnt/data/Notes"; devices = deviceList; }; "Music" = lib.mkDefault { id = "xxh8a-3y2tq"; - path = config.common.syncthing.basePath + "/Music"; + path = "/mnt/data/Music"; devices = deviceList; }; }; diff --git a/modules/default/home-manager/desktop/options.nix b/modules/default/home-manager/desktop/options.nix index 870069d..557e40d 100644 --- a/modules/default/home-manager/desktop/options.nix +++ b/modules/default/home-manager/desktop/options.nix @@ -2,14 +2,8 @@ { options = { desktop = { - kitty.enable = lib.mkOption { - default = config.desktop.enable; - type = lib.types.bool; - }; - vscodium.enable = lib.mkOption { - default = config.desktop.enable; - type = lib.types.bool; - }; + kitty.enable = lib.mkEnableOption { default = config.desktop.enable; }; + vscodium.enable = lib.mkEnableOption { default = config.desktop.enable; }; }; }; }