mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upd

Browse Source
This commit is contained in:
mjallen18
2025-11-16 19:10:06 -06:00
parent 0e93ea159f
commit 2a77d233f9
7 changed files with 83 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
flake.lock generated
View File

@@ -86,11 +86,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1762736304, "lastModified": 1763246168,
"narHash": "sha256-IZh6dOZf22la7rF23WwQ4y7ncrciqKqT0CUJ6abEAIk=", "narHash": "sha256-gUDJZGSOg5syHtQvLImOKL6Eaw4e1ybz4o5pid66kQg=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "45073419e0a46bf106f025858e93b633e255e402", "rev": "6476fbdd52621b4a532309d982d468dc08204151",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -141,11 +141,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1762627886, "lastModified": 1763136804,
"narHash": "sha256-/QLk1bzmbcqJt9sU43+y/3tHtXhAy0l8Ck0MoO2+evQ=", "narHash": "sha256-6p2ljK42s0S8zS0UU59EsEqupz0GVCaBYRylpUadeBM=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "5125a3cd414dc98bbe2c528227aa6b62ee61f733", "rev": "973db96394513fd90270ea5a1211a82a4a0ba47f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -464,11 +464,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762661401, "lastModified": 1762964643,
"narHash": "sha256-SVmijc8t23UMwru5f/9X1Ak5bSwvYkm0OQ5SxR7hOB0=", "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c053d701d64f0727f62e0269c7940da5805bc9bc", "rev": "827f2a23373a774a8805f84ca5344654c31f354b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -484,11 +484,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762721397, "lastModified": 1763313531,
"narHash": "sha256-E428EuouA4nFTNlLuqlL4lVR78X+EbBIqDqsBFnB79w=", "narHash": "sha256-yvdCYUL85zEDp2NzPUBmaNBXP6KnWEOhAk3j7PTfsKw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b8645b18b0f5374127bbade6de7381ef0b3d5720", "rev": "3670a78eee49deebe4825fc8ecc46b172d1a8391",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -500,11 +500,11 @@
"homebrew-cask": { "homebrew-cask": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1762784397, "lastModified": 1763339045,
"narHash": "sha256-fHSmy+8cDDUMW1bQJvBxggtfg9I0uCjsHYT+B6V9vok=", "narHash": "sha256-Q6CB6SjTMGA7iOH7mzk5YcpIZcpHDq1ZeJdoOgSqkJY=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-cask", "repo": "homebrew-cask",
"rev": "ba84375c9230b6228f233b151fb84d69d2a65e5b", "rev": "656ae57ab3c74f5e7728c4922e42c614eea7945e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -516,11 +516,11 @@
"homebrew-core": { "homebrew-core": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1762785418, "lastModified": 1763336962,
"narHash": "sha256-qratquW+HCDdys1NkjYlFY1xd6G8hz64dtD+jxxLm/M=", "narHash": "sha256-x5WfkUr4yNzo/jOWFnGUak2IxJIae+BUeoIyZKOJTmk=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-core", "repo": "homebrew-core",
"rev": "fe380f620295bad7ea81c1c7928e11d1a492e12f", "rev": "328df08166b7e0ce27c74bf757e04c2ebe16ae67",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -553,11 +553,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762452596, "lastModified": 1762951919,
"narHash": "sha256-Iaga+mkwWnWa6FxsAYknpHzeP344VCKGkdudX420LgA=", "narHash": "sha256-ma/xMEGf4J6n/RdZFdxXBJUQhP53HVEPQOC6Dp2TrkQ=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "99919fd35e70c1b18ce948d5329928d751031312", "rev": "3d248f6e8f877218dd2573fef8925ac997889922",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -572,11 +572,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1762452596, "lastModified": 1763223001,
"narHash": "sha256-Iaga+mkwWnWa6FxsAYknpHzeP344VCKGkdudX420LgA=", "narHash": "sha256-Hi6XxTJJjKsDrO+D0fYXS88ehCYzQkZlp9qxX1zoM1s=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "99919fd35e70c1b18ce948d5329928d751031312", "rev": "68a1bcc019378272e601558719f82005a80ddab0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -725,11 +725,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762660502, "lastModified": 1763265660,
"narHash": "sha256-C9F1C31ys0V7mnp4EcDy7L1cLZw/sCTEXqqTtGnvu08=", "narHash": "sha256-Ad9Rd3ZAidrH01xP73S3CjPiyXo7ywZs3uCESjPwUdc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "15c5451c63f4c612874a43846bfe3fa828b03eee", "rev": "469ef53571ea80890c9497952787920c79c1ee6e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -743,11 +743,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1762740031, "lastModified": 1763258556,
"narHash": "sha256-tvUa9nvNerFarHlsw4sipFVWOk9DhHIa+uTW7C0tcxw=", "narHash": "sha256-TWgLZJWn0aBAzu8By3y+OUoFsfOvy1AmIduR5G6QpSE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "d09b10414e1a10f7f9a9c9ec01d689d9d23d3f9c", "rev": "2ad9c9778431846e4d506ced079b638ad4e25806",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -781,11 +781,11 @@
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_9"
}, },
"locked": { "locked": {
"lastModified": 1762706659, "lastModified": 1763329080,
"narHash": "sha256-i7w+rZ6r03BxhxotAuyXBHpngZNEhf+s0CpDRaz/qCo=", "narHash": "sha256-S6eZaiRZPvSWv9d2kZO+HrYTelWqn++vsC/bUwOSQ7I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"rev": "58083d06711fb6c15bee6cc9468ffc341763bfdc", "rev": "bc52b0623f4367447347cbcc88522ec64486d710",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -796,11 +796,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1762463231, "lastModified": 1762847253,
"narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=", "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226", "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -922,11 +922,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1762498405, "lastModified": 1763049705,
"narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=", "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1", "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -954,11 +954,11 @@
}, },
"nixpkgs_11": { "nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1762721782, "lastModified": 1763291491,
"narHash": "sha256-ftv0n3xkKawHQgxZ6FGr2F1GdaYT/79aESm4t1LQ6X4=", "narHash": "sha256-eEYvm+45PPmy+Qe+nZDpn1uhoMUjJwx3PwVVQoO9ksA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e5d07586ec39f74b390308f2e00040c23bdef530", "rev": "c543a59edf25ada193719764f3bc0c6ba835f94d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -986,11 +986,11 @@
}, },
"nixpkgs_13": { "nixpkgs_13": {
"locked": { "locked": {
"lastModified": 1762361079, "lastModified": 1763191728,
"narHash": "sha256-lz718rr1BDpZBYk7+G8cE6wee3PiBUpn8aomG/vLLiY=", "narHash": "sha256-esRhOS0APE6k40Hs/jjReXg+rx+J5LkWw7cuWFKlwYA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ffcdcf99d65c61956d882df249a9be53e5902ea5", "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1002,11 +1002,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1762596750, "lastModified": 1762977756,
"narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1162,11 +1162,11 @@
"nixpkgs": "nixpkgs_12" "nixpkgs": "nixpkgs_12"
}, },
"locked": { "locked": {
"lastModified": 1762441963, "lastModified": 1763319842,
"narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1263,11 +1263,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762655942, "lastModified": 1763087910,
"narHash": "sha256-hOM12KcQNQALrhB9w6KJmV5hPpm3GA763HRe9o7JUiI=", "narHash": "sha256-eB9Z1mWd1U6N61+F8qwDggX0ihM55s4E0CluwNukJRU=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "6ac961b02d4235572692241e333d0470637f5492", "rev": "cf4a68749733d45c0420726596367acd708eb2e8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1345,11 +1345,11 @@
"nixpkgs": "nixpkgs_13" "nixpkgs": "nixpkgs_13"
}, },
"locked": { "locked": {
"lastModified": 1762659808, "lastModified": 1763264763,
"narHash": "sha256-2Kv2mANf+FRisqhpfeZ8j9firBxb23ZvEXwdcunbpGI=", "narHash": "sha256-N0BEoJIlJ+M6sWZJ8nnfAjGY9VLvM6MXMitRenmhBkY=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "524312bc62e3f34bd9231a2f66622663d3355133", "rev": "882e56c8293e44d57d882b800a82f8b2ee7a858f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1433,11 +1433,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762410071, "lastModified": 1762938485,
"narHash": "sha256-aF5fvoZeoXNPxT0bejFUBXeUjXfHLSL7g+mjR/p5TEg=", "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "97a30861b13c3731a84e09405414398fbf3e109f", "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
modules/nixos/programs/default.nix
View File

@@ -57,7 +57,6 @@ in
xorg.libXfixes xorg.libXfixes
at-spi2-atk at-spi2-atk
pciutils pciutils
libcef
libva libva
bash bash
gtk3 gtk3

17
modules/nixos/services/matrix/default.nix
View File

@@ -119,13 +119,6 @@ let
}; };
}; };
bindMounts = {
"/var/lib/matrix-synapse" = {
hostPath = cfg.dataDir;
isReadOnly = false;
};
};
# Create reverse proxy configuration using mkReverseProxy # Create reverse proxy configuration using mkReverseProxy
reverseProxyConfig = lib.${namespace}.mkReverseProxy { reverseProxyConfig = lib.${namespace}.mkReverseProxy {
name = "matrix"; name = "matrix";
@@ -134,16 +127,6 @@ let
middlewares = cfg.reverseProxy.middlewares; middlewares = cfg.reverseProxy.middlewares;
}; };
matrixContainer =
(lib.${namespace}.mkContainer {
name = "matrix-synapse";
localAddress = cfg.localAddress;
ports = [ cfg.port ];
bindMounts = bindMounts;
config = matrixConfig;
})
{ inherit lib; };
fullConfig = { fullConfig = {
${namespace}.services.traefik = lib.mkIf cfg.reverseProxy.enable { ${namespace}.services.traefik = lib.mkIf cfg.reverseProxy.enable {
reverseProxies = [ reverseProxyConfig ]; reverseProxies = [ reverseProxyConfig ];

7
modules/nixos/services/nextcloud/container.nix
View File

@@ -81,7 +81,12 @@ in
${hostAddress} host.containers protonmail-bridge ${hostAddress} host.containers protonmail-bridge
''; '';
services.nginx.virtualHosts."cloud.mjallen.dev".listen = [ { addr = "0.0.0.0"; port = 8080; } ]; services.nginx.virtualHosts."cloud.mjallen.dev".listen = [
{
addr = "0.0.0.0";
port = 8080;
}
];
services = { services = {
nextcloud = { nextcloud = {

17
modules/nixos/services/nextcloud/default.nix
View File

@@ -12,22 +12,21 @@ let
adminpass = config.sops.secrets."jallen-nas/nextcloud/adminpassword".path; adminpass = config.sops.secrets."jallen-nas/nextcloud/adminpassword".path;
secretsFile = config.sops.secrets."jallen-nas/nextcloud/smtp_settings".path; secretsFile = config.sops.secrets."jallen-nas/nextcloud/smtp_settings".path;
jwtSecretFile = config.sops.secrets."jallen-nas/onlyoffice-key".path; jwtSecretFile = config.sops.secrets."jallen-nas/onlyoffice-key".path;
nextcloudUserId = config.users.users.nix-apps.uid;
nextcloudGroupId = config.users.groups.jallen-nas.gid;
hostAddress = "10.0.1.3"; hostAddress = "10.0.1.3";
nextcloudPortExtHttp = 9988; nextcloudPortExtHttp = 9988;
nextcloudPortExtHttps = 9943; nextcloudPortExtHttps = 9943;
onlyofficePortExt = 9943; onlyofficePortExt = 9943;
nextcloudPhotos = pkgs.${namespace}.nextcloud-app-photos;
nextcloudPdfViewer = pkgs.${namespace}.nextcloud-app-pdfviewer;
nextcloudAssist = pkgs.${namespace}.nextcloud-app-assistant;
in in
{ {
imports = [ ./options.nix ]; imports = [ ./options.nix ];
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.nginx.virtualHosts."cloud.mjallen.dev".listen = [ { addr = "0.0.0.0"; port = nextcloudPortExtHttp; } ]; services.nginx.virtualHosts."cloud.mjallen.dev".listen = [
{
addr = "0.0.0.0";
port = nextcloudPortExtHttp;
}
];
# Create required users and groups # Create required users and groups
users.users.nextcloud = { users.users.nextcloud = {
@@ -92,7 +91,7 @@ in
# nextcloudPhotos # nextcloudPhotos
# nextcloudPdfViewer # nextcloudPdfViewer
# nextcloudAssist # nextcloudAssist
# ; # ;
}; };
config = { config = {
@@ -153,4 +152,4 @@ in
}; };
}; };
}; };
} }

18
modules/nixos/services/traefik/default.nix
View File

@@ -353,7 +353,7 @@ in
url = "http://10.0.1.3:3333"; url = "http://10.0.1.3:3333";
} }
]; ];
matrix.loadBalancer.servers = [ matrix.loadBalancer.servers = [
{ {
url = "http://10.1.0.3:8448"; url = "http://10.1.0.3:8448";
@@ -453,16 +453,16 @@ in
]; ];
tls.certResolver = "letsencrypt"; tls.certResolver = "letsencrypt";
}; };
matrix = { matrix = {
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "Host(`matrix.${domain}`)"; rule = "Host(`matrix.${domain}`)";
service = "matrix"; service = "matrix";
middlewares = [ middlewares = [
"crowdsec" "crowdsec"
"whitelist-geoblock" "whitelist-geoblock"
]; ];
tls.certResolver = "letsencrypt"; tls.certResolver = "letsencrypt";
}; };
authentik = { authentik = {

5
overlays/jdk/default.nix
View File

@@ -1,5 +0,0 @@
{ ... }:
final: _prev: {
jdk = final.openjdk17;
openjdk8 = final.openjdk17;
}