diff --git a/home/default.nix b/home/default.nix index 2988cf71..b198cb9d 100644 --- a/home/default.nix +++ b/home/default.nix @@ -14,6 +14,7 @@ ./gui-programs ./programs ./scripts.nix + ./services ] ++ lib.optionals device.isLinux [./linux]; # ++ lib.optionals.device.isMac [./macos]; diff --git a/home/programs/default.nix b/home/programs/default.nix index 7aab6a36..a23fbc6d 100644 --- a/home/programs/default.nix +++ b/home/programs/default.nix @@ -34,6 +34,7 @@ ]; home.packages = with pkgs; [ + nb (nixvim.makeNixvim (import ../../neovim)) _1password-cli alejandra diff --git a/home/services/default.nix b/home/services/default.nix new file mode 100644 index 00000000..24b067d0 --- /dev/null +++ b/home/services/default.nix @@ -0,0 +1,5 @@ +{...}: { + imports = [ + ./syncthing.nix + ]; +} diff --git a/home/services/syncthing.nix b/home/services/syncthing.nix new file mode 100644 index 00000000..074765c4 --- /dev/null +++ b/home/services/syncthing.nix @@ -0,0 +1,15 @@ +{ + pkgs, + device, + config, + ... +}: { + services.syncthing = { + enable = true; + openDefaultPorts = true; + # user = "${device.user}"; + # group = "${device.user}"; + # dataDir = "${config.home.homeDirectory}/Sync"; + # configDir = "${config.xdg.configHome}/syncthing"; + }; +} diff --git a/nixos/mirai/services/default.nix b/nixos/mirai/services/default.nix index 56722452..714170fc 100644 --- a/nixos/mirai/services/default.nix +++ b/nixos/mirai/services/default.nix @@ -7,6 +7,7 @@ ./minecraft.nix ./tailscale.nix ./vscode.nix + # ./syncthing.nix # ./seafile.nix # ./nextcloud.nix diff --git a/nixos/mirai/services/jellyfin.nix b/nixos/mirai/services/jellyfin.nix index c38f97d9..5e09ad34 100644 --- a/nixos/mirai/services/jellyfin.nix +++ b/nixos/mirai/services/jellyfin.nix @@ -1,7 +1,7 @@ {...}: { services = { jellyfin = { - enable = true; + enable = false; openFirewall = true; }; caddy = { diff --git a/nixos/mirai/services/syncthing.nix b/nixos/mirai/services/syncthing.nix new file mode 100644 index 00000000..89a230ab --- /dev/null +++ b/nixos/mirai/services/syncthing.nix @@ -0,0 +1,15 @@ +{ + pkgs, + device, + xdg, + ... +}: { + services.syncthing = { + enable = true; + openDefaultPorts = true; + user = "${device.user}"; + group = "${device.user}"; + dataDir = xdg.dataDirs.syncthing; + configDir = xdg.configDirs.syncthing; + }; +}