diff --git a/flake.nix b/flake.nix index b94d498ca..3c5db4e51 100644 --- a/flake.nix +++ b/flake.nix @@ -282,7 +282,15 @@ extraModules = [ ./profiles/yqrashawn.nix ./modules/yqrashawn/darwin/apps.nix - ./modules/yqrashawn/darwin/apps-minimal.nix + { homebrew.brewPrefix = "/opt/homebrew/bin"; } + ]; + }; + mini = mkDarwinConfig { + system = "aarch64-darwin"; + extraModules = [ + ./profiles/yqrashawn.nix + ./modules/yqrashawn/darwin/daemons/tailscale.nix + ./modules/yqrashawn/darwin/apps.nix { homebrew.brewPrefix = "/opt/homebrew/bin"; } ]; }; diff --git a/modules/yqrashawn/common.nix b/modules/yqrashawn/common.nix index 599a4fff9..ee28f4d9d 100644 --- a/modules/yqrashawn/common.nix +++ b/modules/yqrashawn/common.nix @@ -45,6 +45,7 @@ in { qbittorrent adguardhome tailscale + cloudflared # todoist-electron todoist zoom-us diff --git a/modules/yqrashawn/darwin/brew.nix b/modules/yqrashawn/darwin/brew.nix index 5d41c0e00..71b0b5456 100644 --- a/modules/yqrashawn/darwin/brew.nix +++ b/modules/yqrashawn/darwin/brew.nix @@ -46,7 +46,7 @@ # "proxychains-ng" "datalevin" "dotenv-linter" - "cloudflared" + # "cloudflared" "janet" "pngpaste" ]; diff --git a/modules/yqrashawn/darwin/daemons/tailscale.nix b/modules/yqrashawn/darwin/daemons/tailscale.nix index 2114a4a19..4fed4e358 100644 --- a/modules/yqrashawn/darwin/daemons/tailscale.nix +++ b/modules/yqrashawn/darwin/daemons/tailscale.nix @@ -4,6 +4,14 @@ launchd.daemons.tailscaled = { serviceConfig = { Label = "com.tailscale.tailscaled"; + EnvironmentVariables = { + http_proxy = "http://127.0.0.1:6152"; + https_proxy = "http://127.0.0.1:6152"; + all_proxy = "socks5://127.0.0.1:6153"; + HTTP_PROXY = "http://127.0.0.1:6152"; + HTTPS_PROXY = "http://127.0.0.1:6152"; + ALL_PROXY = "socks5://127.0.0.1:6153"; + }; ProgramArguments = [ "/bin/sh" "-c" diff --git a/modules/yqrashawn/home-manager/dotfiles/.authinfo.gpg b/modules/yqrashawn/home-manager/dotfiles/.authinfo.gpg index a3d7deb8e..5741c63a5 100644 Binary files a/modules/yqrashawn/home-manager/dotfiles/.authinfo.gpg and b/modules/yqrashawn/home-manager/dotfiles/.authinfo.gpg differ diff --git a/modules/yqrashawn/home-manager/dotfiles/karabiner.edn b/modules/yqrashawn/home-manager/dotfiles/karabiner.edn index 2d98d9d7e..bfe472356 100644 --- a/modules/yqrashawn/home-manager/dotfiles/karabiner.edn +++ b/modules/yqrashawn/home-manager/dotfiles/karabiner.edn @@ -425,8 +425,9 @@ [:quote [:togg "ClickUp"]] ;; [:t [:togg "Todoist"] :BusyCal] ;; [:t [:togg "BusyCal"] :!BusyCal] - [:t [:togg "BusyCal"] :Todoist] - [:t [:togg "Todoist"] :!Todoist] + [:t [:togg "BusyCal"]] + ;; [:t [:togg "BusyCal"] :Todoist] + ;; [:t [:togg "Todoist"] :!Todoist] ;; [:p [:togg "Adobe Photoshop 2022"]] [:p [:togg "Figma"]] ;; [:l [:f16 :!Sg :o :o :g :l :e :spacebar :!Sc :h :r :o :m :e