diff --git a/home/base/desktop/alacritty/default.nix b/home/base/desktop/alacritty/default.nix index 028d1106..812448da 100644 --- a/home/base/desktop/alacritty/default.nix +++ b/home/base/desktop/alacritty/default.nix @@ -64,7 +64,7 @@ family: JetBrainsMono Nerd Font '' + (if pkgs.stdenv.isDarwin then '' # Point size - size: 16 + size: 14 shell: # force nushell as default shell on macOS program: /run/current-system/sw/bin/nu '' else '' diff --git a/home/base/desktop/kitty.nix b/home/base/desktop/kitty.nix index 3ba00692..e95e9500 100644 --- a/home/base/desktop/kitty.nix +++ b/home/base/desktop/kitty.nix @@ -5,7 +5,7 @@ font = { name = "JetBrainsMono Nerd Font"; # use different font size on macOS - size = if pkgs.stdenv.isDarwin then 16 else 13; + size = if pkgs.stdenv.isDarwin then 14 else 13; }; settings = { diff --git a/home/base/server/starship.nix b/home/base/server/starship.nix index 7a7267e2..0f486b86 100644 --- a/home/base/server/starship.nix +++ b/home/base/server/starship.nix @@ -1,8 +1,9 @@ -{ config, ... }: { +{ ... }: { programs.starship = { enable = true; enableBashIntegration = true; + enableZshIntegration = true; enableNushellIntegration = true; settings = { diff --git a/home/darwin/rime-squirrel.nix b/home/darwin/rime-squirrel.nix index 07f94e59..15f9e34e 100644 --- a/home/darwin/rime-squirrel.nix +++ b/home/darwin/rime-squirrel.nix @@ -1,6 +1,11 @@ -{ pkgs, ... }: +{ lib, pkgs, ... }: { + # remove existing rime data (squirrel) + home.activation.removeExistingRimeData = lib.hm.dag.entryBefore [ "checkLinkTargets" ] '' + rm -rf "~/Library/Rime/build/flypy.prism.bin" + ''; + # Squirrel Input Method home.file."Library/Rime" = { # my custom squirrel data (flypy input method) diff --git a/secrets/darwin.nix b/secrets/darwin.nix index cfdb77ea..1b947c81 100644 --- a/secrets/darwin.nix +++ b/secrets/darwin.nix @@ -47,7 +47,8 @@ }; }; - # activationScripts are executed every time you boot the system or run `nixos-rebuild` / `darwin-rebuild`. + # activationScripts are executed every time you run `nixos-rebuild` / `darwin-rebuild`. + # but not when you reboot the system, so currently you need to run those commands manually after reboot... system.activationScripts.postUserActivation.text = '' sudo chmod 644 /etc/agenix/alias-for-work.nushell sudo chmod 644 /etc/agenix/alias-for-work.bash