Enable git signing commits and ssh-agent service

.github/workflows/ci-home.yml

@@ -27,7 +27,7 @@ jobs:
           - ubuntu-22.04
           - macos-13
         home-manager-channel-ref:
-          - 729ab77f9e998e0989fa30140ecc91e738bc0cb1 # Pinned for current use
+          - a8f8f48320c64bd4e3a266a850bbfde2c6fe3a04 # Pinned for current use
           - master # unstable nixpkgs
 
     runs-on: ${{ matrix.os }}
@@ -36,7 +36,7 @@ jobs:
       - uses: DeterminateSystems/magic-nix-cache-action@v2
       - name: Register Nix Channels
         run: |
-          nix-channel --add https://releases.nixos.org/nixpkgs/nixpkgs-23.11pre509044.3acb5c4264c4/nixexprs.tar.xz nixpkgs
+          nix-channel --add https://releases.nixos.org/nixpkgs/nixpkgs-23.11pre511546.844ffa82bbe2/nixexprs.tar.xz nixpkgs
           nix-channel --add https://github.com/nix-community/home-manager/archive/${{ matrix.home-manager-channel-ref }}.tar.gz home-manager
           nix-channel --update
           nix-channel --list

flake.nix

@@ -14,7 +14,7 @@
       let
         pkgs = nixpkgs.legacyPackages.${system};
       in
-      {
+      rec {
         devShells.default = with pkgs;
           mkShell {
             buildInputs = [
@@ -36,6 +36,23 @@
               jq
             ];
           };
+
+        # https://gist.github.com/Scoder12/0538252ed4b82d65e59115075369d34d?permalink_comment_id=4650816#gistcomment-4650816
+        packages.json2nix = pkgs.writeScriptBin "json2nix" ''
+          ${pkgs.python3}/bin/python ${pkgs.fetchurl {
+            url = "https://gist.githubusercontent.com/Scoder12/0538252ed4b82d65e59115075369d34d/raw/e86d1d64d1373a497118beb1259dab149cea951d/json2nix.py";
+            hash = "sha256-ROUIrOrY9Mp1F3m+bVaT+m8ASh2Bgz8VrPyyrQf9UNQ=";
+          }} $@
+        '';
+
+        apps = {
+          # nix run .#json2nix
+          json2nix = {
+            type = "app";
+            program = "${packages.json2nix}/bin/json2nix";
+          };
+        };
       }
     );
 }
+

home-manager/bash.nix

@@ -6,6 +6,7 @@
   programs.zoxide.enableBashIntegration = true;
   programs.fzf.enableBashIntegration = true;
   programs.rtx.enableBashIntegration = true;
+  programs.keychain.enableBashIntegration = true;
 
   # Used only in bash - https://unix.stackexchange.com/a/689403
   # https://github.com/nix-community/home-manager/blob/master/modules/programs/readline.nix

home-manager/fish.nix

@@ -7,6 +7,7 @@
   programs.zoxide.enableFishIntegration = true;
   programs.fzf.enableFishIntegration = true;
   programs.rtx.enableFishIntegration = true;
+  programs.keychain.enableFishIntegration = true;
 
   xdg.configFile."fish/fish_variables".source = ../home/.config/fish/fish_variables;
   xdg.configFile."fish/functions/fish_prompt.fish".source = ../home/.config/fish/functions/fish_prompt.fish;

home-manager/git.nix

@@ -1,9 +1,71 @@
-{ ... }:
+{ config, pkgs, ... }:
 
-# https://github.com/nix-community/home-manager/blob/master/modules/programs/lazygit.nix
 {
-  xdg.configFile."git/config".source = ../home/.config/git/config;
+  # https://github.com/nix-community/home-manager/blob/master/modules/programs/git.nix
+  # xdg will be used in home-manager: https://github.com/nix-community/home-manager/blob/7b8d43fbaf8450c30caaed5eab876897d0af891b/modules/programs/git.nix#L417-L418
+  programs.git = {
+    enable = true;
+
+    userEmail = "kachick1@gmail.com";
+    userName = "Kenichi Kamiya";
+
+    aliases = {
+      fixup = "commit --all --amend";
+      empty = "commit --allow-empty -m 'Add an empty commit'";
+      current = "symbolic-ref --short HEAD";
+      switch-default = "!git checkout main 2>/dev/null || git checkout master 2>/dev/null";
+      upstream = "!git remote | grep -E '^upstream$'|| git remote | grep -E '^origin$'";
+      duster = "remote update origin --prune";
+      refresh = "!git switch-default && git pull \"$(git upstream)\" \"$(git current)\"";
+      all = "!git refresh && gh poi";
+      gui = "!lazygit";
+    };
+
+    extraConfig = {
+      user = {
+        # https://stackoverflow.com/questions/48065535/should-i-keep-gitconfigs-signingkey-private
+        # TODO: Share code to get the path with ./ssh.nix
+        signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
+      };
+
+      core = {
+        editor = "vim";
+        quotepath = false;
+      };
+
+      gpg = {
+        format = "ssh";
+      };
+
+      commit = {
+        # https://stackoverflow.com/questions/10161198/is-there-a-way-to-autosign-commits-in-git-with-a-gpg-key
+        gpgsign = true;
+      };
+
+      init = {
+        defaultBranch = "main";
+      };
+
+      color = {
+        ui = true;
+      };
+
+      grep = {
+        lineNumber = true;
+      };
+
+      pull = {
+        ff = "only";
+      };
+
+      credential = {
+        "https://github.com".helper = "!${pkgs.gh}/bin/gh auth git-credential";
+        "https://gist.github.com".helper = "!${pkgs.gh}/bin/gh auth git-credential";
+      };
+    };
+  };
 
+  # https://github.com/nix-community/home-manager/blob/master/modules/programs/lazygit.nix
   programs.lazygit = {
     enable = true;
 

home-manager/home.nix

@@ -16,6 +16,8 @@
   # TODO: How to cover lima? The default is /home/kachick.local
   home.homeDirectory = if pkgs.stdenv.isDarwin then "/Users/${config.home.username}" else "/home/${config.home.username}";
 
+  systemd.user.startServices = "sd-switch";
+
   # https://github.com/nix-community/home-manager/blob/master/modules/misc/xdg.nix
   xdg.enable = true;
 

home-manager/packages.nix

@@ -33,10 +33,6 @@
     # Required in many asdf plugins
     unzip
 
-    # In macOS, starting ssh-agent is still /usr/bin/ssh-agent even added the nixpkgs
-    # So avoiding to add it for now
-    # openssh
-
     git
     tig
     lazygit
@@ -97,6 +93,13 @@
     [
       # Fix missing locales as `locale: Cannot set LC_CTYPE to default locale`
       glibc
+
+      # https://github.com/nix-community/home-manager/blob/a8f8f48320c64bd4e3a266a850bbfde2c6fe3a04/modules/services/ssh-agent.nix#L37
+      openssh
+
+      # gnome3.gnome-keyring
+
+      keychain
     ]
   ) ++ (lib.optionals stdenv.isDarwin
     [

home-manager/ssh.nix

@@ -11,6 +11,23 @@ let
   # - id_*.pub: I CAN register them for different services.
 in
 {
+  # https://github.com/nix-community/home-manager/blob/master/modules/services/ssh-agent.nix
+  services.ssh-agent.enable = if pkgs.stdenv.isLinux then true else false;
+
+  # # https://github.com/nix-community/home-manager/blob/master/modules/services/gnome-keyring.nix
+  # services.gnome-keyring = {
+  #   enable = if pkgs.stdenv.isLinux then true else false;
+
+  #   components = [ "ssh" "secrets" "pkcs11" ];
+  # };
+
+  # https://github.com/nix-community/home-manager/blob/master/modules/programs/keychain.nix
+  programs.keychain = {
+    enable = true;
+    # https://github.com/nix-community/home-manager/blob/a8f8f48320c64bd4e3a266a850bbfde2c6fe3a04/modules/programs/keychain.nix#L35
+    keys = [ "id_ed25519" ];
+  };
+
   # These hosts are taken from the public resources of each provider.
   #   - https://docs.github.com/ja/authentication/keeping-your-account-and-data-secure/githubs-ssh-key-fingerprints
   #   - https://docs.gitlab.com/ee/user/gitlab_com/#ssh-known_hosts-entries
@@ -70,16 +87,19 @@ in
     matchBlocks = {
       "github.com" = {
         identityFile = "${sshDir}/id_ed25519";
+        identitiesOnly = true;
         user = "git";
       };
 
       "gitlab.com" = {
         identityFile = "${sshDir}/id_ed25519";
+        identitiesOnly = true;
         user = "git";
       };
 
       "bitbucket.org" = {
         identityFile = "${sshDir}/id_ed25519";
+        identitiesOnly = true;
         user = "git";
       };
     };

home-manager/zsh.nix

@@ -6,6 +6,7 @@
   programs.zoxide.enableZshIntegration = true;
   programs.fzf.enableZshIntegration = true;
   programs.rtx.enableZshIntegration = true;
+  programs.keychain.enableZshIntegration = true;
 
   # https://nixos.wiki/wiki/Zsh
   # https://github.com/nix-community/home-manager/blob/master/modules/programs/zsh.nix

home/.local/share/homemade/bin/add_nix_channels.bash

@@ -5,10 +5,10 @@ set -euxo pipefail
 # List of official resources:
 #   - https://channels.nixos.org
 #   - https://releases.nixos.org
-nix-channel --add https://releases.nixos.org/nixpkgs/nixpkgs-23.11pre509044.3acb5c4264c4/nixexprs.tar.xz nixpkgs
+nix-channel --add https://releases.nixos.org/nixpkgs/nixpkgs-23.11pre511546.844ffa82bbe2/nixexprs.tar.xz nixpkgs
 # nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixpkgs-unstable
 # nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz home-manager
-nix-channel --add https://github.com/nix-community/home-manager/archive/729ab77f9e998e0989fa30140ecc91e738bc0cb1.tar.gz home-manager
+nix-channel --add https://github.com/nix-community/home-manager/archive/a8f8f48320c64bd4e3a266a850bbfde2c6fe3a04.tar.gz home-manager
 nix-channel --update
 
 nix-channel --list