materus
/
nixos-config
mirror of https://github.com/materusPL/nixos-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: materus:1381df62978e52e52fa2e5df9011a0e57ecd971b
Branches Tags
materus:master
materus:experimental
materus:inputs
...
compare: materus:e7bff66b1e927867058b8f853c114d165e695fda
Branches Tags
materus:experimental
materus:master
materus:inputs

3 Commits
1381df6297 ... e7bff66b1e

Author SHA1 Message Date
Mateusz Słodkowicz e7bff66b1e
waffentrager: changes to services 2024-08-23 18:48:38 +02:00
Mateusz Słodkowicz 04808eb9da
flake: update lock 2024-08-23 18:47:57 +02:00
Mateusz Słodkowicz b5fa9e6f4c
scripts: convert: another change quality 2024-08-23 18:47:47 +02:00
8 changed files with 45 additions and 45 deletions
Show Stats Expand all files Collapse all files

BIN
configurations/host/valkyrie/secrets/private/default.nix
View File

Binary file not shown.

1
configurations/host/waffentrager/services/auth/lldap.nix
View File

@ -32,7 +32,6 @@
}; };
systemd.services.lldap = { systemd.services.lldap = {
partOf = [ "elements-mount.service" ];
requires = [ "elements-mount.service" ]; requires = [ "elements-mount.service" ];
after = [ "elements-mount.service" ]; after = [ "elements-mount.service" ];
serviceConfig = { serviceConfig = {

7
configurations/host/waffentrager/services/nextcloud.nix
View File

@ -41,6 +41,7 @@
inherit notify_push previewgenerator; inherit notify_push previewgenerator;
}; };
settings = { settings = {
log_type = "file";
"profile.enabled" = true; "profile.enabled" = true;
default_phone_region = "PL"; default_phone_region = "PL";
trusted_proxies = [ materusArg.ips.valkyrie materusArg.ips.wireguard.valkyrie materusArg.ips.wireguard.waffentrager ]; trusted_proxies = [ materusArg.ips.valkyrie materusArg.ips.wireguard.valkyrie materusArg.ips.wireguard.waffentrager ];
@ -81,7 +82,7 @@
"opcache.fast_shutdown" = "1"; "opcache.fast_shutdown" = "1";
"opcache.save_comments" = "1"; "opcache.save_comments" = "1";
}; };
phpExtraExtensions = ex: [ ex.zip ex.zlib ex.tidy ex.smbclient ]; phpExtraExtensions = ex: [ ex.zip ex.zlib ex.tidy ex.smbclient ex.sodium ];
}; };
services.nginx.virtualHosts.${config.services.nextcloud.hostName} = { services.nginx.virtualHosts.${config.services.nextcloud.hostName} = {
forceSSL = true; forceSSL = true;
@ -91,6 +92,10 @@
sslCertificate = "/var/lib/mnt_acme/materus.pl/fullchain.pem"; sslCertificate = "/var/lib/mnt_acme/materus.pl/fullchain.pem";
extraConfig = '' extraConfig = ''
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
dav_methods PUT DELETE MKCOL COPY MOVE;
dav_ext_methods PROPFIND OPTIONS;
create_full_put_path on;
dav_access user:rw group:rw all:r;
''; '';
}; };
}; };

1
configurations/host/waffentrager/services/postgresql.nix
View File

@ -20,7 +20,6 @@
host all all ::1/128 scram-sha-256 host all all ::1/128 scram-sha-256
''; '';
systemd.services.postgresql = { systemd.services.postgresql = {
partOf = [ "elements-mount.service" ];
requires = [ "elements-mount.service" ]; requires = [ "elements-mount.service" ];
after = [ "elements-mount.service" ]; after = [ "elements-mount.service" ];
}; };

2
configurations/host/waffentrager/services/samba.nix
View File

@ -10,12 +10,10 @@
waffentragerService.elements.enable = true; waffentragerService.elements.enable = true;
systemd.services.samba-nmbd = { systemd.services.samba-nmbd = {
partOf = [ "elements-mount.service" ];
requires = [ "elements-mount.service" ]; requires = [ "elements-mount.service" ];
after = [ "elements-mount.service" ]; after = [ "elements-mount.service" ];
}; };
systemd.services.samba-wsdd = { systemd.services.samba-wsdd = {
partOf = [ "elements-mount.service" ];
requires = [ "elements-mount.service" ]; requires = [ "elements-mount.service" ];
after = [ "elements-mount.service" ]; after = [ "elements-mount.service" ];
}; };

1
configurations/host/waffentrager/services/syncthing.nix
View File

@ -10,7 +10,6 @@
waffentragerService.elements.enable = true; networking.firewall.allowedTCPPorts = [ 22000 config.services.syncthing.relay.statusPort config.services.syncthing.relay.port]; waffentragerService.elements.enable = true; networking.firewall.allowedTCPPorts = [ 22000 config.services.syncthing.relay.statusPort config.services.syncthing.relay.port];
networking.firewall.allowedUDPPorts = [ 22000 21027 ]; networking.firewall.allowedUDPPorts = [ 22000 21027 ];
systemd.services.syncthing = { systemd.services.syncthing = {
partOf = [ "elements-mount.service" ];
requires = [ "elements-mount.service" ]; requires = [ "elements-mount.service" ];
after = [ "elements-mount.service" ]; after = [ "elements-mount.service" ];
}; };

4
extraFiles/scripts/convert_images.sh
View File

@ -3,7 +3,7 @@ IFS=$'\n'
CONVERT="$(nix eval nixpkgs\#imagemagick.outPath | tr -d '"')/bin/convert" CONVERT="$(nix eval nixpkgs\#imagemagick.outPath | tr -d '"')/bin/convert"
convert_cmd () { convert_cmd () {
if ! command -v convert &> /dev/null; then $CONVERT "$@"; else convert "$@"; fi if ! command -v magick &> /dev/null; then $CONVERT "$@"; else convert "$@"; fi
} }
@ -19,7 +19,7 @@ change_to_webp() {
file="${f%.*}" file="${f%.*}"
file_webp="${file}.webp" file_webp="${file}.webp"
echo "Trying to convert to $file_webp" echo "Trying to convert to $file_webp"
if convert_cmd "$f" "$file_webp"; then if convert_cmd "$f" -define webp:thread-level=1 -define webp:method=6 -quality 99 "$file_webp"; then
if touch -r "$f" "$file_webp"; then if touch -r "$f" "$file_webp"; then
rm "$f" rm "$f"
echo "Finished converting $f" echo "Finished converting $f"

74
flake.lock
View File

@ -159,11 +159,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1723569059, "lastModified": 1724317100,
"narHash": "sha256-1oVparM3qQRKoDrACqwer65c1cYV3hjc0+dZQ9MjFlk=", "narHash": "sha256-kmbUYx+cye6LHTlclPuPNyeQN7xp/TT7sL0DGmd9QBY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "381e4aa28c0ecf265ed207ea14b0d10275eb651f", "rev": "c0edc9c7d97c85344fcecfccd115e8b3c87b5d0b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -186,11 +186,11 @@
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1723569059, "lastModified": 1724317100,
"narHash": "sha256-1oVparM3qQRKoDrACqwer65c1cYV3hjc0+dZQ9MjFlk=", "narHash": "sha256-kmbUYx+cye6LHTlclPuPNyeQN7xp/TT7sL0DGmd9QBY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "381e4aa28c0ecf265ed207ea14b0d10275eb651f", "rev": "c0edc9c7d97c85344fcecfccd115e8b3c87b5d0b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -351,11 +351,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723399884, "lastModified": 1723986931,
"narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "086f619dd991a4d355c07837448244029fc2d9ab", "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -437,11 +437,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1723310128, "lastModified": 1724067415,
"narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", "narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", "rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -453,11 +453,11 @@
}, },
"nixos-hardware_2": { "nixos-hardware_2": {
"locked": { "locked": {
"lastModified": 1723310128, "lastModified": 1724067415,
"narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", "narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", "rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -485,11 +485,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1723400035, "lastModified": 1724098845,
"narHash": "sha256-WoKZDlBEdMhP+hjquBAh0BhUJbcH2+U8g2mHOr1mv8I=", "narHash": "sha256-D5HwjQw/02fuXbR4LCTo64koglP2j99hkDR79/3yLOE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a731b45590a5169542990c36ffcde6cebd9a3356", "rev": "f1bad50880bae73ff2d82fafc22010b4fc097a9c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -517,11 +517,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1723400035, "lastModified": 1724098845,
"narHash": "sha256-WoKZDlBEdMhP+hjquBAh0BhUJbcH2+U8g2mHOr1mv8I=", "narHash": "sha256-D5HwjQw/02fuXbR4LCTo64koglP2j99hkDR79/3yLOE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a731b45590a5169542990c36ffcde6cebd9a3356", "rev": "f1bad50880bae73ff2d82fafc22010b4fc097a9c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -549,11 +549,11 @@
}, },
"nixpkgs-stable_5": { "nixpkgs-stable_5": {
"locked": { "locked": {
"lastModified": 1723400035, "lastModified": 1724242322,
"narHash": "sha256-WoKZDlBEdMhP+hjquBAh0BhUJbcH2+U8g2mHOr1mv8I=", "narHash": "sha256-HMpK7hNjhEk4z5SFg5UtxEio9OWFocHdaQzCfW1pE7w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a731b45590a5169542990c36ffcde6cebd9a3356", "rev": "224042e9a3039291f22f4f2ded12af95a616cca0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -565,11 +565,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1723362943, "lastModified": 1724224976,
"narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=", "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a58bc8ad779655e790115244571758e8de055e3d", "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -594,11 +594,11 @@
}, },
"nur_2": { "nur_2": {
"locked": { "locked": {
"lastModified": 1723578304, "lastModified": 1724316478,
"narHash": "sha256-p/G1yrUyJ84lh0JpBHXMwNuHWLKLLKSpdIufPJljvY4=", "narHash": "sha256-/0kjooxcQXl+4qHsI72gqEY2nDRhpgaLlMTynMJdU+w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "c7ba591cead34c21172cca76f1aabcb130c40508", "rev": "56c0db03b58ea9c351f6664a055f751b7300805c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -623,11 +623,11 @@
}, },
"nur_4": { "nur_4": {
"locked": { "locked": {
"lastModified": 1723578304, "lastModified": 1724316478,
"narHash": "sha256-p/G1yrUyJ84lh0JpBHXMwNuHWLKLLKSpdIufPJljvY4=", "narHash": "sha256-/0kjooxcQXl+4qHsI72gqEY2nDRhpgaLlMTynMJdU+w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "c7ba591cead34c21172cca76f1aabcb130c40508", "rev": "56c0db03b58ea9c351f6664a055f751b7300805c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -639,10 +639,10 @@
}, },
"nur_5": { "nur_5": {
"locked": { "locked": {
"lastModified": 1722429951, "lastModified": 1723578304,
"narHash": "sha256-BIzCDu3wMU3TGoCHkqd4+M4Zu7lbyJU6UtLWIngL0Wc=", "narHash": "sha256-p/G1yrUyJ84lh0JpBHXMwNuHWLKLLKSpdIufPJljvY4=",
"path": "/nix/store/zzydhzclnvwgsyz5g4fgsb2l2m0r9sn6-source", "path": "/nix/store/4bwi1xnp0wdss4kncd6sy1bx1d6a8r4w-source",
"rev": "a7f5d16dc0839bc3907a53c94ac69ce8da9dd070", "rev": "c7ba591cead34c21172cca76f1aabcb130c40508",
"type": "path" "type": "path"
}, },
"original": { "original": {