From a3d6fbeb40044ecf120538d8eddb17e9739fe8dc Mon Sep 17 00:00:00 2001 From: materus Date: Sun, 27 Jul 2025 00:57:10 +0200 Subject: [PATCH] flake: update lock; Network updates --- configurations/host/Old-materusPC/network.nix | 2 +- configurations/host/materusPC/network.nix | 2 +- .../host/valkyrie/secrets/private/default.nix | Bin 15555 -> 16085 bytes .../waffentrager/secrets/private/default.nix | Bin 773 -> 893 bytes .../host/waffentrager/services/auth/lldap.nix | 2 +- .../services/multimedia/scrobbling.nix | 2 +- .../profile/common/private/default.nix | Bin 955 -> 1007 bytes flake.lock | 104 +++++++++--------- 8 files changed, 56 insertions(+), 56 deletions(-) diff --git a/configurations/host/Old-materusPC/network.nix b/configurations/host/Old-materusPC/network.nix index 2b71748..bf5d7f8 100644 --- a/configurations/host/Old-materusPC/network.nix +++ b/configurations/host/Old-materusPC/network.nix @@ -38,7 +38,7 @@ }; "wireguard-peer.${materusArg.wireguard.pubKeys.valkyrie}" = { endpoint = "${materusArg.ips.valkyrie}:${materusArg.wireguard.port}"; - allowed-ips = "${materusArg.ip-masks.wireguard.general};"; + allowed-ips = "${materusArg.ip-masks.wireguard.main};${materusArg.ip-masks.wireguard.guest};${materusArg.ip-masks.wireguard.asia};${materusArg.ips.wireguard.valkyrie}/32;"; persistent-keepalive = "20"; }; ipv4 = { diff --git a/configurations/host/materusPC/network.nix b/configurations/host/materusPC/network.nix index 274d33c..ed350f5 100644 --- a/configurations/host/materusPC/network.nix +++ b/configurations/host/materusPC/network.nix @@ -56,7 +56,7 @@ }; "wireguard-peer.${materusArg.wireguard.pubKeys.valkyrie}" = { endpoint = "${materusArg.ips.valkyrie}:${materusArg.wireguard.port}"; - allowed-ips = "${materusArg.ip-masks.wireguard.general};"; + allowed-ips = "${materusArg.ip-masks.wireguard.main};${materusArg.ip-masks.wireguard.guest};${materusArg.ip-masks.wireguard.asia};${materusArg.ips.wireguard.valkyrie}/32;"; persistent-keepalive = "20"; }; ipv4 = { diff --git a/configurations/host/valkyrie/secrets/private/default.nix b/configurations/host/valkyrie/secrets/private/default.nix index 91e0ad9d1eb7c7642d649a30366e0ded0c30558b..371c62feb9aa291561612ad64c962253ccbe393b 100644 GIT binary patch literal 16085 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 F$pCZZ3mE_a literal 15555 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 QzRO7OzFlu|=-?$m07>A{?*IS* literal 773 zcmZQ@_Y83kiVO&0@b>d>sr&Kc=hDZArEX&ZcORLdvl%7iDc_Pbe;nXH-~Jzm_X>Clk|S*1{7VuSFyGzu0@}F6Yh# z{6+KGegAzA+fmWvia(i56>>RRJjN| zy~=Qofo-kgG>;S41^Yuki)X!hy=RGL@qx^pQ#3`N2G0$w3ph00?fHTA0nziqeFC#> z9nwT(Lavz33GnA+*ehq&vBch$rCRasPvv*}9vfY`#=hvnksGg_OD8&)w{Ly)OPueq zjh(sG#p(zvjU~(Gz0WAxU@YKdaevF-h*hcm*FyI;`*K{^l5qFM)9yNMu&&21bzIL{l;+40>h;nc)n>Gp}1 zZw{aT8mP!6wbYO7aXI#TUuxg9oriAjU`ug26S!`itk|Tle+=|~sRc{0n(vVEUOCs`QvBZNR_1@xKKXw4UN7mhuPSp- z+tFR!td9iG=WP1^Kjrn+sgu`7y6Ns%H*u-%Lr=dKbvLUNvU^|kyxw)|`jiK51%Lmh zZCZB1cR?%f3}L0f2luUGJGA8veZ2JkWWP?}%bU0I7o@+}7kOpJTAc95tEKU6|6veqspPr*m%4}PM#DX`bas|%uKUcXXS>Jo0;{aa^fiwGY~F$C diff --git a/configurations/host/waffentrager/services/auth/lldap.nix b/configurations/host/waffentrager/services/auth/lldap.nix index 65c2f4f..102903d 100644 --- a/configurations/host/waffentrager/services/auth/lldap.nix +++ b/configurations/host/waffentrager/services/auth/lldap.nix @@ -24,7 +24,7 @@ proxy_set_header X-Forwarded-Proto $scheme; - allow ${materusArg.ip-masks.wireguard.private}; + allow ${materusArg.ip-masks.wireguard.main}; allow 192.168.100.0/24; deny all; ''; diff --git a/configurations/host/waffentrager/services/multimedia/scrobbling.nix b/configurations/host/waffentrager/services/multimedia/scrobbling.nix index a6e3d0d..4ee9e33 100644 --- a/configurations/host/waffentrager/services/multimedia/scrobbling.nix +++ b/configurations/host/waffentrager/services/multimedia/scrobbling.nix @@ -196,7 +196,7 @@ metadata_providers = ["spotify","deezer","lastfm","audiodb","musicbrainz"] locations."/" = { proxyPass = "http://127.0.0.1:42011"; extraConfig = '' - allow ${materusArg.ip-masks.wireguard.private}; + allow ${materusArg.ip-masks.wireguard.main}; allow 192.168.100.0/24; deny all; proxy_http_version 1.1; diff --git a/configurations/profile/common/private/default.nix b/configurations/profile/common/private/default.nix index 1e6205ff342f3fc4a64730d6b03a610946127f25..5a71f7737f00a745257c5dd1065ec45d87cd4286 100644 GIT binary patch literal 1007 zcmZQ@_Y83kiVO&0NO&rAJ3;B#mF?kqSDlXZRLSgI!XkKR!mgL9hAaj~Q)7xJeB7q( z(4*El<7H7%NZyVY-p6LYu*+bb!oPw`R`_Q1($cE1N|kKm{;vm@e3kgT^6G-WK}(d5 zK7YmVW>)J8@f)I@4d>LP*x3AbPFXJ%E7Z4kJG0O3pX>f}+^t*Ww@LT4{qgDiraL~F zDqeY(K2KMSV`Uoa&iLhf9Ge$TOct>=o*eG3e)Ns4Z2LLu@?{q{-d-EH<F&*& z<~{M>v@7?bqgu$@2LaRL+G3tM`@h=fx5vt^`zrhEQz4uG3R?Ym=6jK0U;I+WEq3y9 zT@vyRx2!MptSm3SZ1jNr@8Tt^1;3OZ`!Hi^p{lRl`Mtl@c7+kneDwy;(AUo=C#@9EeUhS!yHTfUw>*II(?(Ou=U*?|M-`-H<%fDx) znYU}lcCL^qN`Xhu1uar7Iu?EGYNE#3M_V>uDxKLFaU>&g`rGw3!GaT%w>dxK=T^NC ze)7Iu+i{&xbC(!yE2DD{1fq`g9y;o-t*}DR%jn|v$izprRc~Iz7G`zaoOn`F$Z5gF z@2)PD5{rZDC(i4P+uFet+U-&s8r~X`Sk~rpi{Vl)Ws?VI+Nllt_eFHwq_m+ zN974A7m{{e>)CLufhRcsk7km0nyLwF6Wfd4kM8?c?g%%%kPe6*+4AyX~SXxm!cmTya13UTL1S z@psvm)|m<7+h20L)ADP0%KW&jBU<{X^3UmQ&r8Krf*-$~7=QCjfH;q9h=0$KKqJ*! zXRrBA**Eui*}ayXI>k)j@PP}3TRD}os=KDE0Jr zb$9QfcOP4v%9c)Y*}R1%SHkg0{wgV7smBkLZ+9_YYF#Yr>GxZ6$EBMm*QsSqdb%W~ zE1QvF@qreXj_gfm$L427sr#R8a*h4{O8IyBglf}& zGi)|=M_xz?o%?f7(X|~J+Qx2=T19(TF-(x$ahp@cL{ClD#DDsYig`=I|NM@b@ngQ8 z_5B0e-#BtLoqL)0C+b+l%gT#FCtB0bORe!0bF`J>N;orpMgIhUyAPtz!XN)y^3C_t z*Qa8yVs_6B7ZmcpwJMwK-u3ybG(DFZw*|gDb>KR)Sfg}=h+d$}>3Q+hp+`=fc;?{a c7V~sb3Sn`y}R^)|MZW2u~%m9SUmT!J@+M(SD)Sa z+5dEV*|a@8>{Z;dk)!^K+PUHjCraWke!HFc(&7F$?tIx}UpX2!o4#wiefG{ozQnih z+k#%*anO&{OYIN#W%%|r^6;%Msa%)-mKBETOw^rwxoyVcrJAoj*3Jpvb%php-%(p> zW>>lM^6`(1<}A{^&s2HE`A53%qV3BXYeYh4&MRmyzbyKwnA@tPJ^!Im!vfR%7Zu(| zt`}q^em1?`%VF7P*XG{nHH|^%i-q9AAX$e$l|^o?T=RoYX)$(Gggx6+v%aq-vUTVE z{M9p7%xM#t#q`8~V@F?Qgv!w)7sMY=Nc(qrcYE`*r3@VxC+`0FcTwn!=%}eex0a;- z-|{wO-}3dd8KhKP$k9l7bceY+HyPelnX|iaVp8qn_!#5HiZr9(l_WrG3 z_VIrs)2BE6J*g+keDH><5>teuSW*u6ZXx$oFP0RVPb&91zjTipON{J#Zx_`!*4;OB zcopMvz6O>{Ial)JneWXx<9=AB+%EEctH7UUR}_3VD8;(vmASr5>X~T$G}UsKcv@A= z7ydt4Qtv-+TF&`dy3Jj&FX%!bpRBY<RWA|v;itmd5A_8^#&Rv{wM?F(%XIN3EkmZC< zle`u7Y#TOc`o;b>_6KR)jf5(a*`_JII(+M} zYrjvy|;ba6uj&8^2sXORC&BN2rtN6^ZjeG@Zp&YzD~|uxX0(o z&zmK8_2w?IGuDjF5eo0=d6W>sGh_PA`lA&RjbRcc!c6bXy>j<4PF}Tp?8{XcaQF7N8$GLaSH52B%JSfF zn&O`m7vHZbc6wH}PxMB-x^R)a(1~qI)&DcH7B)Xq2wXq$6pK~Hml&Vt|9MJ|9&LV? zP_JB3^Z4Ak1J<8A*=^ZBu)l46J6U3-$@;2b;X6ORtX|L7C|v#U{me7V-ikBqm6)t> bws6+!()t;3wbxg_m^gp;x|@CNwQ6ku@u%f~ diff --git a/flake.lock b/flake.lock index ed9c7c1..4aef523 100644 --- a/flake.lock +++ b/flake.lock @@ -159,11 +159,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1753002546, - "narHash": "sha256-eVDmnGUaE8b3dCQc1VwOi3acpkkZ8qDKxcOlUNYMM4A=", + "lastModified": 1753549647, + "narHash": "sha256-xGJsvyqRiALpue6g4ZfFANS9CXLGsBdrHmu716UZ5c4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "58dae564cab8143a83cc38672dcf71a1c301443b", + "rev": "983dc5dacc3654f92e9c914c10d678ff32f5ca13", "type": "github" }, "original": { @@ -182,11 +182,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1753002546, - "narHash": "sha256-eVDmnGUaE8b3dCQc1VwOi3acpkkZ8qDKxcOlUNYMM4A=", + "lastModified": 1753549647, + "narHash": "sha256-xGJsvyqRiALpue6g4ZfFANS9CXLGsBdrHmu716UZ5c4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "58dae564cab8143a83cc38672dcf71a1c301443b", + "rev": "983dc5dacc3654f92e9c914c10d678ff32f5ca13", "type": "github" }, "original": { @@ -436,11 +436,11 @@ ] }, "locked": { - "lastModified": 1752780124, - "narHash": "sha256-5dn97vIYxn6VozKePOQSDxVCsrl38nDdMJXx86KIJH0=", + "lastModified": 1753479839, + "narHash": "sha256-E/rPVh7vyPMJUFl2NAew+zibNGfVbANr8BP8nLRbLkQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "c718918222bdb104397762dea67e6b397a7927fe", + "rev": "0b9bf983db4d064764084cd6748efb1ab8297d1e", "type": "github" }, "original": { @@ -458,11 +458,11 @@ ] }, "locked": { - "lastModified": 1752814804, - "narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=", + "lastModified": 1753567913, + "narHash": "sha256-eYrqSRI1/mrnVGCGYO+zkKHUszwJQodq/qDHh+mzvkI=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0300c8808e41da81d6edfc202f3d3833c157daf", + "rev": "2b73c2fcca690b6eca4f520179e54ae760f25d4e", "type": "github" }, "original": { @@ -477,11 +477,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1752814804, - "narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=", + "lastModified": 1753567913, + "narHash": "sha256-eYrqSRI1/mrnVGCGYO+zkKHUszwJQodq/qDHh+mzvkI=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0300c8808e41da81d6edfc202f3d3833c157daf", + "rev": "2b73c2fcca690b6eca4f520179e54ae760f25d4e", "type": "github" }, "original": { @@ -501,11 +501,11 @@ ] }, "locked": { - "lastModified": 1752978452, - "narHash": "sha256-c9nd/+sAz69+zrD5RrS22C91LBlizFRt7YfUY4AST+o=", + "lastModified": 1753495822, + "narHash": "sha256-aGZhjaICmLAW0BnG+V0zGCP6xqoYFfr/d4LlLIvap9A=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "49b211b75ccbb9dd32484955a93b4cfe908f64cf", + "rev": "14f622f160847effcdfae7ef15b8aa9745addf7f", "type": "github" }, "original": { @@ -527,11 +527,11 @@ ] }, "locked": { - "lastModified": 1752978452, - "narHash": "sha256-c9nd/+sAz69+zrD5RrS22C91LBlizFRt7YfUY4AST+o=", + "lastModified": 1753495822, + "narHash": "sha256-aGZhjaICmLAW0BnG+V0zGCP6xqoYFfr/d4LlLIvap9A=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "49b211b75ccbb9dd32484955a93b4cfe908f64cf", + "rev": "14f622f160847effcdfae7ef15b8aa9745addf7f", "type": "github" }, "original": { @@ -597,11 +597,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1752666637, - "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=", + "lastModified": 1753122741, + "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153", + "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", "type": "github" }, "original": { @@ -613,11 +613,11 @@ }, "nixos-hardware_2": { "locked": { - "lastModified": 1752666637, - "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=", + "lastModified": 1753122741, + "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153", + "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", "type": "github" }, "original": { @@ -677,11 +677,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1752866191, - "narHash": "sha256-NV4S2Lf2hYmZQ3Qf4t/YyyBaJNuxLPyjzvDma0zPp/M=", + "lastModified": 1753345091, + "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f01fe91b0108a7aff99c99f2e9abbc45db0adc2a", + "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", "type": "github" }, "original": { @@ -740,22 +740,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1752950548, "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", @@ -771,13 +755,29 @@ "type": "github" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1753429684, + "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_7": { "locked": { - "lastModified": 1752687322, - "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", + "lastModified": 1753429684, + "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", + "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", "type": "github" }, "original": { @@ -871,11 +871,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1753005466, - "narHash": "sha256-SCx9sEs6Uk4Va2O5a2++FssgiWWfbZqdPqpIw34xhe8=", + "lastModified": 1753562419, + "narHash": "sha256-hSutp1wLoj2DBGdhkFUCy8gJHu7YJ8Nt/OgsYrQ/O50=", "owner": "nix-community", "repo": "NUR", - "rev": "7d214357c94bb34d8e527e78ffe02ce12e01d720", + "rev": "294f62a0da32efbda589682cc1f038e773530959", "type": "github" }, "original": {