From 93ccb899ba05ea11612203ab485e7616d7793d43 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Wed, 13 Sep 2023 12:06:28 +0200 Subject: [PATCH 1/2] Fix git ref git.b12f.io -> git.pub.solar --- flake.lock | 12 ++++++------ flake.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 97331ef3..4ba5ec5b 100644 --- a/flake.lock +++ b/flake.lock @@ -471,19 +471,19 @@ }, "locked": { "dir": "vmtools", - "lastModified": 1669648111, - "narHash": "sha256-EKh7iM4fCyZ7L6+HmGn3QkZ1HuG9zMEkziOH3K13SbY=", + "lastModified": 1694596254, + "narHash": "sha256-aqGmoQXVG0Q1SeZuIWws8dbn1JRnjOGxtDVs2SBzNR0=", "ref": "main", - "rev": "d78c4afe040440437949ce581ae0dcdc5893553c", - "revCount": 28, + "rev": "463d525addaf05beaf4a632fd85e2a2b25ddf8ee", + "revCount": 69, "type": "git", - "url": "https://git.b12f.io/pub-solar/infra?dir=vmtools" + "url": "https://git.pub.solar/pub-solar/infra?dir=vmtools" }, "original": { "dir": "vmtools", "ref": "main", "type": "git", - "url": "https://git.b12f.io/pub-solar/infra?dir=vmtools" + "url": "https://git.pub.solar/pub-solar/infra?dir=vmtools" } }, "utils": { diff --git a/flake.nix b/flake.nix index 616432b4..ced6bdf3 100644 --- a/flake.nix +++ b/flake.nix @@ -39,7 +39,7 @@ nvfetcher.inputs.nixpkgs.follows = "nixos"; nvfetcher.inputs.flake-compat.follows = "flake-compat"; - triton-vmtools.url = "git+https://git.b12f.io/pub-solar/infra?ref=main&dir=vmtools"; + triton-vmtools.url = "git+https://git.pub.solar/pub-solar/infra?ref=main&dir=vmtools"; triton-vmtools.inputs.nixpkgs.follows = "nixos"; keycloak-theme-pub-solar.url = "git+https://git.pub.solar/pub-solar/keycloak-theme?ref=main"; From 9685baa34bf20d576c2922a929eee1558be7ca19 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Wed, 13 Sep 2023 12:19:16 +0200 Subject: [PATCH 2/2] Fix formatting --- hosts/flora-6/collabora.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/flora-6/collabora.nix b/hosts/flora-6/collabora.nix index e44e7934..c73e9b8e 100644 --- a/hosts/flora-6/collabora.nix +++ b/hosts/flora-6/collabora.nix @@ -5,7 +5,6 @@ self, ... }: { - virtualisation = { docker = { enable = true; # sadly podman is not supported rightnow