calcite: small fixes

This commit is contained in:
xinyangli 2024-11-12 21:27:57 +08:00
parent 3b393a74f5
commit f87136fc94
Signed by: xin
SSH key fingerprint: SHA256:UU5pRTl7NiLFJbWJZa+snLylZSXIz5rgHmwjzv8v4oE
5 changed files with 13 additions and 2 deletions

View file

@ -274,6 +274,7 @@
nix-output-monitor nix-output-monitor
nil nil
nvd nvd
nh
]; ];
}; };
}; };

View file

@ -13,7 +13,7 @@ in
programs.alacritty = { programs.alacritty = {
enable = true; enable = true;
settings = { settings = {
shell = { terminal.shell = {
program = config.programs.zellij.package + "/bin/zellij"; program = config.programs.zellij.package + "/bin/zellij";
args = [ args = [
"attach" "attach"

View file

@ -36,6 +36,7 @@ in
a = "add"; a = "add";
d = "diff"; d = "diff";
s = "status"; s = "status";
ck = "checkout";
}; };
signing = mkIf cfg.signing.enable { signing = mkIf cfg.signing.enable {
signByDefault = true; signByDefault = true;

View file

@ -11,6 +11,7 @@ let
neovideConfig = { neovideConfig = {
neovim-bin = getExe pkgs.nixvim; neovim-bin = getExe pkgs.nixvim;
fork = true; fork = true;
frame = "none";
}; };
in in
{ {

View file

@ -6,12 +6,20 @@
}: }:
let let
cfg = config.custom.forgejo-actions-runner; cfg = config.custom.forgejo-actions-runner;
settingsFormat = pkgs.formats.yaml { };
in in
{ {
options = { options = {
custom.forgejo-actions-runner = { custom.forgejo-actions-runner = {
enable = lib.mkEnableOption "TPM supported ssh agent in go"; enable = lib.mkEnableOption "TPM supported ssh agent in go";
tokenFile = lib.mkOption { type = lib.types.path; }; tokenFile = lib.mkOption { type = lib.types.path; };
settings = lib.mkOption {
type = lib.types.submodule {
freeformType = settingsFormat.type;
};
default = { };
};
}; };
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
@ -30,7 +38,7 @@ in
]; ];
settings = { settings = {
container.network = "host"; container.network = "host";
}; } // cfg.settings;
}; };
}; };
}; };