Skip to content

Commit ff18f7e

Browse files
update
1 parent 486566e commit ff18f7e

File tree

6 files changed

+44
-30
lines changed

6 files changed

+44
-30
lines changed

.config/spacemacs/.spacemacs

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -881,18 +881,14 @@ _p_rev _u_pper _=_: upper/lower _r_esolve
881881
("@emergency" . ?e)
882882
(:endgroup . nil)
883883

884-
;; Code TODOs tags
885-
("backend" . ?k)
886-
("frontend" . ?f)
887-
("devops" . ?d)
888-
889884
;; tasks TODOs
890885
(:startgroup . nil)
891886
("homelab" . ?h)
892887
("3d_printer" . ?3)
893888
("maintenance" . ?m)
894889
("planning" . ?p)
895890
("workout" . ?w)
891+
("linux" . ?l)
896892
(:endgroup . nil)
897893

898894
;; chinese tags
@@ -911,6 +907,7 @@ _p_rev _u_pper _=_: upper/lower _r_esolve
911907
("@spike" . (:foreground "#cba6f7" :background "#313244" :weight bold)) ; Mauve on surface0
912908
("@emergency" . (:foreground "#fab387" :background "#45475a" :weight bold :box t)) ; Peach on surface1 with box
913909
("homelab" . (:foreground "#89b4fa" :weight bold)) ; Blue
910+
("linux" . (:foreground "#89b4fa" :weight bold)) ; Blue
914911
("3d_printer" . (:foreground "#a6e3a1" :weight bold)) ; Green
915912
("maintenance" . (:foreground "#f9e2af" :weight bold)) ; Yellow
916913
("planning" . (:foreground "#f38ba8" :weight bold)) ; Red
@@ -945,24 +942,28 @@ _p_rev _u_pper _=_: upper/lower _r_esolve
945942
(setq org-capture-templates
946943
'(
947944
("j" "Work Log Entry"
948-
entry (file+datetree "~/Documents/zettelkasten/org-roam/org/work/work-log.org")
945+
entry (file+datetree "~/Documents/zettelkasten/org/work/work-log.org")
949946
"* %^{Task} \n:PROPERTIES:\n:END:\n"
950947
:empty-lines 0)
951948
("c" "Code To-Do"
952-
entry (file+headline "~/Documents/zettelkasten/org-roam/org/work/todo.org" "Code Related Tasks")
949+
entry (file+headline "~/Documents/zettelkasten/org/work/todo.org" "Code Related Tasks")
953950
"* TODO [#C] %?\n:PROPERTIES:\n:Effort: $^{Effort}\n:Weight: $^{Weight}\n:END:\nDEADLINE: %^T\n:Created: %T\n%i\n%a\nShortcut Ticket: \nProposed Solution: \n"
954951
:empty-lines 0)
955952
("g" "General To-Do"
956-
entry (file+headline "~/Documents/zettelkasten/org-roam/org/home/todo.org" "General TODOS")
953+
entry (file+headline "~/Documents/zettelkasten/org/home/todo.org" "General TODOS")
957954
"* TODO [#E] %?\n:Created: %T\n "
958955
:empty-lines 0)
959956
("l" "Learning note"
960-
entry (file+headline "~/Documents/zettelkasten/org-roam/org/home/learning.org" "Learning Notes")
957+
entry (file+headline "~/Documents/zettelkasten/org/home/learning.org" "Learning Notes")
961958
"* %^{Subject} \n:PROPERTIES:\n:END:\n** %?"
962959
:empty-lines 0)
960+
("b" "Book note"
961+
entry (file+headline "~/Documents/zettelkasten/org/home/books.org" "Book Notes")
962+
"* %^{Subject}\n:PROPERTIES:\n:Title: %^{Title}\n:Author: %^{Author}\n:END:\n** Notes\n%?"
963+
:empty-lines 0)
963964
("m" "Meeting"
964-
entry (file+datetree "~/Documents/zettelkasten/org-roam/org/work/meetings.org")
965-
"* %? :meeting:%^g \n:Created: %T\n** Attendees\n*** \n** Notes\n** Action Items\n*** TODO [#A] "
965+
entry (file+datetree "~/Documents/zettelkasten/org/work/meetings.org")
966+
"* %^{meeting} :meeting:%^g\n:PROPERTIES:\n:Created: %T\n:END:\n** Attendees\n*** \n** Notes\n** Action Items\n*** TODO [#A] "
966967
:tree-type week
967968
:clock-in t
968969
:clock-resume t

nix-darwin/flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
config = {
124124
allowUnfree = true;
125125
permittedInsecurePackages = [
126-
"electron-32.3.3"
126+
"electron-35.7.1"
127127
"beekeeper-studio-5.2.12"
128128
];
129129
};

nix-darwin/home-modules/languages/nix.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
{
88

99
options = {
10-
nix.lsp.enable = lib.mkOption {
10+
languages.nix.lsp.enable = lib.mkOption {
1111
type = lib.types.bool;
1212
description = "Enables nix lsp";
1313
default = true;
1414
};
1515
};
16-
config = lib.mkIf config.nix.lsp.enable {
16+
config = lib.mkIf config.languages.nix.lsp.enable {
1717
home.packages = with pkgs; [
1818
nixfmt-rfc-style
1919
nixd # https://emacs-lsp.github.io/lsp-mode/page/lsp-nix-nixd/

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@
3030
"..." = "cd ../..";
3131
"...." = "cd ../../..";
3232
};
33+
shellGlobalAliases = {
34+
docker-crmAll = "docker rm -f (docker ps -aq)";
35+
docker-irmAll = "docker rmi -f (docker images -aq)";
36+
docker-vrmAll = "docker volume prune";
37+
docker-prmAll = "docker builder prune -af";
38+
docker-clean = "docker system prune -af"; # remove all containers, images, volumes, and networks without destroying running containers/images
39+
};
3340
};
3441
};
3542
}

nix-darwin/users/henri.vandersleyen/configuration.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
};
2929
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; # for nix.nix
3030
};
31+
3132
nixpkgs = {
3233
hostPlatform = "aarch64-darwin";
3334
config.allowUnfree = true;

nix-darwin/users/henri.vandersleyen/home.nix

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -59,24 +59,29 @@
5959
};
6060

6161
# languages
62-
python.lsp.enable = true;
63-
jsts.lsp.enable = true;
62+
languages = {
63+
python.lsp.enable = true;
64+
jsts.lsp.enable = true;
65+
};
6466

6567
# programs
66-
codium.enable = true;
67-
arc-browser.enable = true;
68-
fish.enable = true;
69-
zsh.enable = true;
70-
nh.flakeLocation = "/Users/${meta.username}/Documents/dotFiles/nix-darwin";
71-
keychain.enable = true;
72-
keychain.keys = "/home/${meta.username}/.ssh/knak";
73-
74-
git = {
75-
# userEmail = config.sops.secrets."knak/email".path;
76-
userEmail = "henri.vandersleyen@knak.com";
77-
# userName = config.sops.secrets."knak/git/userName".path;
78-
userName = "vancycles-knak";
79-
signingKey = config.sops.secrets."knak/git/keyName".path;
68+
program = {
69+
arc-browser.enable = true;
70+
codium.enable = false;
71+
fish.enable = true;
72+
zsh.enable = true;
73+
nh.flakeLocation = "/Users/${meta.username}/Documents/dotFiles/nix-darwin";
74+
keychain = {
75+
enable = true;
76+
keys = [ "/home/${meta.username}/.ssh/knak" ];
77+
};
78+
git = {
79+
# userEmail = config.sops.secrets."knak/email".path;
80+
userEmail = "henri.vandersleyen@knak.com";
81+
# userName = config.sops.secrets."knak/git/userName".path;
82+
userName = "vancycles-knak";
83+
signingKey = config.sops.secrets."knak/git/keyName".path;
84+
};
8085
};
8186

8287
home = {

0 commit comments

Comments
 (0)