From 91f0f093441005d053a3874d9c81f7061add2cc1 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Mon, 18 Mar 2024 22:06:34 -0500 Subject: [PATCH] feat: vikunja Signed-off-by: jolheiser --- .git-age.yaml | 2 ++ .gitattributes | 1 + flake.lock | 6 +++--- machines/dragonwell/caddy.nix | 33 ++++++++++++++++--------------- machines/dragonwell/default.nix | 2 +- machines/dragonwell/dex.nix | Bin 1165 -> 1435 bytes machines/dragonwell/vikunja.nix | Bin 0 -> 714 bytes secrets/personal/dex-vikunja.age | Bin 0 -> 418 bytes secrets/secrets.nix | 1 + 9 files changed, 25 insertions(+), 20 deletions(-) create mode 100644 machines/dragonwell/vikunja.nix create mode 100644 secrets/personal/dex-vikunja.age diff --git a/.git-age.yaml b/.git-age.yaml index 997548f..9b0fe6b 100644 --- a/.git-age.yaml +++ b/.git-age.yaml @@ -4,3 +4,5 @@ machines/common/cifs.nix: - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 machines/dragonwell/dex.nix: - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 +machines/dragonwell/vikunja.nix: + - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 diff --git a/.gitattributes b/.gitattributes index bbc97fa..7fa6de1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,3 +2,4 @@ apps/gui/firefox/work.nix filter=git-age diff=git-age machines/common/cifs.nix filter=git-age diff=git-age machines/dragonwell/dex.nix filter=git-age diff=git-age +machines/dragonwell/vikunja.nix filter=git-age diff=git-age diff --git a/flake.lock b/flake.lock index bddb210..635e8f2 100644 --- a/flake.lock +++ b/flake.lock @@ -281,11 +281,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706925685, - "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", + "lastModified": 1710827359, + "narHash": "sha256-/KY8hffTh9SN/tTcDn/FrEiYwTXnU8NKnr4D7/stmmA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "79a13f1437e149dc7be2d1290c74d378dad60814", + "rev": "5710127d9693421e78cca4f74fac2db6d67162b1", "type": "github" }, "original": { diff --git a/machines/dragonwell/caddy.nix b/machines/dragonwell/caddy.nix index 5169210..51099ae 100644 --- a/machines/dragonwell/caddy.nix +++ b/machines/dragonwell/caddy.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + pkgs, + config, + ... +}: { services.caddy = { enable = true; virtualHosts = { @@ -43,21 +47,18 @@ ` ''; }; - "git.jolheiser.com" = { - extraConfig = '' - reverse_proxy localhost:8449 - ''; - }; - "social.jolheiser.com" = { - extraConfig = '' - reverse_proxy localhost:4686 - ''; - }; - "auth.jolheiser.com" = { - extraConfig = '' - reverse_proxy localhost:2884 - ''; - }; + "git.jolheiser.com".extraConfig = '' + reverse_proxy localhost:8449 + ''; + "social.jolheiser.com".extraConfig = '' + reverse_proxy localhost:4686 + ''; + "auth.jolheiser.com".extraConfig = '' + reverse_proxy localhost:2884 + ''; + "todo.jolheiser.com".extraConfig = '' + reverse_proxy localhost:8636 + ''; }; }; } diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix index dc6edda..7c2af48 100644 --- a/machines/dragonwell/default.nix +++ b/machines/dragonwell/default.nix @@ -2,7 +2,7 @@ let username = "jolheiser"; key = ''ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfKqCWtDlS3tgvfT6hQN+ii8UtabIZ+ZNmYN+bLwIa8PHOEW5MbfaqXSlhKkSi4+7SfQDCHphw0SMfhsQ4qMEcoywZ+4niDgKlQEVkl+S/VGbLuPe92NRStkyreZBLPr3Rh7ScNlGHcmHmoV9v7725fMnsMmabGVhpGO84PwNHOfJyv2tx2h6LxFbAV8S44UQu2lc8YLWCK2UvKuRnBerBXLnDQThUUX8UuCFzb786gQzD5XDU0MENbByxiy0XdVGAC+tFXEiSIgFZlFbFYyShgdTP9MzX2MOglEi+ae+1UIFncraW7ptUey7qHFJylpHWWWvE+GTwsg2G50i0FvFj jolheiser@jolheiser''; in { - imports = [./caddy.nix ./dex.nix ./golink.nix ./gotosocial.nix ./restic.nix ./ugit.nix ./hardware.nix]; + imports = [./caddy.nix ./dex.nix ./golink.nix ./gotosocial.nix ./restic.nix ./ugit.nix ./vikunja.nix ./hardware.nix]; boot.tmp.cleanOnBoot = true; zramSwap.enable = true; diff --git a/machines/dragonwell/dex.nix b/machines/dragonwell/dex.nix index ba6524a7fa1418551becac90d64c2a913f9a093f..b9c6209bc958c465b256731a0dd1d9a8de6b70e6 100644 GIT binary patch delta 1421 zcmV;81#L^L;0K{ZQCIe%nwc}7lHSwRY~MmOP( z@mh~LXvOjte?sSt6KY@UNg8RPd zO?VS`);j)VFG+joK@68wLR~&&vT6#|tZ}#@L+9BgyY0DHifIBz;19l%-g3_|9niLQ zNg&8WwuE2upMO#_iDS1&M?XVn6v8CiPW3{d)_zN#gSx31LA#c}vIiw}DGhJv$C1_c z7R=s=w@R7av7XoO7rY~c z05*lj{d3rLGF#Zb<2ICx!>w9s2guqcdjP8$tV7%67k{AJJWH8T$iSG!{d+f5_}S{w zPJgDHrrCypMLi>gD$)HvlJ4GtpXn=)Vh=Ei}R@N5GN(eHOWM=6{Be-|i4CPj1t2+O*>Zvn<0Oum;k-{V%^S;sZNVMBb2rT%Q z+H0Jd#hNRhAWro;;uiTNUnF7vT4?l$XHo>lp0^R@9oX`EEB*!k&NyQg6 zQDyiy$V>>`L(3r;nYOzr5No_exqp(pk zWZ!hB3kua1r?;))#*6Q0m6|xK;E7wBQ4*G`0ocMtVGv1s#fs%xUboU~G#0tK(U!tu z;J5mZ*>EgDQZA>+>W=>sOKCt81m4dvND6p1p#@&*t|fj8DDubc9HLY0ZGS<;KTkz) zVS0DsER_t7gUtwJ}oIBsbx zwKf$kNZ2W?U1;_d~%GM=>a&M}0 delta 1148 zcmV-?1cUpV3yleoAb&AIL^n(_LQqS2cua6hWky(WL~bx-D`QkMZ8b$qX>mNNh+^R&!HEcM2^n zEg&{ja9BBXMlxbCO+#a3S5+{1H)?chX;fr5Qe{(ON-KI$Qh#h&LSr>dFE9!SXHErO z&K?FTZrYjCBd+c@;CC1z~qdr3e!HKWJng4fiuy#i$aI_ zN*T0e$$os`fPc>M$zN2YGl$&4s#zeDYC3!F@=eLSS>=jB+}jG?A>oz%*n!@S3y|Yi zmFW}e>Q~pu;Z5@zMkzhq6A+=E?A5U_aLPQ<^7Q;zWCIz3edg zj=RC|o`mcZ+a`SgJM0^JGH-jBY+^$I?x!F~arM-jZGVH%shT*aa6Jz;3n%Ni&{KKYD#Yg#xR!+_xxc5c6-d#TI~#^(HwC( zY9Yv6$$yOk?lIhDJQ$4xKB&?QXWTzmJIv^kub*c0k|x@-_Luto@CB4AY=dc~DjIB_ zspSja9-mPNwWcM~0hWxK(v~eC8>uA{Fpc?GvQN78i$xW~WeJg!01<3gDy!E1WwB&( z%TG?3TUQS|u`{}Yy~z$Z+udrf8e0t{!*eH=cz;q0#7Hy~r&2UIEZWlV$~s>OY_QhX zU(3q{uG#d-8&gIZfMt4KYDfudFTrpTUW?HQj|kAv=UmMD{p|7uq@hWF$#SNX)FnA~ z^E*<~U&QWShHagE9@2Pw$Vzv@m~S%Kq#{-~vTk4aOj<~%K`eZnO%JKYzCZ$#O zpnv*sR+XO}{KF#DaVv(Q3*0NGkq@T+QMgd=$DB-YgTsZ!h%-1BM|<2b-s$nud+VC% zIhcP;%va_EI6$2|!adgo*P(OP%+Yqe3Yf0Dl z8jnD{j+SyX`v;EyIuIE*ej+IlDmFWYmIRKK=x7T{gAYHDqQrx|e5`%Wx*I@@pvomb zn3sS_>!jRS>7FU?uo|`nvK|=65PNCZpJaF#a<2&O6Rt}yitg|Y{}6mmRhQ5Dn+0NVgUy>`R%#w(-q zuy*i&Q4K2f2*xE|s^d!R(|$D$=AIQw25C3pqenn!FB4)JZ>US{X?0U@j~41+^Y4EV On0apR)z~1w3_2uJXCm7G diff --git a/machines/dragonwell/vikunja.nix b/machines/dragonwell/vikunja.nix new file mode 100644 index 0000000000000000000000000000000000000000..045a5210fb7f4d097343c5398dd483fa21c984b5 GIT binary patch literal 714 zcmV;*0yX_%XJsvAZewzJaCB*JZZ2i zI4fsnXH-sAcw=u&MN&*tVr+CtHg;%2NLh1rSXBydICwW#cT#L&Xk#~7MQl|uVq#EC za#%TIYDsKGQDP16&pX{<(fXE!@(YH}u~9?Jng8XWf#h$aQ_!v@3UUqjwiLTbAnj`%@aKap w9^m;uVbwMEh2R)+(6^pB!o7EF97P7yRYcBuXe2`ZPx# literal 0 HcmV?d00001 diff --git a/secrets/personal/dex-vikunja.age b/secrets/personal/dex-vikunja.age new file mode 100644 index 0000000000000000000000000000000000000000..f75958233664861cecf08fcbd7dd78b7bc7f841b GIT binary patch literal 418 zcmZ9`yH49s007Vq?NF-{Vy=X&PDqh)?D&xsgs_8S;zyj+&P})j!jFqFIM<15|iH+&D8$zf9Gc{OL;C0xTO_l@fK?SSBOSKnc$>Via9`f#zVjK1tR$kHjw9HT% zdA=N#8Pw3C>jBL^?)E_wp&l_UNBdtpYjNd3p*e6N*&xKuv0Y8u^9)EcQx7Vf=e@~H zkf#VGNfuQ4WzwVq1Pn_S77LfNx}Ii{&fKrX#!#+?$^!a+X@+@Au0_5@{%KXsiAZb n9o)R}@2(Gb!tD>=xX*8YY<#)jeJ%XCuHXOMRKA|R`W}I2UWJR_ literal 0 HcmV?d00001 diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 01c1bd6..de8302d 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -26,4 +26,5 @@ in { "personal/restic-repo.age".publicKeys = [jolheiser dragonwell]; "personal/dex.age".publicKeys = [jolheiser dragonwell]; "personal/dex-tailscale.age".publicKeys = [jolheiser dragonwell]; + "personal/dex-vikunja.age".publicKeys = [jolheiser dragonwell]; }