gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: gerg-l:cbd76b3e4483614b7d8b01afed0533983a6b3a64
Branches Tags
gerg-l:master
..
compare: gerg-l:71b4504e10680f1d087cfc8412372538879ad520
Branches Tags
gerg-l:master

2 commits
cbd76b3e44 ... 71b4504e10

Author SHA1 Message Date
github-actions[bot]
71b4504e10 flake.lock: Update 
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/785c1e02c7e465375df971949b8dcbde9ec362e5?narHash=sha256-8dupm9GfK%2BBowGdQd7EHK5V61nneLfr9xR6sc5vtDi0%3D' (2024-12-02)
  → 'github:nix-community/disko/0f31ad735e784315a22d9899d3ba24340ce64220?narHash=sha256-NghuiWXx6Q3gwLiudiNwDpYQ1CPEUK7J%2Bf9dWREN8KA%3D' (2024-12-12)
• Updated input 'master':
    'github:NixOS/nixpkgs/94b321638afed597e9bb528d45441c3fbfee2662?narHash=sha256-JSWAumioVHzcihVEutSMdWni9Mbm7hU9IJ41AvHLiS0%3D' (2024-12-12)
  → 'github:NixOS/nixpkgs/2cf707c042986bb0093791be0eaf3ad008035cf6?narHash=sha256-aKkxUZntc3%2BzQP%2BNEp%2BsAg%2BmtCICQ1GYjbOy5lTUstI%3D' (2024-12-13)
• Updated input 'nvim-flake':
    'github:Gerg-L/nvim-flake/08a4f044937d93feed488f30b95109a6430f04d7?narHash=sha256-rxzLvbEPO7sm6wOMKb87EukGKSXUmviUMdYFNmqYIkU%3D' (2024-12-12)
  → 'github:Gerg-L/nvim-flake/c5425f5f22f6da86de5da74f6943b380bcc186d0?narHash=sha256-8Nr2kntIMbDk4GC9GaQKn75MUw%2B6IR1UdsYvpmw19Gg%3D' (2024-12-13)
• Updated input 'nvim-flake/mnw':
    'github:gerg-l/mnw/da1ec3eb0eb748e16a12a3e4362f6a75d5ffbd4f?narHash=sha256-iBXmh04Hzhk9QDuq71K%2BeLfpU3KSA09wsyjfJH7W4Uw%3D' (2024-12-05)
  → 'github:gerg-l/mnw/46cb6dbb92f078d80ec01b5d2816a85c32d1e36a?narHash=sha256-%2BqBEMw8UoV9nN7HFtMtM%2BOFBBLeNhZW9Fcv//ruLdiA%3D' (2024-12-12)
• Updated input 'nvim-flake/neovim-nightly':
    'github:nix-community/neovim-nightly-overlay/2025aef04baf723bfa4cb8225fc11a319a5681f1?narHash=sha256-djpjqhPZkqfe1USsuu%2BeT4ZyGO%2BdVvAf3l4FUCZEb6Y%3D' (2024-12-12)
  → 'github:nix-community/neovim-nightly-overlay/044f9a36ad620a119ebe154c26ec571a09f75039?narHash=sha256-EtSEYNx19xzuEBJsT7yXG%2BnVx11CM3rvrAQAXcvG/5Q%3D' (2024-12-13)
• Updated input 'nvim-flake/neovim-nightly/neovim-src':
    'github:neovim/neovim/442d338cb50e4cf08c58cb82b6d33b6d5df9fb1b?narHash=sha256-Fxzl754uzyNebXW54LUliFliMbw30XG%2Bbdb0AVtPSM0%3D' (2024-12-11)
  → 'github:neovim/neovim/17383870dd3b7f04eddd48ed929cc25c7e102277?narHash=sha256-8FO5Ca9bLEiD649b5gkQCdjpTmbPenJHpN0JBhtLpjE%3D' (2024-12-12)
• Updated input 'spicetify-nix':
    'github:Gerg-L/spicetify-nix/b13d7de63ad41b10bab6e96ad7aacbfa83ab1d26?narHash=sha256-o01UQJJwQWKXYGTrBy2TBmtTeCVUPmoGKVQv9JQcICk%3D' (2024-12-12)
  → 'github:Gerg-L/spicetify-nix/7981c1e87aa1adeec524524db52f75bf6598fb55?narHash=sha256-wE1sIAnsjWbyXXjwC/%2BoxSFXFDCROiwLY1pSQ7pU9js%3D' (2024-12-13)
 2024-12-13 05:13:56 +00:00
Gerg-L
296a6f9af1
nginx/acme: fix certs 2024-12-12 22:24:52 -05:00
2 changed files with 44 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

42
flake.lock generated
View file

@ -22,11 +22,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733168902, "lastModified": 1734011192,
"narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", "narHash": "sha256-NghuiWXx6Q3gwLiudiNwDpYQ1CPEUK7J+f9dWREN8KA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", "rev": "0f31ad735e784315a22d9899d3ba24340ce64220",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -409,11 +409,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1733978256, "lastModified": 1734065298,
"narHash": "sha256-JSWAumioVHzcihVEutSMdWni9Mbm7hU9IJ41AvHLiS0=", "narHash": "sha256-aKkxUZntc3+zQP+NEp+sAg+mtCICQ1GYjbOy5lTUstI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "94b321638afed597e9bb528d45441c3fbfee2662", "rev": "2cf707c042986bb0093791be0eaf3ad008035cf6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -425,11 +425,11 @@
}, },
"mnw": { "mnw": {
"locked": { "locked": {
"lastModified": 1733360044, "lastModified": 1734046916,
"narHash": "sha256-iBXmh04Hzhk9QDuq71K+eLfpU3KSA09wsyjfJH7W4Uw=", "narHash": "sha256-+qBEMw8UoV9nN7HFtMtM+OFBBLeNhZW9Fcv//ruLdiA=",
"owner": "gerg-l", "owner": "gerg-l",
"repo": "mnw", "repo": "mnw",
"rev": "da1ec3eb0eb748e16a12a3e4362f6a75d5ffbd4f", "rev": "46cb6dbb92f078d80ec01b5d2816a85c32d1e36a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -449,11 +449,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1733962285, "lastModified": 1734048484,
"narHash": "sha256-djpjqhPZkqfe1USsuu+eT4ZyGO+dVvAf3l4FUCZEb6Y=", "narHash": "sha256-EtSEYNx19xzuEBJsT7yXG+nVx11CM3rvrAQAXcvG/5Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "2025aef04baf723bfa4cb8225fc11a319a5681f1", "rev": "044f9a36ad620a119ebe154c26ec571a09f75039",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -465,11 +465,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733924897, "lastModified": 1734000357,
"narHash": "sha256-Fxzl754uzyNebXW54LUliFliMbw30XG+bdb0AVtPSM0=", "narHash": "sha256-8FO5Ca9bLEiD649b5gkQCdjpTmbPenJHpN0JBhtLpjE=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "442d338cb50e4cf08c58cb82b6d33b6d5df9fb1b", "rev": "17383870dd3b7f04eddd48ed929cc25c7e102277",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -685,11 +685,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733977336, "lastModified": 1734063741,
"narHash": "sha256-rxzLvbEPO7sm6wOMKb87EukGKSXUmviUMdYFNmqYIkU=", "narHash": "sha256-8Nr2kntIMbDk4GC9GaQKn75MUw+6IR1UdsYvpmw19Gg=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "nvim-flake", "repo": "nvim-flake",
"rev": "08a4f044937d93feed488f30b95109a6430f04d7", "rev": "c5425f5f22f6da86de5da74f6943b380bcc186d0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -849,11 +849,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733977011, "lastModified": 1734063436,
"narHash": "sha256-o01UQJJwQWKXYGTrBy2TBmtTeCVUPmoGKVQv9JQcICk=", "narHash": "sha256-wE1sIAnsjWbyXXjwC/+oxSFXFDCROiwLY1pSQ7pU9js=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "b13d7de63ad41b10bab6e96ad7aacbfa83ab1d26", "rev": "7981c1e87aa1adeec524524db52f75bf6598fb55",
"type": "github" "type": "github"
}, },
"original": { "original": {

41
hosts/gerg-desktop/services/nginx.nix
View file

@ -10,16 +10,9 @@
}; };
config = { config = {
local.nginx.defaultVhosts = local.nginx.defaultVhosts = builtins.mapAttrs (_: v: {
{ locations."/".proxyPass = v;
"_" = { }) config.local.nginx.proxyVhosts;
default = true;
locations."/".return = "404";
};
}
// (builtins.mapAttrs (_: v: {
locations."/".proxyPass = v;
}) config.local.nginx.proxyVhosts);
sops.secrets = { sops.secrets = {
gerg_ssl_key.owner = config.services.nginx.user; gerg_ssl_key.owner = config.services.nginx.user;
@ -31,6 +24,7 @@
certs."gerg-l.com" = { certs."gerg-l.com" = {
email = "GregLeyda@proton.me"; email = "GregLeyda@proton.me";
webroot = "/var/lib/acme/acme-challenge"; webroot = "/var/lib/acme/acme-challenge";
extraDomainNames = builtins.attrNames config.local.nginx.defaultVhosts;
}; };
}; };
@ -47,14 +41,25 @@
recommendedTlsSettings = true; recommendedTlsSettings = true;
# For immich # For immich
clientMaxBodySize = "50000M"; clientMaxBodySize = "50000M";
virtualHosts = builtins.mapAttrs ( virtualHosts =
_: v: builtins.mapAttrs
{ (
forceSSL = true; _: v:
useACMEHost = "gerg-l.com"; {
} forceSSL = true;
// v useACMEHost = "gerg-l.com";
) config.local.nginx.defaultVhosts; }
// v
)
(
config.local.nginx.defaultVhosts
// {
"_" = {
default = true;
locations."/".return = "404";
};
}
);
}; };
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [
80 80