diff --git a/common/nixos/restic.nix b/common/nixos/restic.nix index 55ba2ce..808cb65 100644 --- a/common/nixos/restic.nix +++ b/common/nixos/restic.nix @@ -13,7 +13,7 @@ repository = "/backups"; initialize = true; passwordFile = "${config.sops.secrets.restic_key.path}"; - paths = ["/home/${user}/Projects" "/home/${user}/Documents" "/home/${user}/.local/share/password-store" "/home/${user}/.local/share/buku"]; + paths = ["/home/${user}/repos" "/home/${user}/Documents" "/home/${user}/.local/share/password-store" "/home/${user}/.local/share/buku"]; timerConfig = { onCalendar = "saturday 23:00"; }; diff --git a/home-manager/modules/linux-gui.nix b/home-manager/modules/linux-gui.nix index cd0e775..1ab6eeb 100644 --- a/home-manager/modules/linux-gui.nix +++ b/home-manager/modules/linux-gui.nix @@ -20,5 +20,6 @@ sublime-music # A modern and feature-rich music player with a clean user interface and advanced playback options. thunderbird # Mozilla Thunderbird, a powerful and customizable email client with integrated calendaring and chat features. wireshark # Open-source network protocol analyzer for real-time packet inspection and analysis. + nicotine-plus ]; } diff --git a/home-manager/modules/ssh.nix b/home-manager/modules/ssh.nix index 96e76cb..8a9fb0e 100644 --- a/home-manager/modules/ssh.nix +++ b/home-manager/modules/ssh.nix @@ -6,6 +6,7 @@ matchBlocks = { "router" = { hostname = "router.local.gwg313.xyz"; + user = "glen"; identityFile = "/home/gwg313/.ssh/home/id_ed25519"; }; "github.com" = { diff --git a/hosts/candlekeep/syncthing.nix b/hosts/candlekeep/syncthing.nix index fcd798e..831e44b 100644 --- a/hosts/candlekeep/syncthing.nix +++ b/hosts/candlekeep/syncthing.nix @@ -17,7 +17,7 @@ settings = { devices = { - "grymforge" = {id = "REALLY-LONG-LAPTOP-SYNCTHING-KEY-HERE";}; + "grymforge" = {id = "N2TYFZ4-ODIIHIZ-UP27V4V-NYMAZNI-SIATS5S-5NTM6JX-A67HCZ5-ZB4TVQJ";}; }; folders = { @@ -43,6 +43,17 @@ }; }; }; + "obsidian" = { + path = "/home/gwg313/vault"; + devices = ["grymforge"]; + versioning = { + type = "staggered"; + params = { + cleanInterval = "3600"; + maxAge = "15768000"; + }; + }; + }; }; }; }; diff --git a/hosts/grymforge/configuration.nix b/hosts/grymforge/configuration.nix index 29c16d3..474aa2b 100644 --- a/hosts/grymforge/configuration.nix +++ b/hosts/grymforge/configuration.nix @@ -28,6 +28,7 @@ ../../common/virtualization/libvirt.nix ../../common/nixos/sysctl/default.nix + ./syncthing.nix ./auditd.nix ./kernel.nix ./sysctl.nix diff --git a/hosts/grymforge/syncthing.nix b/hosts/grymforge/syncthing.nix new file mode 100644 index 0000000..77e72ff --- /dev/null +++ b/hosts/grymforge/syncthing.nix @@ -0,0 +1,60 @@ +{ + config, + user, + ... +}: { + services.syncthing = { + enable = true; + dataDir = "/home/gwg313"; + openDefaultPorts = true; + configDir = "/home/gwg313/.config/syncthing"; + user = "gwg313"; + group = "users"; + guiAddress = "127.0.0.1:8384"; + + overrideDevices = true; + overrideFolders = true; + + settings = { + devices = { + "candlekeep" = {id = "762A3TK-Z3ZX6DG-V4VASMJ-H6DJHE5-PBD6YZQ-MPILUWT-E7EY4O7-4EAPHAX";}; + }; + + folders = { + "repos" = { + path = "/home/gwg313/repos"; + devices = ["candlekeep"]; + versioning = { + type = "staggered"; + params = { + cleanInterval = "3600"; + maxAge = "15768000"; + }; + }; + }; + "documents" = { + path = "/home/gwg313/Documents"; + devices = ["candlekeep"]; + versioning = { + type = "staggered"; + params = { + cleanInterval = "3600"; + maxAge = "15768000"; + }; + }; + }; + "obsidian" = { + path = "/home/gwg313/vault"; + devices = ["candlekeep"]; + versioning = { + type = "staggered"; + params = { + cleanInterval = "3600"; + maxAge = "15768000"; + }; + }; + }; + }; + }; + }; +}