diff --git a/flake.lock b/flake.lock index e9f8423..ce13c5f 100644 --- a/flake.lock +++ b/flake.lock @@ -24,16 +24,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1756059815, - "narHash": "sha256-UALOxoXoFIHbwKzcqbqCAqw5cC0MJEehLaWSet5vxfE=", + "lastModified": 1758543057, + "narHash": "sha256-lw3V2jOGYphUFHYQ5oARcb6urlbNpUCLJy1qhsGdUmc=", "owner": "Homebrew", "repo": "brew", - "rev": "02947ea4edbdef5fcce9ee57fa289547f4d096c9", + "rev": "5b236456eb93133c2bd0d60ef35ed63f1c0712f6", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "4.6.7", + "ref": "4.6.12", "repo": "brew", "type": "github" } @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1757997814, - "narHash": "sha256-F+1aoG+3NH4jDDEmhnDUReISyq6kQBBuktTUqCUWSiw=", + "lastModified": 1760662441, + "narHash": "sha256-mlDqR1Ntgs9uYYEAUR1IhamKBO0lxoNS4zGLzEZaY0A=", "owner": "nix-community", "repo": "home-manager", - "rev": "5820376beb804de9acf07debaaff1ac84728b708", + "rev": "722792af097dff5790f1a66d271a47759f477755", "type": "github" }, "original": { @@ -126,11 +126,11 @@ ] }, "locked": { - "lastModified": 1757430124, - "narHash": "sha256-MhDltfXesGH8VkGv3hmJ1QEKl1ChTIj9wmGAFfWj/Wk=", + "lastModified": 1760338583, + "narHash": "sha256-IGwy02SH5K2hzIFrKMRsCmyvwOwWxrcquiv4DbKL1S4=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "830b3f0b50045cf0bcfd4dab65fad05bf882e196", + "rev": "9a9ab01072f78823ca627ae5e895e40d493c3ecf", "type": "github" }, "original": { @@ -145,11 +145,11 @@ "brew-src": "brew-src" }, "locked": { - "lastModified": 1756398546, - "narHash": "sha256-n4GVDLhKu65XFraJuCzap2AaZji4xhPaZMTJ8aQdD3s=", + "lastModified": 1758598228, + "narHash": "sha256-qr60maXGbZ4FX5tejPRI3nr0bnRTnZ3AbbbfO6/6jq4=", "owner": "zhaofengli", "repo": "nix-homebrew", - "rev": "3aa475996cb3bc1ecefa88c99c466e6f0bc17431", + "rev": "f36e5db56e117f7df701ab152d0d2036ea85218c", "type": "github" }, "original": { @@ -188,11 +188,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1757935978, - "narHash": "sha256-xeHiYTqlibGf6VQADGrZ2GzayTOJo8G0g8D8f5zCE3Y=", + "lastModified": 1760596604, + "narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0b96957fb614f693d0cee1bd65fbfc0e610df47f", + "rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43", "type": "github" }, "original": { diff --git a/hosts/dnsc-vps-sm/default.nix b/hosts/dnsc-vps-sm/default.nix index ff59149..1ca704d 100644 --- a/hosts/dnsc-vps-sm/default.nix +++ b/hosts/dnsc-vps-sm/default.nix @@ -16,6 +16,7 @@ ../../modules/uptime-kuma ../../modules/homepage ../../modules/docker + ../../modules/actual-server ]; # Secrets @@ -79,6 +80,7 @@ description = "dennis"; initialPassword = "admin"; isNormalUser = true; + linger = true; extraGroups = [ "wheel" "networkmanager" @@ -111,6 +113,7 @@ neovim wget docker-compose + actual-server ]; # Programs @@ -161,6 +164,9 @@ virtualHosts."home.dnsc.io".extraConfig = '' reverse_proxy localhost:9001 ''; + virtualHosts."finance.dnsc.io".extraConfig = '' + reverse_proxy localhost:9002 + ''; }; # Environment variables diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix index 4c26c21..a94574b 100644 --- a/hosts/dnsc-work/default.nix +++ b/hosts/dnsc-work/default.nix @@ -98,7 +98,7 @@ casks = [ "arc" "microsoft-teams" - # "tailscale" + "tailscale" "font-victor-mono" "font-victor-mono-nerd-font" "vlc" diff --git a/modules/actual-server/default.nix b/modules/actual-server/default.nix new file mode 100644 index 0000000..f1d289b --- /dev/null +++ b/modules/actual-server/default.nix @@ -0,0 +1,21 @@ +{ + pkgs, + ... +}: +{ + systemd.services.actual-server = { + enable = true; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + description = "user service for the actual budgeting server instance"; + environment = { + ACTUAL_PORT = "9002"; + }; + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.actual-server}/bin/actual-server"; + Restart = "on-failure"; + RestartSec = 3; + }; + }; +} diff --git a/modules/homepage/default.nix b/modules/homepage/default.nix index ab06e3a..28debae 100644 --- a/modules/homepage/default.nix +++ b/modules/homepage/default.nix @@ -44,6 +44,12 @@ icon = "uptime-kuma.png"; }; } + { + "Actual" = { + href = "https://finance.dnsc.io"; + icon = "actual-budget.png"; + }; + } { "Slides" = { href = "https://slides.dnsc.io";