fw/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of github.com:FredzyW/nix

Browse source
This commit is contained in:
FredzyW 2024-06-14 21:31:46 +02:00
commit 2965bd8796
3 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
flake.lock generated
View file

@ -39,11 +39,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1717952948,
"narHash": "sha256-mJi4/gjiwQlSaxjA6AusXBN/6rQRaPCycR7bd8fydnQ=",
"lastModified": 1718208800,
"narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2819fffa7fa42156680f0d282c60d81e8fb185b7",
"rev": "cc54fb41d13736e92229c21627ea4f22199fee6b",
"type": "github"
},
"original": {
@ -71,11 +71,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1717974879,
"narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=",
"lastModified": 1718318537,
"narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3",
"rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420",
"type": "github"
},
"original": {

6
flake.nix
View file

@ -93,7 +93,11 @@
myhostname = "desktop";
};
# > Our main home-manager configuration file <
modules = [./config/home.nix];
modules = [
./config/home.nix
({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-fw-pkgs ]; })
];
};
"fw@jobb" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux;

18
moduler/common/nginx.nix
View file

@ -24,15 +24,15 @@ networking.firewall = {
proxyWebsockets = true;
};
};
# "git.wastring.com" = {
# sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
# sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
# forceSSL = true;
# locations."/" = {
# proxyPass = "http://172.17.0.1:3009";
# proxyWebsockets = true;
# };
# };
"git.wastring.com" = {
sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
forceSSL = true;
locations."/" = {
proxyPass = "http://192.168.16.1:3000";
proxyWebsockets = true;
};
};
"cal.wastring.com" = {
sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
sslCertificate = "/certs/.lego/certificates/wastring.com.crt";