materus/nixos-config
1
0
Fork 0
mirror of https://github.com/materusPL/nixos-config synced 2025-09-08 04:35:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: materus:d99f184f317bdef673285e77f3f647058ad7fddb
Branches Tags
materus:master
materus:experimental
materus:inputs
..
compare: materus:65492a133e00a3f29491bf3bff1864bb03d44e07
Branches Tags
materus:master
materus:experimental
materus:inputs

No commits in common. "d99f184f317bdef673285e77f3f647058ad7fddb" and "65492a133e00a3f29491bf3bff1864bb03d44e07" have entirely different histories.
d99f184f31 ... 65492a133e

8 changed files with 56 additions and 56 deletions
Show Stats Expand all files Collapse all files

2
configurations/host/Old-materusPC/network.nix
View File

@ -38,7 +38,7 @@
}; };
"wireguard-peer.${materusArg.wireguard.pubKeys.valkyrie}" = { "wireguard-peer.${materusArg.wireguard.pubKeys.valkyrie}" = {
endpoint = "${materusArg.ips.valkyrie}:${materusArg.wireguard.port}"; endpoint = "${materusArg.ips.valkyrie}:${materusArg.wireguard.port}";
allowed-ips = "${materusArg.ip-masks.wireguard.main};${materusArg.ip-masks.wireguard.guest};${materusArg.ip-masks.wireguard.asia};${materusArg.ips.wireguard.valkyrie}/32;"; allowed-ips = "${materusArg.ip-masks.wireguard.general};";
persistent-keepalive = "20"; persistent-keepalive = "20";
}; };
ipv4 = { ipv4 = {

2
configurations/host/materusPC/network.nix
View File

@ -56,7 +56,7 @@
}; };
"wireguard-peer.${materusArg.wireguard.pubKeys.valkyrie}" = { "wireguard-peer.${materusArg.wireguard.pubKeys.valkyrie}" = {
endpoint = "${materusArg.ips.valkyrie}:${materusArg.wireguard.port}"; endpoint = "${materusArg.ips.valkyrie}:${materusArg.wireguard.port}";
allowed-ips = "${materusArg.ip-masks.wireguard.main};${materusArg.ip-masks.wireguard.guest};${materusArg.ip-masks.wireguard.asia};${materusArg.ips.wireguard.valkyrie}/32;"; allowed-ips = "${materusArg.ip-masks.wireguard.general};";
persistent-keepalive = "20"; persistent-keepalive = "20";
}; };
ipv4 = { ipv4 = {

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

Binary file not shown.

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

Binary file not shown.

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

@ -24,7 +24,7 @@
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
allow ${materusArg.ip-masks.wireguard.main}; allow ${materusArg.ip-masks.wireguard.private};
allow 192.168.100.0/24; allow 192.168.100.0/24;
deny all; deny all;
''; '';

2
configurations/host/waffentrager/services/multimedia/scrobbling.nix
View File

@ -196,7 +196,7 @@ metadata_providers = ["spotify","deezer","lastfm","audiodb","musicbrainz"]
locations."/" = { locations."/" = {
proxyPass = "http://127.0.0.1:42011"; proxyPass = "http://127.0.0.1:42011";
extraConfig = '' extraConfig = ''
allow ${materusArg.ip-masks.wireguard.main}; allow ${materusArg.ip-masks.wireguard.private};
allow 192.168.100.0/24; allow 192.168.100.0/24;
deny all; deny all;
proxy_http_version 1.1; proxy_http_version 1.1;

BIN
configurations/profile/common/private/default.nix
View File

Binary file not shown.

104
flake.lock generated
View File

@ -159,11 +159,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1753549647, "lastModified": 1753002546,
"narHash": "sha256-xGJsvyqRiALpue6g4ZfFANS9CXLGsBdrHmu716UZ5c4=", "narHash": "sha256-eVDmnGUaE8b3dCQc1VwOi3acpkkZ8qDKxcOlUNYMM4A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "983dc5dacc3654f92e9c914c10d678ff32f5ca13", "rev": "58dae564cab8143a83cc38672dcf71a1c301443b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -182,11 +182,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1753549647, "lastModified": 1753002546,
"narHash": "sha256-xGJsvyqRiALpue6g4ZfFANS9CXLGsBdrHmu716UZ5c4=", "narHash": "sha256-eVDmnGUaE8b3dCQc1VwOi3acpkkZ8qDKxcOlUNYMM4A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "983dc5dacc3654f92e9c914c10d678ff32f5ca13", "rev": "58dae564cab8143a83cc38672dcf71a1c301443b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -436,11 +436,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753479839, "lastModified": 1752780124,
"narHash": "sha256-E/rPVh7vyPMJUFl2NAew+zibNGfVbANr8BP8nLRbLkQ=", "narHash": "sha256-5dn97vIYxn6VozKePOQSDxVCsrl38nDdMJXx86KIJH0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0b9bf983db4d064764084cd6748efb1ab8297d1e", "rev": "c718918222bdb104397762dea67e6b397a7927fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -458,11 +458,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753567913, "lastModified": 1752814804,
"narHash": "sha256-eYrqSRI1/mrnVGCGYO+zkKHUszwJQodq/qDHh+mzvkI=", "narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2b73c2fcca690b6eca4f520179e54ae760f25d4e", "rev": "d0300c8808e41da81d6edfc202f3d3833c157daf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -477,11 +477,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1753567913, "lastModified": 1752814804,
"narHash": "sha256-eYrqSRI1/mrnVGCGYO+zkKHUszwJQodq/qDHh+mzvkI=", "narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2b73c2fcca690b6eca4f520179e54ae760f25d4e", "rev": "d0300c8808e41da81d6edfc202f3d3833c157daf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -501,11 +501,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753495822, "lastModified": 1752978452,
"narHash": "sha256-aGZhjaICmLAW0BnG+V0zGCP6xqoYFfr/d4LlLIvap9A=", "narHash": "sha256-c9nd/+sAz69+zrD5RrS22C91LBlizFRt7YfUY4AST+o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "14f622f160847effcdfae7ef15b8aa9745addf7f", "rev": "49b211b75ccbb9dd32484955a93b4cfe908f64cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -527,11 +527,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753495822, "lastModified": 1752978452,
"narHash": "sha256-aGZhjaICmLAW0BnG+V0zGCP6xqoYFfr/d4LlLIvap9A=", "narHash": "sha256-c9nd/+sAz69+zrD5RrS22C91LBlizFRt7YfUY4AST+o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "14f622f160847effcdfae7ef15b8aa9745addf7f", "rev": "49b211b75ccbb9dd32484955a93b4cfe908f64cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -597,11 +597,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1753122741, "lastModified": 1752666637,
"narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -613,11 +613,11 @@
}, },
"nixos-hardware_2": { "nixos-hardware_2": {
"locked": { "locked": {
"lastModified": 1753122741, "lastModified": 1752666637,
"narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -677,11 +677,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1753345091, "lastModified": 1752866191,
"narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", "narHash": "sha256-NV4S2Lf2hYmZQ3Qf4t/YyyBaJNuxLPyjzvDma0zPp/M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", "rev": "f01fe91b0108a7aff99c99f2e9abbc45db0adc2a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -740,6 +740,22 @@
} }
}, },
"nixpkgs_5": { "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": { "locked": {
"lastModified": 1752950548, "lastModified": 1752950548,
"narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=",
@ -755,29 +771,13 @@
"type": "github" "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": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1753429684, "lastModified": 1752687322,
"narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -871,11 +871,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1753562419, "lastModified": 1753005466,
"narHash": "sha256-hSutp1wLoj2DBGdhkFUCy8gJHu7YJ8Nt/OgsYrQ/O50=", "narHash": "sha256-SCx9sEs6Uk4Va2O5a2++FssgiWWfbZqdPqpIw34xhe8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "294f62a0da32efbda589682cc1f038e773530959", "rev": "7d214357c94bb34d8e527e78ffe02ce12e01d720",
"type": "github" "type": "github"
}, },
"original": { "original": {