kitchen/rice
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove devShell, website #28

Merged
chef merged 2 commits from chef/remove-website into main 2024-06-06 21:32:27 +00:00 AGit
Conversation 0 Commits 2 Files changed 6 +4 -41
6 changed files with 4 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
flake.lock
View file

@ -327,8 +327,7 @@
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur", "nur": "nur",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"systems": "systems", "systems": "systems"
"website": "website"
} }
}, },
"systems": { "systems": {
@ -346,22 +345,6 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"website": {
"flake": false,
"locked": {
"lastModified": 1709301176,
"narHash": "sha256-HOnDLwHnVt6G+Gop08PYbzNDahq9SKHnPdaR5hdL244=",
"owner": "buffet",
"repo": "website",
"rev": "473559837586715998be89b928131706c5058f96",
"type": "github"
},
"original": {
"owner": "buffet",
"repo": "website",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

10
flake.nix
View file

@ -72,11 +72,6 @@
url = "github:nix-systems/default"; url = "github:nix-systems/default";
flake = false; flake = false;
}; };
website = {
url = "github:buffet/website";
flake = false;
};
}; };
outputs = { outputs = {
@ -120,10 +115,5 @@
}; };
}; };
}; };
devShell = nixpkgs.legacyPackages.${system}.mkShell {
inherit (self.checks.${system}.pre-commit-check) shellHook;
buildInputs = self.checks.${system}.pre-commit-check.enabledPackages;
};
}); });
} }

2
hosts/ami/404.nix
View file

@ -4,7 +4,7 @@
default = true; default = true;
useACMEHost = "buffet.sh"; useACMEHost = "buffet.sh";
forceSSL = true; forceSSL = true;
root = "${website}/404.html"; extraConfig = "return 404;";
}; };
}; };
} }

1
hosts/ami/default.nix
View file

@ -19,7 +19,6 @@
./murmur.nix ./murmur.nix
./nginx.nix ./nginx.nix
./upgrade.nix ./upgrade.nix
./website.nix
../../users/maintainer ../../users/maintainer
]; ];

2
hosts/ami/nginx.nix
View file

@ -1,4 +1,6 @@
{ {
networking.firewall.allowedTCPPorts = [80 443];
services.nginx = { services.nginx = {
enable = true; enable = true;

11
hosts/ami/website.nix
View file

@ -1,11 +0,0 @@
{website, ...}: {
networking.firewall.allowedTCPPorts = [80 443];
services.nginx = {
virtualHosts."buffet.sh" = {
useACMEHost = "buffet.sh";
forceSSL = true;
root = "${website}";
};
};
}