Skip to content

Commit b28b608

Browse files
authored
Merge pull request #19 from vancycles-knak/main
update
2 parents 0b4f00d + 8c4f850 commit b28b608

File tree

3 files changed

+31
-31
lines changed

3 files changed

+31
-31
lines changed

.config/spacemacs/.spacemacs

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -878,47 +878,46 @@ _p_rev _u_pper _=_: upper/lower _r_esolve
878878
("@bug" . ?b)
879879
("@feature" . ?u)
880880
("@spike" . ?j)
881-
(:endgroup . nil)
882-
883-
;; Ticket flags
884-
("@write_future_ticket" . ?w)
885881
("@emergency" . ?e)
886-
("@research" . ?r)
887-
888-
;; Meeting types
889-
(:startgroup . nil)
890-
("sprint_planning" . ?i)
891-
("sprint_retro" . ?s)
892882
(:endgroup . nil)
893883

894884
;; Code TODOs tags
895-
("QA" . ?q)
896885
("backend" . ?k)
897-
("broken_code" . ?c)
898886
("frontend" . ?f)
899887
("devops" . ?d)
900888

901-
;; Special tags
902-
("CRITICAL" . ?x)
903-
("obstacle" . ?o)
904-
905-
;; Meeting tags
906-
("general" . ?l)
907-
("meeting" . ?m)
908-
("misc" . ?z)
889+
;; tasks TODOs
890+
(:startgroup . nil)
891+
("homelab" . ?h)
892+
("3d_printer" . ?3)
893+
("maintenance" . ?m)
909894
("planning" . ?p)
895+
("workout" . ?w)
896+
(:endgroup . nil)
897+
898+
;; chinese tags
899+
(:startgroup . nil)
900+
("noun" . ?n)
901+
("verb" . ?v)
902+
("adjective" . ?a)
903+
("adverb" . ?z)
904+
(:endgroup . nil)
910905

911-
;; Work Log Tags
912-
("accomplishment" . ?a)
913906
))
914907
(setq org-tag-faces
915908
'(
916-
("planning" . (:foreground "#cba6f7" :weight bold)) ; Mauve
917-
("backend" . (:foreground "#89b4fa" :weight bold)) ; Blue
918-
("frontend" . (:foreground "#a6e3a1" :weight bold)) ; Green
919-
("QA" . (:foreground "#fab387" :weight bold)) ; Peach
920-
("meeting" . (:foreground "#f9e2af" :weight bold)) ; Yellow
921-
("CRITICAL" . (:foreground "#f38ba8" :weight bold)) ; Red
909+
("@bug" . (:foreground "#f38ba8" :background "#313244" :weight bold)) ; Red on surface0
910+
("@feature" . (:foreground "#a6e3a1" :background "#313244" :weight bold)) ; Green on surface0
911+
("@spike" . (:foreground "#cba6f7" :background "#313244" :weight bold)) ; Mauve on surface0
912+
("@emergency" . (:foreground "#fab387" :background "#45475a" :weight bold :box t)) ; Peach on surface1 with box
913+
("homelab" . (:foreground "#89b4fa" :weight bold)) ; Blue
914+
("3d_printer" . (:foreground "#a6e3a1" :weight bold)) ; Green
915+
("maintenance" . (:foreground "#f9e2af" :weight bold)) ; Yellow
916+
("planning" . (:foreground "#f38ba8" :weight bold)) ; Red
917+
("noun" . (:foreground "#fab387" :weight bold)) ; Peach
918+
("verb" . (:foreground "#cba6f7" :weight bold)) ; Mauve
919+
("adjective" . (:foreground "#94e2d5" :weight bold)) ; Teal
920+
("adverb" . (:foreground "#f5c2e7" :weight bold)) ; Pink
922921
))
923922
;; --- org-modern ---
924923
(setq org-adapt-indentation t
@@ -1026,7 +1025,7 @@ _p_rev _u_pper _=_: upper/lower _r_esolve
10261025
(defun connect-macos()
10271026
"Open a remote folder using TRAMP in Dired."
10281027
(interactive)
1029-
(dired "/ssh:macos@192.168.4.245:/"))
1028+
(dired "/ssh:mac@192.168.4.167:/"))
10301029

10311030
(defun connect-pi ()
10321031
"Open a remote folder using TRAMP in Dired."

nix-darwin/home-modules/programs/cloud.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
(lib.mkIf config.awscli.enable [
2525
ssm-session-manager-plugin
2626
awscli2
27+
aws-sam-cli
2728
rclone
2829
])
2930

nix-darwin/users/henri/home.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
};
3939
macos = {
4040
# ssh macos
41-
hostname = "192.168.4.245";
42-
user = "macos";
41+
hostname = "192.168.4.167";
42+
user = "mac";
4343
};
4444
factorio = {
4545
# ssh factorio

0 commit comments

Comments
 (0)