diff --git a/common/home/git/default.nix b/common/home/git/default.nix index 646b6b98..3f63a36e 100644 --- a/common/home/git/default.nix +++ b/common/home/git/default.nix @@ -46,15 +46,19 @@ }; }; - # https://github.com/dandavison/delta/issues/630#issuecomment-860046929 - extraConfig.pager = let - cmd = "LESS='LRc --mouse' ${pkgs.delta}/bin/delta"; - in { - diff = cmd; - show = cmd; - stash = cmd; - log = cmd; - reflog = cmd; + extraConfig = { + diff.sopsdiffer.textconv = "sops --config /dev/null -d"; + + # https://github.com/dandavison/delta/issues/630#issuecomment-860046929 + pager = let + cmd = "LESS='LRc --mouse' ${pkgs.delta}/bin/delta"; + in { + diff = cmd; + show = cmd; + stash = cmd; + log = cmd; + reflog = cmd; + }; }; }; }; diff --git a/devices/cluster/modules/pcsd.nix b/devices/cluster/modules/pcsd.nix index f0f32da2..eabcb3b3 100644 --- a/devices/cluster/modules/pcsd.nix +++ b/devices/cluster/modules/pcsd.nix @@ -22,7 +22,7 @@ in { clusterName = "thingies"; corosyncKeyFile = secrets.corosync.path; - clusterUserPasswordFile = secrets.PASSWORD.path; + clusterUserPasswordFile = secrets.pcs-pass.path; virtualIps = { "caddy-vip" = { diff --git a/flake.lock b/flake.lock index 57134b6b..d6297c92 100644 --- a/flake.lock +++ b/flake.lock @@ -870,16 +870,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1705033721, - "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", + "lastModified": 1708819810, + "narHash": "sha256-1KosU+ZFXf31GPeCBNxobZWMgHsSOJcrSFA6F2jhzdE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", + "rev": "89a2a12e6c8c6a56c72eb3589982c8e2f89c70ea", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } @@ -1342,11 +1342,11 @@ "sops-nix": "sops-nix" }, "locked": { - "lastModified": 1709155444, - "narHash": "sha256-bdKOhfSskioOc/p9CkT7POkbP9aauCAFgAPO7JxKJO4=", + "lastModified": 1709273629, + "narHash": "sha256-VdU3WH3Pv8ai+/X9z1VucGra1YkZPEUjzcO/F/jhguw=", "ref": "refs/heads/main", - "rev": "6d61a2cfc9ef021f9ad5cde38ea94659340afe77", - "revCount": 49, + "rev": "e0ab13ca6b37c5e87953a5616f5b0b0f837590c6", + "revCount": 53, "type": "git", "url": "ssh://git@git.nelim.org/matt1432/nixos-secrets" }, @@ -1364,11 +1364,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1705356877, - "narHash": "sha256-274jL1cH64DcXUXebVMZBRUsTs3FvFlPIPkCN/yhSnI=", + "lastModified": 1708987867, + "narHash": "sha256-k2lDaDWNTU5sBVHanYzjDKVDmk29RHIgdbbXu5sdzBA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "87755331580fdf23df7e39b46d63ac88236bf42c", + "rev": "a1c8de14f60924fafe13aea66b46157f0150f4cf", "type": "github" }, "original": {