style: format entire depot with nixpkgs-fmt
This CL can be used to compare the style of nixpkgs-fmt against other formatters (nixpkgs, alejandra). Change-Id: I87c6abff6bcb546b02ead15ad0405f81e01b6d9e Reviewed-on: https://cl.tvl.fyi/c/depot/+/4397 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: lukegb <lukegb@tvl.fyi> Reviewed-by: wpcarro <wpcarro@gmail.com> Reviewed-by: Profpatsch <mail@profpatsch.de> Reviewed-by: kanepyork <rikingcoding@gmail.com> Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: cynthia <cynthia@tvl.fyi> Reviewed-by: edef <edef@edef.eu> Reviewed-by: eta <tvl@eta.st> Reviewed-by: grfn <grfn@gws.fyi>
This commit is contained in:
parent
2d10d60fac
commit
aa122cbae7
310 changed files with 7278 additions and 5490 deletions
|
|
@ -1,2 +1,2 @@
|
|||
let depot = import ../../.. {};
|
||||
let depot = import ../../.. { };
|
||||
in depot.third_party.nixpkgs
|
||||
|
|
|
|||
|
|
@ -8,27 +8,28 @@ let
|
|||
deps = import ./deps.nix {
|
||||
inherit (pkgs) fetchMavenArtifact fetchgit lib;
|
||||
};
|
||||
in rec {
|
||||
in
|
||||
rec {
|
||||
meta.targets = [
|
||||
"db-util"
|
||||
"server"
|
||||
"tf"
|
||||
];
|
||||
|
||||
depsPaths = deps.makePaths {};
|
||||
depsPaths = deps.makePaths { };
|
||||
|
||||
resources = builtins.filterSource (_: type: type != "symlink") ./resources;
|
||||
|
||||
classpath.dev = concatStringsSep ":" (
|
||||
(map gitignoreSource [./src ./test ./env/dev]) ++ [resources] ++ depsPaths
|
||||
(map gitignoreSource [ ./src ./test ./env/dev ]) ++ [ resources ] ++ depsPaths
|
||||
);
|
||||
|
||||
classpath.test = concatStringsSep ":" (
|
||||
(map gitignoreSource [./src ./test ./env/test]) ++ [resources] ++ depsPaths
|
||||
(map gitignoreSource [ ./src ./test ./env/test ]) ++ [ resources ] ++ depsPaths
|
||||
);
|
||||
|
||||
classpath.prod = concatStringsSep ":" (
|
||||
(map gitignoreSource [./src ./env/prod]) ++ [resources] ++ depsPaths
|
||||
(map gitignoreSource [ ./src ./env/prod ]) ++ [ resources ] ++ depsPaths
|
||||
);
|
||||
|
||||
testClojure = pkgs.writeShellScript "test-clojure" ''
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -3,7 +3,8 @@
|
|||
let
|
||||
bbbg = depot.users.grfn.bbbg;
|
||||
cfg = config.services.bbbg;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options = with lib; {
|
||||
services.bbbg = {
|
||||
enable = mkEnableOption "BBBG Server";
|
||||
|
|
@ -81,9 +82,9 @@ in {
|
|||
description = "Run database migrations for BBBG";
|
||||
wantedBy = [ "bbbg-server.service" ];
|
||||
after = ([ "network.target" ]
|
||||
++ (if cfg.database.enable
|
||||
then ["postgresql.service"]
|
||||
else []));
|
||||
++ (if cfg.database.enable
|
||||
then [ "postgresql.service" ]
|
||||
else [ ]));
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
let
|
||||
depot = import ../../.. {};
|
||||
depot = import ../../.. { };
|
||||
in
|
||||
with depot.third_party.nixpkgs;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,14 +3,17 @@
|
|||
let
|
||||
inherit (depot.users.grfn)
|
||||
terraform
|
||||
;
|
||||
;
|
||||
|
||||
in terraform.workspace "bbbg" {
|
||||
in
|
||||
terraform.workspace "bbbg"
|
||||
{
|
||||
plugins = (p: with p; [
|
||||
aws
|
||||
cloudflare
|
||||
]);
|
||||
} {
|
||||
}
|
||||
{
|
||||
machine = terraform.nixosMachine {
|
||||
name = "bbbg";
|
||||
instanceType = "t3a.small";
|
||||
|
|
@ -52,8 +55,8 @@ in terraform.workspace "bbbg" {
|
|||
};
|
||||
|
||||
security.sudo.extraRules = [{
|
||||
groups = ["wheel"];
|
||||
commands = [{ command = "ALL"; options = ["NOPASSWD"]; }];
|
||||
groups = [ "wheel" ];
|
||||
commands = [{ command = "ALL"; options = [ "NOPASSWD" ]; }];
|
||||
}];
|
||||
|
||||
nix.gc = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue