From 4f015ecb455827a787003302ab3a785f2f6b8bd4 Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 29 Jan 2025 21:48:31 -0500 Subject: [PATCH 1/2] vscode: overlay github codespaces extension Signed-off-by: cy --- home/vscode.nix | 6 ++++-- overlay/default.nix | 1 + overlay/vscode.nix | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 overlay/vscode.nix diff --git a/home/vscode.nix b/home/vscode.nix index 0c1bf95..214a060 100644 --- a/home/vscode.nix +++ b/home/vscode.nix @@ -11,6 +11,7 @@ jnoortheen.nix-ide editorconfig.editorconfig github.github-vscode-theme + github.codespaces ]; userSettings = { "workbench.colorTheme" = "GitHub Dark Default"; @@ -18,10 +19,10 @@ "nix.enableLanguageServer" = true; "nix.serverPath" = "nixd"; "editor.fontFamily" = "IBM Plex Mono"; - "editor.fontSize" = 15; + "editor.fontSize" = 16; "editor.wordWrap" = "on"; - # vim mode + # vim mode settings "vim.handleKeys" = { "" = false; # file tree toggle }; @@ -32,6 +33,7 @@ "silent" = true; } ]; + "workbench.startupEditor" = "none"; }; }; } diff --git a/overlay/default.nix b/overlay/default.nix index 99fc17b..5b6a9a8 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -2,6 +2,7 @@ let overlays = [ ./conduwuit ./attic + ./vscode.nix ]; importedOverlays = map (m: import m) overlays; in diff --git a/overlay/vscode.nix b/overlay/vscode.nix new file mode 100644 index 0000000..4de2d90 --- /dev/null +++ b/overlay/vscode.nix @@ -0,0 +1,14 @@ +final: prev: { + vscode-extensions = prev.vscode-extensions // { + github = prev.vscode-extensions.github // { + codespaces = prev.vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "github"; + name = "codespaces"; + version = "1.17.3"; + hash = "sha256-idJFYHJ4yeqpFZBX55Y0v1yfzgqyhS0MrC4yIto7i7w="; + }; + }; + }; + }; +} From 650d3615c377981f3825b4e3fd7a9866b7a1deea Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 30 Jan 2025 10:51:47 -0500 Subject: [PATCH 2/2] init soju Signed-off-by: cy --- hosts/chunk/default.nix | 2 ++ modules/default.nix | 1 + modules/soju.nix | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 modules/soju.nix diff --git a/hosts/chunk/default.nix b/hosts/chunk/default.nix index 577e9b5..4bd50ed 100644 --- a/hosts/chunk/default.nix +++ b/hosts/chunk/default.nix @@ -206,4 +206,6 @@ }; virtualisation.oci-containers.backend = "podman"; environment.enableAllTerminfo = true; + + my.soju.enable = true; } diff --git a/modules/default.nix b/modules/default.nix index 070a96e..9780465 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -3,5 +3,6 @@ imports = [ ./backup.nix ./caddy.nix + ./soju.nix ]; } diff --git a/modules/soju.nix b/modules/soju.nix new file mode 100644 index 0000000..a7a62db --- /dev/null +++ b/modules/soju.nix @@ -0,0 +1,23 @@ +{ config, lib, ... }: +let + cfg = config.my.soju; +in +{ + options.my.soju = { + enable = lib.mkEnableOption "soju"; + }; + + config = lib.mkIf cfg.enable { + services.soju = { + enable = true; + # should be fine since caddy will provide TLS + listen = [ "irc+insecure://127.0.0.1:6667" ]; + hostName = "soju.cy7.sh"; + }; + + services.caddy.virtualHosts."soju.cy7.sh".extraConfig = '' + import common + reverse_proxy 127.0.0.1:6667 + ''; + }; +}