From f3c7189f3a5c244193411305e52b318747784527 Mon Sep 17 00:00:00 2001 From: vancycles-knak Date: Wed, 9 Jul 2025 13:37:31 -0700 Subject: [PATCH 1/2] update --- nix-darwin/home-modules/programs/cloud.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nix-darwin/home-modules/programs/cloud.nix b/nix-darwin/home-modules/programs/cloud.nix index 06865d2a..ae5599f8 100644 --- a/nix-darwin/home-modules/programs/cloud.nix +++ b/nix-darwin/home-modules/programs/cloud.nix @@ -24,6 +24,7 @@ (lib.mkIf config.awscli.enable [ ssm-session-manager-plugin awscli2 + aws-sam-cli rclone ]) From 8c4f850c6050b3edbde631452847c12c958d8243 Mon Sep 17 00:00:00 2001 From: vancycles-knak Date: Wed, 9 Jul 2025 17:43:07 -0700 Subject: [PATCH 2/2] small fixes --- .config/spacemacs/.spacemacs | 57 ++++++++++++++++----------------- nix-darwin/users/henri/home.nix | 4 +-- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/.config/spacemacs/.spacemacs b/.config/spacemacs/.spacemacs index 9a98440a..536c372a 100644 --- a/.config/spacemacs/.spacemacs +++ b/.config/spacemacs/.spacemacs @@ -878,47 +878,46 @@ _p_rev _u_pper _=_: upper/lower _r_esolve ("@bug" . ?b) ("@feature" . ?u) ("@spike" . ?j) - (:endgroup . nil) - - ;; Ticket flags - ("@write_future_ticket" . ?w) ("@emergency" . ?e) - ("@research" . ?r) - - ;; Meeting types - (:startgroup . nil) - ("sprint_planning" . ?i) - ("sprint_retro" . ?s) (:endgroup . nil) ;; Code TODOs tags - ("QA" . ?q) ("backend" . ?k) - ("broken_code" . ?c) ("frontend" . ?f) ("devops" . ?d) - ;; Special tags - ("CRITICAL" . ?x) - ("obstacle" . ?o) - - ;; Meeting tags - ("general" . ?l) - ("meeting" . ?m) - ("misc" . ?z) + ;; tasks TODOs + (:startgroup . nil) + ("homelab" . ?h) + ("3d_printer" . ?3) + ("maintenance" . ?m) ("planning" . ?p) + ("workout" . ?w) + (:endgroup . nil) + + ;; chinese tags + (:startgroup . nil) + ("noun" . ?n) + ("verb" . ?v) + ("adjective" . ?a) + ("adverb" . ?z) + (:endgroup . nil) - ;; Work Log Tags - ("accomplishment" . ?a) )) (setq org-tag-faces '( - ("planning" . (:foreground "#cba6f7" :weight bold)) ; Mauve - ("backend" . (:foreground "#89b4fa" :weight bold)) ; Blue - ("frontend" . (:foreground "#a6e3a1" :weight bold)) ; Green - ("QA" . (:foreground "#fab387" :weight bold)) ; Peach - ("meeting" . (:foreground "#f9e2af" :weight bold)) ; Yellow - ("CRITICAL" . (:foreground "#f38ba8" :weight bold)) ; Red + ("@bug" . (:foreground "#f38ba8" :background "#313244" :weight bold)) ; Red on surface0 + ("@feature" . (:foreground "#a6e3a1" :background "#313244" :weight bold)) ; Green on surface0 + ("@spike" . (:foreground "#cba6f7" :background "#313244" :weight bold)) ; Mauve on surface0 + ("@emergency" . (:foreground "#fab387" :background "#45475a" :weight bold :box t)) ; Peach on surface1 with box + ("homelab" . (:foreground "#89b4fa" :weight bold)) ; Blue + ("3d_printer" . (:foreground "#a6e3a1" :weight bold)) ; Green + ("maintenance" . (:foreground "#f9e2af" :weight bold)) ; Yellow + ("planning" . (:foreground "#f38ba8" :weight bold)) ; Red + ("noun" . (:foreground "#fab387" :weight bold)) ; Peach + ("verb" . (:foreground "#cba6f7" :weight bold)) ; Mauve + ("adjective" . (:foreground "#94e2d5" :weight bold)) ; Teal + ("adverb" . (:foreground "#f5c2e7" :weight bold)) ; Pink )) ;; --- org-modern --- (setq org-adapt-indentation t @@ -1026,7 +1025,7 @@ _p_rev _u_pper _=_: upper/lower _r_esolve (defun connect-macos() "Open a remote folder using TRAMP in Dired." (interactive) - (dired "/ssh:macos@192.168.4.245:/")) + (dired "/ssh:mac@192.168.4.167:/")) (defun connect-pi () "Open a remote folder using TRAMP in Dired." diff --git a/nix-darwin/users/henri/home.nix b/nix-darwin/users/henri/home.nix index e3c27634..1d00362f 100644 --- a/nix-darwin/users/henri/home.nix +++ b/nix-darwin/users/henri/home.nix @@ -38,8 +38,8 @@ }; macos = { # ssh macos - hostname = "192.168.4.245"; - user = "macos"; + hostname = "192.168.4.167"; + user = "mac"; }; factorio = { # ssh factorio