From f87136fc942ea1beb32965d67802d636e6c6a1a3 Mon Sep 17 00:00:00 2001
From: xinyangli <lixinyang411@gmail.com>
Date: Tue, 12 Nov 2024 21:27:57 +0800
Subject: [PATCH] calcite: small fixes

---
 flake.nix                                |  1 +
 modules/home-manager/alacritty.nix       |  2 +-
 modules/home-manager/git.nix             |  1 +
 modules/home-manager/vim.nix             |  1 +
 modules/nixos/forgejo-actions-runner.nix | 10 +++++++++-
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7bc10db..959d920 100644
--- a/flake.nix
+++ b/flake.nix
@@ -274,6 +274,7 @@
               nix-output-monitor
               nil
               nvd
+              nh
             ];
           };
         };
diff --git a/modules/home-manager/alacritty.nix b/modules/home-manager/alacritty.nix
index f5219ad..afe00ea 100644
--- a/modules/home-manager/alacritty.nix
+++ b/modules/home-manager/alacritty.nix
@@ -13,7 +13,7 @@ in
     programs.alacritty = {
       enable = true;
       settings = {
-        shell = {
+        terminal.shell = {
           program = config.programs.zellij.package + "/bin/zellij";
           args = [
             "attach"
diff --git a/modules/home-manager/git.nix b/modules/home-manager/git.nix
index 1777d60..d28eb50 100644
--- a/modules/home-manager/git.nix
+++ b/modules/home-manager/git.nix
@@ -36,6 +36,7 @@ in
         a = "add";
         d = "diff";
         s = "status";
+        ck = "checkout";
       };
       signing = mkIf cfg.signing.enable {
         signByDefault = true;
diff --git a/modules/home-manager/vim.nix b/modules/home-manager/vim.nix
index 1bab02b..0709791 100644
--- a/modules/home-manager/vim.nix
+++ b/modules/home-manager/vim.nix
@@ -11,6 +11,7 @@ let
   neovideConfig = {
     neovim-bin = getExe pkgs.nixvim;
     fork = true;
+    frame = "none";
   };
 in
 {
diff --git a/modules/nixos/forgejo-actions-runner.nix b/modules/nixos/forgejo-actions-runner.nix
index b0584c4..7783d1c 100644
--- a/modules/nixos/forgejo-actions-runner.nix
+++ b/modules/nixos/forgejo-actions-runner.nix
@@ -6,12 +6,20 @@
 }:
 let
   cfg = config.custom.forgejo-actions-runner;
+  settingsFormat = pkgs.formats.yaml { };
 in
 {
   options = {
     custom.forgejo-actions-runner = {
       enable = lib.mkEnableOption "TPM supported ssh agent in go";
       tokenFile = lib.mkOption { type = lib.types.path; };
+      settings = lib.mkOption {
+        type = lib.types.submodule {
+          freeformType = settingsFormat.type;
+        };
+
+        default = { };
+      };
     };
   };
   config = lib.mkIf cfg.enable {
@@ -30,7 +38,7 @@ in
         ];
         settings = {
           container.network = "host";
-        };
+        } // cfg.settings;
       };
     };
   };