Compare commits

..

No commits in common. "650d3615c377981f3825b4e3fd7a9866b7a1deea" and "67048909a94a6f8a90307eb16d8d3f36413c4b13" have entirely different histories.

6 changed files with 2 additions and 45 deletions

View file

@ -11,7 +11,6 @@
jnoortheen.nix-ide jnoortheen.nix-ide
editorconfig.editorconfig editorconfig.editorconfig
github.github-vscode-theme github.github-vscode-theme
github.codespaces
]; ];
userSettings = { userSettings = {
"workbench.colorTheme" = "GitHub Dark Default"; "workbench.colorTheme" = "GitHub Dark Default";
@ -19,10 +18,10 @@
"nix.enableLanguageServer" = true; "nix.enableLanguageServer" = true;
"nix.serverPath" = "nixd"; "nix.serverPath" = "nixd";
"editor.fontFamily" = "IBM Plex Mono"; "editor.fontFamily" = "IBM Plex Mono";
"editor.fontSize" = 16; "editor.fontSize" = 15;
"editor.wordWrap" = "on"; "editor.wordWrap" = "on";
# vim mode settings # vim mode
"vim.handleKeys" = { "vim.handleKeys" = {
"<C-b>" = false; # file tree toggle "<C-b>" = false; # file tree toggle
}; };
@ -33,7 +32,6 @@
"silent" = true; "silent" = true;
} }
]; ];
"workbench.startupEditor" = "none";
}; };
}; };
} }

View file

@ -206,6 +206,4 @@
}; };
virtualisation.oci-containers.backend = "podman"; virtualisation.oci-containers.backend = "podman";
environment.enableAllTerminfo = true; environment.enableAllTerminfo = true;
my.soju.enable = true;
} }

View file

@ -3,6 +3,5 @@
imports = [ imports = [
./backup.nix ./backup.nix
./caddy.nix ./caddy.nix
./soju.nix
]; ];
} }

View file

@ -1,23 +0,0 @@
{ 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
'';
};
}

View file

@ -2,7 +2,6 @@ let
overlays = [ overlays = [
./conduwuit ./conduwuit
./attic ./attic
./vscode.nix
]; ];
importedOverlays = map (m: import m) overlays; importedOverlays = map (m: import m) overlays;
in in

View file

@ -1,14 +0,0 @@
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=";
};
};
};
};
}