parent
dbe7d68491
commit
26cea0255f
3 changed files with 25 additions and 21 deletions
|
@ -46,15 +46,19 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# https://github.com/dandavison/delta/issues/630#issuecomment-860046929
|
extraConfig = {
|
||||||
extraConfig.pager = let
|
diff.sopsdiffer.textconv = "sops --config /dev/null -d";
|
||||||
cmd = "LESS='LRc --mouse' ${pkgs.delta}/bin/delta";
|
|
||||||
in {
|
# https://github.com/dandavison/delta/issues/630#issuecomment-860046929
|
||||||
diff = cmd;
|
pager = let
|
||||||
show = cmd;
|
cmd = "LESS='LRc --mouse' ${pkgs.delta}/bin/delta";
|
||||||
stash = cmd;
|
in {
|
||||||
log = cmd;
|
diff = cmd;
|
||||||
reflog = cmd;
|
show = cmd;
|
||||||
|
stash = cmd;
|
||||||
|
log = cmd;
|
||||||
|
reflog = cmd;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -22,7 +22,7 @@ in {
|
||||||
clusterName = "thingies";
|
clusterName = "thingies";
|
||||||
|
|
||||||
corosyncKeyFile = secrets.corosync.path;
|
corosyncKeyFile = secrets.corosync.path;
|
||||||
clusterUserPasswordFile = secrets.PASSWORD.path;
|
clusterUserPasswordFile = secrets.pcs-pass.path;
|
||||||
|
|
||||||
virtualIps = {
|
virtualIps = {
|
||||||
"caddy-vip" = {
|
"caddy-vip" = {
|
||||||
|
|
22
flake.lock
generated
22
flake.lock
generated
|
@ -870,16 +870,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1705033721,
|
"lastModified": 1708819810,
|
||||||
"narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=",
|
"narHash": "sha256-1KosU+ZFXf31GPeCBNxobZWMgHsSOJcrSFA6F2jhzdE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea",
|
"rev": "89a2a12e6c8c6a56c72eb3589982c8e2f89c70ea",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "release-23.05",
|
"ref": "release-23.11",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -1342,11 +1342,11 @@
|
||||||
"sops-nix": "sops-nix"
|
"sops-nix": "sops-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1709155444,
|
"lastModified": 1709273629,
|
||||||
"narHash": "sha256-bdKOhfSskioOc/p9CkT7POkbP9aauCAFgAPO7JxKJO4=",
|
"narHash": "sha256-VdU3WH3Pv8ai+/X9z1VucGra1YkZPEUjzcO/F/jhguw=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "6d61a2cfc9ef021f9ad5cde38ea94659340afe77",
|
"rev": "e0ab13ca6b37c5e87953a5616f5b0b0f837590c6",
|
||||||
"revCount": 49,
|
"revCount": 53,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://git@git.nelim.org/matt1432/nixos-secrets"
|
"url": "ssh://git@git.nelim.org/matt1432/nixos-secrets"
|
||||||
},
|
},
|
||||||
|
@ -1364,11 +1364,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1705356877,
|
"lastModified": 1708987867,
|
||||||
"narHash": "sha256-274jL1cH64DcXUXebVMZBRUsTs3FvFlPIPkCN/yhSnI=",
|
"narHash": "sha256-k2lDaDWNTU5sBVHanYzjDKVDmk29RHIgdbbXu5sdzBA=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "87755331580fdf23df7e39b46d63ac88236bf42c",
|
"rev": "a1c8de14f60924fafe13aea66b46157f0150f4cf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue