home-manager: use home.file to manage some config files

2 files changed, 10 insertions, 19 deletions

diff --git a/home-manager/modules/common.nix b/home-manager/modules/common.nix
index ad1201a..39e2492 100644
--- a/home-manager/modules/common.nix
+++ b/home-manager/modules/common.nix
@@ -92,6 +92,9 @@ in
     ".config/alacritty/alacritty.common.toml".source = ../../.config/alacritty/alacritty.common.toml;
     ".config/alacritty/alacritty.local.toml".source = ../../.config/alacritty/alacritty.${env.os}.toml;
     ".config/alacritty/alacritty.toml".source = ../../.config/alacritty/alacritty.toml;
+    ".config/fish/completions/git-sw.fish".source = ../../.config/fish/completions/git-sw.fish;
+    ".config/git/config".source = ../../.config/git/config;
+    ".config/git/ignore".source = ../../.config/git/ignore;
     ".config/sh/claude-code.sh".source = ../config/sh/claude-code.sh;
     ".config/skk/jisyo.L".source = "${pkgs.skkDictionaries.l}/share/skk/SKK-JISYO.L";
     ".config/vim/vimrc".source = ../../.config/vim/vimrc;
diff --git a/mitamae/default.rb b/mitamae/default.rb
index 9a614fc..9276656 100644
--- a/mitamae/default.rb
+++ b/mitamae/default.rb
@@ -25,34 +25,22 @@ directory "#{home}/.cache"
 directory "#{home}/.local/share"
 directory "#{home}/.local/state"
 
-execute "home-manager" do
+execute "home-manager switch" do
   command "nix run 'nixpkgs#home-manager' -- switch --flake '.##{node[:name]}'"
   not_if "type home-manager"
 end
 
-# These dotfiles are not managed by home-manager for now.
-
-link "#{home}/.config/git" do
-  to "#{home}/dotfiles/.config/git"
-end
 link "#{home}/.config/nvim" do
   to "#{home}/dotfiles/.config/nvim"
 end
-directory "#{home}/.config/fish"
-link "#{home}/.config/fish/completions" do
-  to "#{home}/dotfiles/.config/fish/completions"
-end
-
-# SKK
 directory "#{home}/.config/skk"
 
-# Rust
-execute "rustup: install nightly toolchain" do
-  command "rustup toolchain install nightly"
-  not_if "rustup toolchain list | grep nightly"
-end
-
 if node[:profile] == "private"
+  execute "rustup: install nightly toolchain" do
+    command "rustup toolchain install nightly"
+    not_if "rustup toolchain list | grep nightly"
+  end
+
   package "pkg-config"
   package "libssl-dev"
 
@@ -68,5 +56,5 @@ if node[:profile] == "private"
 end
 
 execute "home-manager switch" do
-  command "home-manager switch --flake '.##{node[:name]}'"
+  command "nix run 'nixpkgs#home-manager' -- switch --flake '.##{node[:name]}'"
 end