From 684969e72bcd1dac29a9dc61ea8f76c02a1701c5 Mon Sep 17 00:00:00 2001 From: Mariano Uvalle Date: Thu, 7 Aug 2025 16:38:04 -0700 Subject: [PATCH 1/4] Move secretive to a home module. Signed-off-by: Mariano Uvalle --- home-modules/secretive.nix | 9 +++++++++ hosts/macbook/home.nix | 1 + hosts/msft-mac/home.nix | 8 +------- 3 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 home-modules/secretive.nix diff --git a/home-modules/secretive.nix b/home-modules/secretive.nix new file mode 100644 index 0000000..b4d5b9c --- /dev/null +++ b/home-modules/secretive.nix @@ -0,0 +1,9 @@ +{ user, ... } : { + programs.ssh = { + enable = true; + extraConfig = '' +Host * + IdentityAgent ${user.homeDirectory}/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh + ''; + }; +} diff --git a/hosts/macbook/home.nix b/hosts/macbook/home.nix index 9e1da8a..0a7b2be 100644 --- a/hosts/macbook/home.nix +++ b/hosts/macbook/home.nix @@ -18,6 +18,7 @@ in { ../../home-modules/karabiner.nix ../../home-modules/lazygit.nix ../../home-modules/nvim.nix + ../../home-modules/secretive.nix ../../home-modules/starship.nix ../../home-modules/tmux.nix ../../home-modules/zsh.nix diff --git a/hosts/msft-mac/home.nix b/hosts/msft-mac/home.nix index e674811..43b6f9e 100644 --- a/hosts/msft-mac/home.nix +++ b/hosts/msft-mac/home.nix @@ -18,6 +18,7 @@ in { ../../home-modules/karabiner.nix ../../home-modules/lazygit.nix ../../home-modules/nvim.nix + ../../home-modules/nvim.nix ../../home-modules/starship.nix ../../home-modules/tmux.nix ../../home-modules/zsh.nix @@ -69,13 +70,6 @@ in { stateVersion = "25.05"; }; - programs.ssh = { - enable = true; - extraConfig = '' -Host * - IdentityAgent ${homeDirectory}/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh - ''; - }; programs.zsh = { shellAliases = { From 24fa6612d9a79de6aed076bffc81299c23d7368f Mon Sep 17 00:00:00 2001 From: Mariano Uvalle Date: Thu, 7 Aug 2025 16:38:35 -0700 Subject: [PATCH 2/4] [macbook] add chrome cask. Signed-off-by: Mariano Uvalle --- hosts/macbook/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/macbook/configuration.nix b/hosts/macbook/configuration.nix index b43ac2e..8c37ce0 100644 --- a/hosts/macbook/configuration.nix +++ b/hosts/macbook/configuration.nix @@ -46,6 +46,7 @@ "logi-options+" "insta360-link-controller" "yubico-authenticator" # TODO: Defer to a module that manages yubikeys for darwin. + "google-chrome" ]; }; From 039d521e1af24fee06c4d6bebdf53ec6eed44e78 Mon Sep 17 00:00:00 2001 From: Mariano Uvalle Date: Thu, 7 Aug 2025 16:39:13 -0700 Subject: [PATCH 3/4] [mac] disable ^Space keymap. Signed-off-by: Mariano Uvalle --- hosts/macbook/hotkeys.nix | 1 + hosts/msft-mac/hotkeys.nix | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hosts/macbook/hotkeys.nix b/hosts/macbook/hotkeys.nix index e010d9b..56af3b1 100644 --- a/hosts/macbook/hotkeys.nix +++ b/hosts/macbook/hotkeys.nix @@ -57,6 +57,7 @@ let # If you want to keep some hotkeys enabled, simply comment them out or remove them from the following list. disableHotKeys = with hotkeyEnums; [ showSpotlightSearch + selectPreviousInputSource ]; enabledHotKeys = with hotkeyEnums; [ diff --git a/hosts/msft-mac/hotkeys.nix b/hosts/msft-mac/hotkeys.nix index 6d56148..c1edc7a 100644 --- a/hosts/msft-mac/hotkeys.nix +++ b/hosts/msft-mac/hotkeys.nix @@ -55,7 +55,9 @@ let # Define which hotkeys you want to disable # If you want to disable all hotkeys, you can use the `hotkeyEnums` directly # If you want to keep some hotkeys enabled, simply comment them out or remove them from the following list. - disableHotKeys = with hotkeyEnums; []; + disableHotKeys = with hotkeyEnums; [ + selectPreviousInputSource + ]; enabledHotKeys = with hotkeyEnums; [ moveLeftASpace From 79aefc3ceeec05c04c083858c0c63629b7d186d5 Mon Sep 17 00:00:00 2001 From: jmug Date: Thu, 7 Aug 2025 16:42:01 -0700 Subject: [PATCH 4/4] [macbook] git. Signed-off-by: jmug --- hosts/macbook/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/macbook/home.nix b/hosts/macbook/home.nix index 0a7b2be..575fb0e 100644 --- a/hosts/macbook/home.nix +++ b/hosts/macbook/home.nix @@ -14,6 +14,7 @@ in { ../../home-modules/default.nix ../../home-modules/direnv.nix ../../home-modules/ghostty-config.nix + ../../home-modules/git.nix ../../home-modules/homebrew.nix ../../home-modules/karabiner.nix ../../home-modules/lazygit.nix