diff --git a/modules/common/applications/1password.nix b/modules/common/applications/1password.nix index 2c86b5e..e43a4eb 100644 --- a/modules/common/applications/1password.nix +++ b/modules/common/applications/1password.nix @@ -16,9 +16,13 @@ }; # https://1password.community/discussion/135462/firefox-extension-does-not-connect-to-linux-app - # Doesn't seem to fix the issue on macOS anyway + # On Mac, does not apply: https://1password.community/discussion/142794/app-and-browser-integration + # However, the button doesn't work either: + # https://1password.community/discussion/140735/extending-support-for-trusted-web-browsers environment.etc."1password/custom_allowed_browsers".text = '' - ${config.home-manager.users.${config.user}.programs.firefox.package} + ${ + config.home-manager.users.${config.user}.programs.firefox.package + }/Applications/Firefox.app/Contents/MacOS/firefox firefox ''; }; diff --git a/modules/common/shell/fish/functions/fish_user_key_bindings.fish b/modules/common/shell/fish/functions/fish_user_key_bindings.fish index c8b45d6..9d68563 100644 --- a/modules/common/shell/fish/functions/fish_user_key_bindings.fish +++ b/modules/common/shell/fish/functions/fish_user_key_bindings.fish @@ -18,3 +18,5 @@ bind -M insert \cn 'commandline -r "nix shell nixpkgs#"' bind -M default \cn 'commandline -r "nix shell nixpkgs#"' bind -M insert \x11F nix-fzf bind -M default \x11F nix-fzf +bind -M insert \ch _atuin_search --filter-mode global +bind -M default \ch _atuin_search --filter-mode global diff --git a/modules/darwin/homebrew.nix b/modules/darwin/homebrew.nix index ca1b84b..03997b3 100644 --- a/modules/darwin/homebrew.nix +++ b/modules/darwin/homebrew.nix @@ -31,7 +31,7 @@ casks = [ "1password" # 1Password will not launch from Nix on macOS "apache-directory-studio" # Packaging on Nix is not available for macOS - "gitify" # Git notifications in menu bar + # "gitify" # Git notifications in menu bar (downgrade manually from 4.6.1) "keybase" # GUI on Nix not available for macOS # "logitech-g-hub" # Mouse and keyboard management "logitune" # Logitech webcam firmware diff --git a/modules/darwin/system.nix b/modules/darwin/system.nix index e9ccb3e..32a3b36 100644 --- a/modules/darwin/system.nix +++ b/modules/darwin/system.nix @@ -154,11 +154,15 @@ echo "Show the ~/Library folder" chflags nohidden ~/Library - echo "Enable dock magnification" - defaults write com.apple.dock magnification -bool true + if [ ! $(defaults read com.apple.dock magnification) = "1" ]; then + echo "Enable dock magnification" + defaults write com.apple.dock magnification -bool true + fi - echo "Set dock magnification size" - defaults write com.apple.dock largesize -int 48 + if [ ! $(defaults read com.apple.dock largesize) = "48" ]; then + echo "Set dock magnification size" + defaults write com.apple.dock largesize -int 48 + fi echo "Define dock icon function" __dock_item() {