diff --git a/configuration.nix b/configuration.nix index 5f77455..e9c9d44 100644 --- a/configuration.nix +++ b/configuration.nix @@ -19,7 +19,6 @@ environment.systemPackages = with pkgs; [ raspberrypi-tools git - tmux htop vim ]; @@ -69,32 +68,20 @@ # Auto-upgrade the system and reboot if needed system.autoUpgrade = { enable = true; - allowReboot = false; - }; - - # Enable zeroconf - services.avahi = { - enable = true; - nssmdns = true; - publish = { - enable = true; - userServices = true; - }; + allowReboot = true; }; # Run Nix garbage collector daily nix.gc = { automatic = true; dates = "03:15"; + options = "--delete-older-than 14d"; }; # Configure fish shell programs.fish.enable = true; users.users.root.shell = "/run/current-system/sw/bin/fish"; - # Start a tmux session - #programs.tmux.enable = true; - # Import other configuration modules imports = [ ./modules/printing.nix diff --git a/modules/datasync.nix b/modules/datasync.nix index 2ea28d5..696238e 100644 --- a/modules/datasync.nix +++ b/modules/datasync.nix @@ -15,8 +15,8 @@ dataDir = "/vault/syncthing"; declarative = { devices = { - monolith = { id = "QGDGEZQ-INE7XDY-DNX2QI4-QI7ANQJ-57REEO2-FUMH545-FZS5RYU-ULF7HA2"; }; - roamer = { id = "DS3PJH3-J6SNMHM-XUJTDLO-DHGJL5U-J3RUMAG-4OSJWIK-VSJSDVJ-PIHZ2QP"; }; + monolith = { id = "64P2YDH-S5V7PKM-XXBOSXC-WEXUSC7-B553ELI-6IJ3CPJ-ZFB3YA5-MTKAFAH"; }; + roamer = { id = "XE6YPFU-TB7ARWF-7NDSJ35-2PBNNDS-VTXGGCH-KC2UBLE-UHWAXH3-MWD26A5"; }; unit = { id = "VYHHL4A-KJ6WUYQ-4SNWNA3-YRCFTHE-52ZTRLP-4LV6ZDV-4VAJLHC-RJXYYQY"; }; }; folders = { @@ -24,21 +24,18 @@ "Notes" = { devices = [ "monolith" "roamer" "unit" ]; id = "kafhz-bfmzm"; }; "Music" = { devices = [ "monolith" "roamer" "unit" ]; id = "2aqt7-vpprc"; }; "Photos" = { devices = [ "monolith" "roamer" "unit" ]; id = "mjibc-ustcg"; }; - "Security" = { devices = [ "monolith" "roamer" "unit" ]; id = "z4lpn-pmm3v"; }; "Projects" = { devices = [ "monolith" "unit" ]; id = "cjhmu-avy9v"; }; Documents.type = "receiveonly"; Notes.type = "receiveonly"; Music.type = "receiveonly"; Photos.type = "receiveonly"; - Security.type = "receiveonly"; Projects.type = "receiveonly"; Documents.path = "/vault/syncthing/Documents"; Notes.path = "/vault/syncthing/Notes"; Music.path = "/vault/syncthing/Music"; Photos.path = "/vault/syncthing/Photos"; - Security.path = "/vault/syncthing/Security"; Projects.path = "/vault/syncthing/Projects"; }; }; diff --git a/modules/devops.nix b/modules/devops.nix index 5d5478a..7f97c55 100644 --- a/modules/devops.nix +++ b/modules/devops.nix @@ -1,10 +1,6 @@ # Software development configuration { config, pkgs, lib, ... }: { - environment.systemPackages = with pkgs; [ - gitea - ]; - # Gitea setup with daily backup services.gitea = { enable = true; @@ -20,5 +16,4 @@ dump.enable = true; appName = "Gitea"; }; - } diff --git a/modules/networking.nix b/modules/networking.nix index d114dcb..e8846b0 100644 --- a/modules/networking.nix +++ b/modules/networking.nix @@ -6,7 +6,6 @@ { environment.systemPackages = with pkgs; [ - ddclient ]; # Dynamic DNS configuration diff --git a/modules/webstack.nix b/modules/webstack.nix index fa7a3bd..3edbf39 100644 --- a/modules/webstack.nix +++ b/modules/webstack.nix @@ -133,4 +133,8 @@ }; }; + + # Restart nginx after + systemd.services.nginx.after = [ "gitea.service" "syncthing.service" "miniflux.service" ]; + }