diff --git a/home/base/desktop/alacritty/default.nix b/home/base/desktop/alacritty/default.nix index 812448da..028d1106 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: 14 + size: 16 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 23093da0..1f68f7e3 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 14 else 13; + size = if pkgs.stdenv.isDarwin then 16 else 13; }; settings = { diff --git a/modules/darwin/apps.nix b/modules/darwin/apps.nix index 481d5cbb..959407d6 100644 --- a/modules/darwin/apps.nix +++ b/modules/darwin/apps.nix @@ -53,7 +53,8 @@ # customize macOS NSGlobalDomain = { - "com.apple.swipescrolldirection" = true; # enable natural scrolling + # `defaults read NSGlobalDomain "xxx"` + "com.apple.swipescrolldirection" = true; # enable natural scrolling(default to true) "com.apple.sound.beep.feedback" = 0; # disable beep sound when pressing volume up/down key AppleInterfaceStyle = "Dark"; # dark mode AppleKeyboardUIMode = 3; # Mode 3 enables full keyboard control. @@ -127,9 +128,11 @@ remapCapsLockToControl = false; # remap caps lock to control, useful for emac users remapCapsLockToEscape = true; # remap caps lock to escape, useful for vim users - # swap left command and left alt, + # swap left command and left alt # so it matches common keyboard layout: `ctrl | command | alt` - swapLeftCommandAndLeftAlt = true; + # + # disabled, caused only problems! + swapLeftCommandAndLeftAlt = false; }; }; @@ -142,6 +145,8 @@ HOMEBREW_PIP_INDEX_URL = "https://pypi.tuna.tsinghua.edu.cn/simple"; }; + + # homebrew need to be installed manually, see https://brew.sh homebrew = { # TODO Homebrew install takes a long time, # So only enable this when you make changes. diff --git a/scripts/darwin_set_proxy.py b/scripts/darwin_set_proxy.py index 53552eb9..14c0bf28 100644 --- a/scripts/darwin_set_proxy.py +++ b/scripts/darwin_set_proxy.py @@ -12,8 +12,7 @@ from pathlib import Path NIX_DAEMON_PLIST = Path("/Library/LaunchDaemons/org.nixos.nix-daemon.plist") NIX_DAEMON_NAME = "org.nixos.nix-daemon" # http proxy provided by clash -# HTTP_PROXY = "http://127.0.0.1:7890" -HTTP_PROXY = "http://192.168.5.201:7890" +HTTP_PROXY = "http://127.0.0.1:7890" pl = plistlib.loads(NIX_DAEMON_PLIST.read_bytes())