Compare commits

..

4 Commits

5 changed files with 71 additions and 62 deletions

View File

@ -1,5 +1,8 @@
{config, pkgs, materusArg, ...}: {config, pkgs, materusArg, ...}:
{ {
services.jackett.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
#(pkgs.lutris.override { extraLibraries = pkgs: with pkgs; [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; }) #(pkgs.lutris.override { extraLibraries = pkgs: with pkgs; [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; })
materusArg.pkgs.amdgpu-pro-libs.prefixes materusArg.pkgs.amdgpu-pro-libs.prefixes
@ -108,5 +111,6 @@
picard picard
opusTools opusTools
aegisub aegisub
audacity
]; ];
} }

View File

@ -11,7 +11,7 @@
boot.initrd.availableKernelModules = [ "ata_piix" "virtio_pci" "floppy" "sr_mod" "virtio_blk" ]; boot.initrd.availableKernelModules = [ "ata_piix" "virtio_pci" "floppy" "sr_mod" "virtio_blk" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernel.sysctl = { "net.ipv4.ip_forward" = 1; }; boot.kernel.sysctl = { "net.ipv4.ip_forward" = 1; "net.ipv6.conf.all.forwarding" = 1; };
boot.kernelModules = [ ]; boot.kernelModules = [ ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
boot.tmp.useTmpfs = true; boot.tmp.useTmpfs = true;

View File

@ -14,32 +14,37 @@
group = "nextcloud"; group = "nextcloud";
dataDir = config.waffentragerService.elements.jellyfinDir; dataDir = config.waffentragerService.elements.jellyfinDir;
}; };
/*
services.jellyseerr = {
enable = true;
openFirewall = true;
};*/
services.nginx.virtualHosts = { services.nginx.virtualHosts = {
"noot.materus.pl" = { "noot.materus.pl" = {
sslTrustedCertificate = "/var/lib/mnt_acme/materus.pl/chain.pem"; sslTrustedCertificate = "/var/lib/mnt_acme/materus.pl/chain.pem";
sslCertificateKey = "/var/lib/mnt_acme/materus.pl/key.pem"; sslCertificateKey = "/var/lib/mnt_acme/materus.pl/key.pem";
sslCertificate = "/var/lib/mnt_acme/materus.pl/fullchain.pem"; sslCertificate = "/var/lib/mnt_acme/materus.pl/fullchain.pem";
addSSL = true; addSSL = true;
http2 = false; http2 = false;
http3 = true; http3 = true;
locations."/" = { locations."/" = {
proxyPass = "http://127.0.0.1:8096"; proxyPass = "http://127.0.0.1:8096";
extraConfig = '' extraConfig = ''
client_max_body_size 2G; client_max_body_size 2G;
include ${config.services.nginx.package}/conf/fastcgi.conf; include ${config.services.nginx.package}/conf/fastcgi.conf;
include ${config.services.nginx.package}/conf/fastcgi_params; include ${config.services.nginx.package}/conf/fastcgi_params;
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-Ssl on; proxy_set_header X-Forwarded-Ssl on;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
''; '';
};
};
}; };
};
};
}; };
} }

View File

@ -159,11 +159,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1724317100, "lastModified": 1724433242,
"narHash": "sha256-kmbUYx+cye6LHTlclPuPNyeQN7xp/TT7sL0DGmd9QBY=", "narHash": "sha256-/rX20nvm6EKtmsyJS4DoazcYPyRNKJ1oMSS1yhAce/w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "c0edc9c7d97c85344fcecfccd115e8b3c87b5d0b", "rev": "b569d3ae7d60c901a19944b00440c3a11e4da48a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -186,11 +186,11 @@
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1724317100, "lastModified": 1724433242,
"narHash": "sha256-kmbUYx+cye6LHTlclPuPNyeQN7xp/TT7sL0DGmd9QBY=", "narHash": "sha256-/rX20nvm6EKtmsyJS4DoazcYPyRNKJ1oMSS1yhAce/w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "c0edc9c7d97c85344fcecfccd115e8b3c87b5d0b", "rev": "b569d3ae7d60c901a19944b00440c3a11e4da48a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -351,11 +351,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723986931, "lastModified": 1724422166,
"narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", "narHash": "sha256-l9zifWrZe6sRTwl/Padz+a6zwGeE9eaU+0PFWtUQl2w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", "rev": "5dc25356567119127f046b347c3060a8dd607365",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -394,11 +394,11 @@
"nur": "nur" "nur": "nur"
}, },
"locked": { "locked": {
"lastModified": 1719315365, "lastModified": 1724428113,
"narHash": "sha256-HBBc6REnksG456rH2sHS+fBLFUmA6f6DpcfslVSe+E8=", "narHash": "sha256-fd5WQ/zjYpWHf01IN/IaG8qMdWC3ydoGvfSEa3O7/Vs=",
"owner": "materusPL", "owner": "materusPL",
"repo": "Nixerus", "repo": "Nixerus",
"rev": "16e7cbac50691647f80491b16d9f644f323d4a69", "rev": "ab926c541b67726cd94b13118db8a6152ecaa6c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -421,11 +421,11 @@
"nur": "nur_3" "nur": "nur_3"
}, },
"locked": { "locked": {
"lastModified": 1719315365, "lastModified": 1724428113,
"narHash": "sha256-HBBc6REnksG456rH2sHS+fBLFUmA6f6DpcfslVSe+E8=", "narHash": "sha256-fd5WQ/zjYpWHf01IN/IaG8qMdWC3ydoGvfSEa3O7/Vs=",
"owner": "materusPL", "owner": "materusPL",
"repo": "Nixerus", "repo": "Nixerus",
"rev": "16e7cbac50691647f80491b16d9f644f323d4a69", "rev": "ab926c541b67726cd94b13118db8a6152ecaa6c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -485,11 +485,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1724098845, "lastModified": 1724316499,
"narHash": "sha256-D5HwjQw/02fuXbR4LCTo64koglP2j99hkDR79/3yLOE=", "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f1bad50880bae73ff2d82fafc22010b4fc097a9c", "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -517,11 +517,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1724098845, "lastModified": 1724316499,
"narHash": "sha256-D5HwjQw/02fuXbR4LCTo64koglP2j99hkDR79/3yLOE=", "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f1bad50880bae73ff2d82fafc22010b4fc097a9c", "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -549,11 +549,11 @@
}, },
"nixpkgs-stable_5": { "nixpkgs-stable_5": {
"locked": { "locked": {
"lastModified": 1724242322, "lastModified": 1724316499,
"narHash": "sha256-HMpK7hNjhEk4z5SFg5UtxEio9OWFocHdaQzCfW1pE7w=", "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "224042e9a3039291f22f4f2ded12af95a616cca0", "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -581,10 +581,10 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1718621143, "lastModified": 1723578304,
"narHash": "sha256-TeU1Yun2IocjJiOgpanrgfb9CqZz6DuN6SykOZkxf0Q=", "narHash": "sha256-p/G1yrUyJ84lh0JpBHXMwNuHWLKLLKSpdIufPJljvY4=",
"path": "/nix/store/3is5k3r0zhfwh2k1fr7racraff8rrwba-source", "path": "/nix/store/4bwi1xnp0wdss4kncd6sy1bx1d6a8r4w-source",
"rev": "ef9adc6e4f937a4a010867c5625ec14508338083", "rev": "c7ba591cead34c21172cca76f1aabcb130c40508",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -594,11 +594,11 @@
}, },
"nur_2": { "nur_2": {
"locked": { "locked": {
"lastModified": 1724316478, "lastModified": 1724437005,
"narHash": "sha256-/0kjooxcQXl+4qHsI72gqEY2nDRhpgaLlMTynMJdU+w=", "narHash": "sha256-BVB8Cn7FaCn2Kssj5CJe12xKFoOPuZmZRrShOVGMHSc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "56c0db03b58ea9c351f6664a055f751b7300805c", "rev": "d298400a803182527b3cdc7c010b7ecbdaf0dbd6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -610,10 +610,10 @@
}, },
"nur_3": { "nur_3": {
"locked": { "locked": {
"lastModified": 1718621143, "lastModified": 1723578304,
"narHash": "sha256-TeU1Yun2IocjJiOgpanrgfb9CqZz6DuN6SykOZkxf0Q=", "narHash": "sha256-p/G1yrUyJ84lh0JpBHXMwNuHWLKLLKSpdIufPJljvY4=",
"path": "/nix/store/3is5k3r0zhfwh2k1fr7racraff8rrwba-source", "path": "/nix/store/4bwi1xnp0wdss4kncd6sy1bx1d6a8r4w-source",
"rev": "ef9adc6e4f937a4a010867c5625ec14508338083", "rev": "c7ba591cead34c21172cca76f1aabcb130c40508",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -623,11 +623,11 @@
}, },
"nur_4": { "nur_4": {
"locked": { "locked": {
"lastModified": 1724316478, "lastModified": 1724437005,
"narHash": "sha256-/0kjooxcQXl+4qHsI72gqEY2nDRhpgaLlMTynMJdU+w=", "narHash": "sha256-BVB8Cn7FaCn2Kssj5CJe12xKFoOPuZmZRrShOVGMHSc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "56c0db03b58ea9c351f6664a055f751b7300805c", "rev": "d298400a803182527b3cdc7c010b7ecbdaf0dbd6",
"type": "github" "type": "github"
}, },
"original": { "original": {