Compare commits

..

No commits in common. "9497baa2d193ce7240e1ea61ce3fe46a944f6c52" and "534d3b0032cb9124e3b3af050c0694e9c19e4f51" have entirely different histories.

5 changed files with 29 additions and 76 deletions

View file

@ -37,11 +37,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1736445563, "lastModified": 1736005916,
"narHash": "sha256-+f1MWPtja+LRlTHJP/i/3yxmnzo2LGtZmxtJJTdAp8o=", "narHash": "sha256-a/sqKV5GvqEcQEGfUGQkhWaUnqIRi8oiDAHbBG1oFZg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "authentik-nix", "repo": "authentik-nix",
"rev": "bf5a5bf42189ff5f468f0ff26c9296233a97eb6c", "rev": "5db6f7711a28abd4b6bbe152c8a7de9d00b1e30d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -53,16 +53,16 @@
"authentik-src": { "authentik-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1736440980, "lastModified": 1734959339,
"narHash": "sha256-Z3rFFrXrOKaF9NpY/fInsEbzdOWnWqLfEYl7YX9hFEU=", "narHash": "sha256-CkUmsVKzAQ/VWIhtxWxlcGtrWVa8hxqsMqvfcsG5ktA=",
"owner": "goauthentik", "owner": "goauthentik",
"repo": "authentik", "repo": "authentik",
"rev": "9d81f0598c7735e2b4616ee865ab896056a67408", "rev": "e87a17fd8169d3fa92bcc47eb2743928df83bc95",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "goauthentik", "owner": "goauthentik",
"ref": "version/2024.12.2", "ref": "version/2024.12.1",
"repo": "authentik", "repo": "authentik",
"type": "github" "type": "github"
} }
@ -609,11 +609,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736373539, "lastModified": 1735344290,
"narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -645,11 +645,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1736688610, "lastModified": 1734945620,
"narHash": "sha256-1Zl9xahw399UiZSJ9Vxs1W4WRFjO1SsNdVZQD4nghz0=", "narHash": "sha256-olIfsfJK4/GFmPH8mXMmBDAkzVQ1TWJmeGT3wBGfQPY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "c64bed13b562fc3bb454b48773d4155023ac31b7", "rev": "d000479f4f41390ff7cf9204979660ad5dd16176",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1030,11 +1030,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1737299813, "lastModified": 1736061677,
"narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "107d5ef05c0b1119749e381451389eded30fb0d5", "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1046,11 +1046,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1737062831, "lastModified": 1735834308,
"narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1067,11 +1067,11 @@
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1737464637, "lastModified": 1736136610,
"narHash": "sha256-St/dzvMCXfPPZNJME5bi86n4mEuohG9pMKp+a9l5ZqI=", "narHash": "sha256-pVNRdhEA32ZyiernLrsvpzxxCw2zV7lbw5lzYhHcPU8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "a44b412c5d24f7bb55d81370501a8f9e6e824ec6", "rev": "c03408924cf08dea2eb171942d6b3e463b2741dc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1334,11 +1334,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1737062831, "lastModified": 1735834308,
"narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1350,11 +1350,11 @@
}, },
"vpsadminos": { "vpsadminos": {
"locked": { "locked": {
"lastModified": 1737136524, "lastModified": 1734458258,
"narHash": "sha256-wMy7IbQs87VUxJOqRSbfFIdxRRTUBQh8G1L/zwI36vY=", "narHash": "sha256-xZEbuwAAbxwujrGtuydDNBjzMLnE9YOcuLv3hdudZe4=",
"owner": "vpsfreecz", "owner": "vpsfreecz",
"repo": "vpsadminos", "repo": "vpsadminos",
"rev": "0af10d77ca146293b2ed19d5dcfd98474f1fc285", "rev": "83ddccf4462f155f12596af773e9291d7ebc37a3",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -21,8 +21,7 @@ in {
# this shouldnt be on baseline, as servers have no GUI # this shouldnt be on baseline, as servers have no GUI
enable = true; enable = true;
xdgOpenUsePortal = true; xdgOpenUsePortal = true;
extraPortals = with pkgs; [xdg-desktop-portal-gtk]; #wtf is this configPackages = with pkgs; [xdg-desktop-portal-gtk];
configPackages = with pkgs; [xdg-desktop-portal-gtk]; #wtf is this
}; };
}; };

View file

@ -21,6 +21,5 @@ with lib; {
./trilium.nix ./trilium.nix
# ./firefly.nix gnucash is better # ./firefly.nix gnucash is better
./roundcube.nix ./roundcube.nix
./syncthing.nix
]; ];
} }

View file

@ -1,44 +0,0 @@
{
lib,
pkgs,
...
}:
with lib; {
users.groups.syncthingnginx.members = ["acme" "syncthing" "nginx"];
security.acme.certs."cloud.posixlycorrect.com".group = "syncthingnginx";
networking.firewall.allowedTCPPorts = [22000];
networking.firewall.allowedUDPPorts = [22000 21027];
services = {
nginx = {
virtualHosts."cloud.posixlycorrect.com" = {
enableACME = true;
forceSSL = true;
extraConfig = ''
proxy_headers_hash_max_size 512;
proxy_headers_hash_bucket_size 128;
'';
locations."/" = {
proxyPass = "http://127.0.0.1:8384";
};
};
};
syncthing = {
enable = true;
systemService = true;
overrideFolders = false;
overrideDevices = false;
openDefaultPorts = false;
key = "/var/lib/acme/cloud.posixlycorrect.com/key.pem";
cert = "/var/lib/acme/cloud.posixlycorrect.com/cert.pem";
guiAddress = "127.0.0.1:8384";
settings = {
options = {
urAccepted = -1;
};
};
};
};
}

View file

@ -18,7 +18,6 @@ with lib; {
trilium-server = { trilium-server = {
enable = true; enable = true;
package = pkgs.trilium-next-server;
host = "127.0.0.1"; host = "127.0.0.1";
port = 8458; port = 8458;
noAuthentication = false; noAuthentication = false;