From ddd64258a23944c160167675d486e089cfe2ae7f Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 30 Apr 2025 17:51:47 -0500 Subject: [PATCH] move open gist to h001 from o001 --- hosts/h001/containers/default.nix | 1 + .../o001 => h001}/containers/opengist.nix | 3 --- hosts/lio/flake.nix | 1 + hosts/oracle/o001/flake.lock | 24 +++++++++---------- hosts/oracle/o001/flake.nix | 1 - 5 files changed, 14 insertions(+), 16 deletions(-) rename hosts/{oracle/o001 => h001}/containers/opengist.nix (87%) diff --git a/hosts/h001/containers/default.nix b/hosts/h001/containers/default.nix index 4d82b81..c18778a 100644 --- a/hosts/h001/containers/default.nix +++ b/hosts/h001/containers/default.nix @@ -6,6 +6,7 @@ imports = [ # common.nixosModules.containers.librechat common.nixosModules.containers.forgejo + ./opengist.nix ]; config = { diff --git a/hosts/oracle/o001/containers/opengist.nix b/hosts/h001/containers/opengist.nix similarity index 87% rename from hosts/oracle/o001/containers/opengist.nix rename to hosts/h001/containers/opengist.nix index 444e443..fe8fa6c 100644 --- a/hosts/oracle/o001/containers/opengist.nix +++ b/hosts/h001/containers/opengist.nix @@ -8,7 +8,6 @@ let v_port = 6157; in { - virtualisation.oci-containers.backend = "docker"; virtualisation.oci-containers.containers = { opengist = { user = "root"; @@ -26,8 +25,6 @@ in }; services.nginx.virtualHosts."gist.joshuabell.xyz" = { - enableACME = true; - forceSSL = true; locations = { "/" = { proxyWebsockets = true; diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index 627e69d..1e62772 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -45,6 +45,7 @@ ffmpeg-full appimage-run rustdesk-flutter + element-desktop ]; # Also allow this key to work for root user, this will let us use this as a remote builder easier diff --git a/hosts/oracle/o001/flake.lock b/hosts/oracle/o001/flake.lock index a025c25..9ed0a31 100644 --- a/hosts/oracle/o001/flake.lock +++ b/hosts/oracle/o001/flake.lock @@ -32,17 +32,17 @@ "ragenix": "ragenix" }, "locked": { - "lastModified": 1745444238, - "narHash": "sha256-zT1T9zC7dr+HApuC390eQHPpCJq4vYvOwYSq507DtFA=", + "lastModified": 1746052265, + "narHash": "sha256-/cb1BPEUb1O/clHP101M52hvUZ2zo8FAyJS7BF/M3Mg=", "ref": "refs/heads/master", - "rev": "214e6f289da1e888ff547aff173aaffc8517092b", - "revCount": 399, + "rev": "7ae93579413e6bfcc6a55d1fae05ef77dc224676", + "revCount": 436, "type": "git", - "url": "https://git.joshuabell.xyz/dotfiles" + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, "original": { "type": "git", - "url": "https://git.joshuabell.xyz/dotfiles" + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" } }, "crane": { @@ -1263,17 +1263,17 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1744648171, - "narHash": "sha256-DodI1yschNbktPZiGKM6Gke2pgEM0J4wkVaM+Ygk0Cs=", + "lastModified": 1745585761, + "narHash": "sha256-xS3068xhndFrZh9GcTTNTmeebGq1A3uVykRRdzJOj3Y=", "ref": "refs/heads/master", - "rev": "0a14d0e7451d17a2f368749cf269c6a59aa35059", - "revCount": 274, + "rev": "e5523910a0c07c88d026d006f5962434bfa53548", + "revCount": 277, "type": "git", - "url": "https://git.joshuabell.xyz/nvim" + "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, "original": { "type": "git", - "url": "https://git.joshuabell.xyz/nvim" + "url": "https://git.joshuabell.xyz/ringofstorms/nvim" } }, "rust-overlay": { diff --git a/hosts/oracle/o001/flake.nix b/hosts/oracle/o001/flake.nix index f18005e..f18dbfc 100644 --- a/hosts/oracle/o001/flake.nix +++ b/hosts/oracle/o001/flake.nix @@ -47,7 +47,6 @@ ./hardware-configuration.nix ./nginx.nix ./containers/vaultwarden.nix - ./containers/opengist.nix ./mods/postgresql.nix ./mods/atuin.nix ./mods/rustdesk-server.nix