update

home-manager/default.nix

@@ -1,6 +1,8 @@
 { system, nixpkgs, emacs-overlay }:
 let
   lib = nixpkgs.lib;
+
+  # packages
   pkgs = import nixpkgs {
     inherit system;
     config.allowUnfree = true;
@@ -10,7 +12,12 @@ let
   advancedPkgs = import ./packages/advanced.nix { inherit pkgs; };
   darwinPkgs = import ./packages/darwin { inherit pkgs; };
   nixosPkgs = import ./packages/nixos { inherit pkgs; };
+
+  # programs
+  programs = import ./programs;
 in {
+  imports = programs;
+
   home.stateVersion = "24.11";
   home.packages = basicPkgs ++ advancedPkgs
     ++ lib.optionals pkgs.stdenv.isDarwin darwinPkgs

home-manager/programs/default.nix

@@ -0,0 +1,4 @@
+let
+  git = import ./git;
+in
+[git]

home-manager/programs/git/default.nix

@@ -0,0 +1,102 @@
+{
+  home.file.".config/git/message" = {
+    source = ./message;
+  };
+
+  programs.git = {
+    enable = true;
+
+    aliases = {
+      st = "status";
+      br = "branch";
+      co = "commit";
+      ch = "checkout";
+      ad = "add";
+      rs = "restore";
+      sw = "switch";
+      fix = "commit --amend --no-edit";
+    };
+
+    ignores = [ "*.swp" "*.save" "*.fasl" "*~" ".DS_Store" ];
+
+    extraConfig = {
+      core = {
+        editor = "emacs -nw";
+        quotepath = "off";
+        ignorecase = false;
+        safecrlf = true;
+        autocrlf = false;
+        precomposeunicode = true;
+        untrackedCache = true;
+        fsmonitor = true;
+      };
+
+      commit = {
+        template = "~/.config/git/message";
+        gpgsign = true;
+      };
+
+      user = {
+        name = "takeokunn";
+        email = "[email protected]";
+        signingkey = "0B10DAA7BA0236D7382287660F79C0AB03FD7A1C";
+      };
+
+      ghq = {
+        root = "~/.ghq";
+      };
+
+      fetch = {
+        prune = true;
+        writeCommitGraph= true;
+      };
+
+      pull = {
+        rebase = false;
+      };
+
+      push = {
+        default = "nothing";
+      };
+
+      github = {
+        user = "takeokunn";
+      };
+
+      gpg = {
+        program = "gpg";
+      };
+
+      diff = {
+        patience = true;
+      };
+
+      color = {
+        ui = "auto";
+        status = "auto";
+        diff = "auto";
+        branch = "auto";
+        interactive = "auto";
+        grep = "auto";
+      };
+
+      url = {
+        "[email protected]:".insteadOf = "https://github.com/";
+      };
+
+      init = {
+        defaultBranch = "main";
+      };
+
+      rerere = {
+        enabled = true;
+      };
+
+      rebase = {
+        autoStash = true;
+        abbreviateCommands = true;
+        autosquash = true;
+      };
+    };
+  };
+}

home-manager/programs/git/message

@@ -0,0 +1,20 @@
+
+
+# ==== Emojis ====
+#  :bug: バグ修正
+#  :+1: 機能改善
+#  :sparkles: 部分的な機能追加
+#  :tada: 盛大に祝うべき大きな機能追加
+#  :recycle: リファクタリング
+#  :shower: 不要な機能・使われなくなった機能の削除
+#  :green_heart: テストやCIの修正・改善
+#  :shirt: Lintエラーの修正やコードスタイルの修正
+#  :rocket: パフォーマンス改善
+#  :up: 依存パッケージなどのアップデート
+#  :lock: 新機能の公開範囲の制限
+#  :cop: セキュリティ関連の改善
+
+# ==== Format ====
+# :emoji: Subject
+#
+# Commit body...

home-manager/systems/darwin.nix

@@ -0,0 +1,11 @@
+{ pkgs }:
+with pkgs; [
+  pinentry_mac
+  terminal-notifier
+
+  # for emacs
+  mu
+  emacs-git
+  pinentry-emacs
+  emacsPackages.mu4e
+]

home-manager/systems/linux.nix

@@ -0,0 +1,8 @@
+{ pkgs }:
+with pkgs; [
+  # for emacs
+  emacs-git
+  mu
+  pinentry-emacs
+  emacsPackages.mu4e
+]

nixos/default.nix

@@ -88,8 +88,7 @@
 
   programs = {
     fish.enable = true;
-
-    gnupg = { agent = { enable = true; }; };
+    gnupg.agent.enable = true;
 
     sway = {
       enable = true;
@@ -100,9 +99,6 @@
 
   system = {
     stateVersion = "24.11";
-
-    # MEMO: 有効にしたい
-    autoUpgrade.enable = false;
   };
 
   fonts = {