chore: misc

yqrashawn · Jun 14, 2023 · 15a67c0 · 15a67c0
1 parent 5ab66b5
commit 15a67c0
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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