From fe3c267ca913e2a92a0adc4694c94ebaeebf29de Mon Sep 17 00:00:00 2001 From: Matei Adriel Date: Tue, 5 Sep 2023 20:59:37 +0300 Subject: [PATCH] Self management stuff + vim.loader --- dotfiles/neovim/init.lua | 3 +++ dotfiles/neovim/lua/my/plugins/init.lua | 2 +- home/features/cli/productivity/default.nix | 2 +- home/features/cli/productivity/smos.nix | 11 --------- .../cli/productivity/smos/default.nix | 23 ++++++++++++++++++ .../productivity/smos/smos_github_oauth.age | 8 ++++++ .../desktop/wakatime/wakatime_config.age | Bin 335 -> 339 bytes home/features/neovim/default.nix | 6 ++--- hosts/nixos/common/global/default.nix | 2 +- .../common/global/wireless/wifi_passwords.age | Bin 757 -> 788 bytes .../nixos/common/users/adrielus_password.age | Bin 614 -> 672 bytes secrets.nix | 3 ++- 12 files changed, 41 insertions(+), 19 deletions(-) delete mode 100644 home/features/cli/productivity/smos.nix create mode 100644 home/features/cli/productivity/smos/default.nix create mode 100644 home/features/cli/productivity/smos/smos_github_oauth.age diff --git a/dotfiles/neovim/init.lua b/dotfiles/neovim/init.lua index bfbdf18..1e7853a 100644 --- a/dotfiles/neovim/init.lua +++ b/dotfiles/neovim/init.lua @@ -1,3 +1,6 @@ +-- enable experimental lua loader +vim.loader.enable() + -- bootstrap from github local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" diff --git a/dotfiles/neovim/lua/my/plugins/init.lua b/dotfiles/neovim/lua/my/plugins/init.lua index a8d7b1f..86a0aba 100644 --- a/dotfiles/neovim/lua/my/plugins/init.lua +++ b/dotfiles/neovim/lua/my/plugins/init.lua @@ -198,7 +198,7 @@ return { }) end, event = "VeryLazy", - cond = false, + -- cond = false, }, { "mbbill/undotree", diff --git a/home/features/cli/productivity/default.nix b/home/features/cli/productivity/default.nix index 3f2c1b2..1e680ea 100644 --- a/home/features/cli/productivity/default.nix +++ b/home/features/cli/productivity/default.nix @@ -1,3 +1,3 @@ { - imports = [ ./smos.nix ./intray.nix ]; + imports = [ ./smos ./intray.nix ]; } diff --git a/home/features/cli/productivity/smos.nix b/home/features/cli/productivity/smos.nix deleted file mode 100644 index 1b3886d..0000000 --- a/home/features/cli/productivity/smos.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, ... }: { - programs.smos = { - enable = true; - notify.enable = true; - config = { }; - }; - - satellite.persistence.at.data.apps.smos.directories = [ - config.programs.smos.workflowDir - ]; -} diff --git a/home/features/cli/productivity/smos/default.nix b/home/features/cli/productivity/smos/default.nix new file mode 100644 index 0000000..01a8e9d --- /dev/null +++ b/home/features/cli/productivity/smos/default.nix @@ -0,0 +1,23 @@ +{ config, ... }: { + programs.smos = { + enable = true; + + notify = { + enable = true; + }; + + github = { + enable = true; + oauth-token-file = config.homeage.file.smos.path; + }; + }; + + satellite.persistence.at.data.apps.smos.directories = [ + config.programs.smos.workflowDir + ]; + + homeage.file.smos = { + source = ./smos_github_oauth.age; + path = "${config.xdg.dataHome}/smos/.github_token"; + }; +} diff --git a/home/features/cli/productivity/smos/smos_github_oauth.age b/home/features/cli/productivity/smos/smos_github_oauth.age new file mode 100644 index 0000000..f86ad51 --- /dev/null +++ b/home/features/cli/productivity/smos/smos_github_oauth.age @@ -0,0 +1,8 @@ +age-encryption.org/v1 +-> ssh-ed25519 UUF9JQ 8KhqQ8dEHYLDM89d+glRT9xtId2umJM2O8Vj6oWM0zY +UAZ+pzFuL+wKSFY+yG1t1U9l0knA/VpupVBr6m2/+eY +-> Q7U4ZXW4-grease S8&{':OI EQs~v%Gq zp_"?LJ* z@)Y +mmb3Yi9moBnueYa4AeMJwAA0A6lZAo9+L4zYgnxyjLBOUwQMPO/zDPmHqQ +--- HMqzE5ekHYLWxdxpC7J9NMdrfx4VJYVwwnvhq6JAtmI + +c ¤ÞµŒ­ûF ;úU¶KFçtö2üÚ_†}¦èns3µ„¼oYCn…쎪8Œ‰¾0á蠦@»"Aìjµ©³QÌ` \ No newline at end of file diff --git a/home/features/desktop/wakatime/wakatime_config.age b/home/features/desktop/wakatime/wakatime_config.age index 452a0bf85b9f39e002950b76b9d41c5575c5e19d..c0521365eed23ac674b0c32ac6878c60f7854c4f 100644 GIT binary patch delta 304 zcmV-00nh%=0@DJJEPr=MW;1eQdQ4|Zc4=uadT~=^IW$UoQg&xHGc{pCLv>?UN_RNtGzu|eP)A``GDuZ2F$RAMo6Z!bkfc6l;yYFc40Q3@?S zATCRKK`1R}a%Ew2WgtK_Pf=M|3VJXxG-ft(bZcc%QFn20IDblQc0p7%HcNLeT2oR{ zL3dA5N>g=4a|$gjEg(%sWjIJwPisYKPeVm8YdAzfNOf33aBxI9H)DECaBX2(No960 zNJwjBMG7yuwjN<4M*^0<8I!&qvC~5UA?p7@C+iX5h2i{8v4f)ZYaWetFX3Z)HwDEr z*9iidi=?J&@+p?;Gpa*ljtbmCU~YrX?5TNkb%Kb^5e&@qxq%WK;^+=M=9QSYdEeQ$wO?q`-PGxH#NeVV@Y=31}O>9wkRX1>HQ)+HY zYHW8$Q3@?BEg(lnNGoVlGir8ELU&6^buvP1PDOT2PA_CxNJ>&sZelBDYiL+faxytk za|#TTTP3lTD<>ai_AyqPpoF{jEPCi=cj!cFzV0=}m^QNCH6EquDkPt2#gMpUjX$BR y?tywttOmpUK_%rs{wE|D<&9XMAa1^!Bj~`G|3v!Jxr}xEv>Xg1y;O1ac|CBsp>gW~ diff --git a/home/features/neovim/default.nix b/home/features/neovim/default.nix index f4d4e1a..513eba4 100644 --- a/home/features/neovim/default.nix +++ b/home/features/neovim/default.nix @@ -116,14 +116,12 @@ let # }}} # {{{ Clients neovim = wrapClient { - # REASON: nvim 9.0 - base = upkgs.neovim; + base = pkgs.neovim; name = "nvim"; }; neovide = wrapClient { - # REASON: neovide 10.0.4 - base = upkgs.neovide; + base = pkgs.neovide; name = "neovide"; extraArgs = "--set NEOVIDE_MULTIGRID true"; }; diff --git a/hosts/nixos/common/global/default.nix b/hosts/nixos/common/global/default.nix index 563559c..4ea608e 100644 --- a/hosts/nixos/common/global/default.nix +++ b/hosts/nixos/common/global/default.nix @@ -42,7 +42,7 @@ in nixpkgs = { # Add all overlays defined in the overlays directory overlays = builtins.attrValues outputs.overlays ++ [ - inputs.neovim-nightly-overlay.overlay + # inputs.neovim-nightly-overlay.overlay ]; config = { diff --git a/hosts/nixos/common/global/wireless/wifi_passwords.age b/hosts/nixos/common/global/wireless/wifi_passwords.age index 3535e24a5a51fa6ea6d6e8dde27c349a546be79d..bd612e3ac2d8b65b5a06893eb10356be6fd42995 100644 GIT binary patch delta 737 zcmWmASxXcF007_!D_RNy39+CCrAW7NoOS0ak=C7KXLrUK*V$wCA=%lT!#!s99<^hA zNudJ|f`qiFAcG(X2@;~HAi@Z{AHoVWC8B~Jda>yG3E%f)!`Y2v`>Ud@gnd@upiAj4 zxkF`lcZFp|GMKXHJT4~k0|OOZ@o^I0N?g%vc#sdk~H6;3!@n(ohXC?Cq0sFQY=4Vw@} z0*QFCT7fYkRFtqB2}PY5&HgV@+B?!Ts29|DQ3Y(Kr5)JUpaD5D;w}Nl)l#ECIQVK1 zW)msG?&fir=t;<`80wP;TylyF6?|Su#1PX&V@4?|B{FE#;%Ln63nmj>F>H3?vP*Fg zJRYb(R6NS{5PpM#%`_vy#J^F_^eaRG3S#{nghfy@jXF`ehbH-mWT9rt0fHcal&iWz zM&klqPK&m{2EDi)6q8C9Ph|#moM}@uyqoEaX(2*(%&cDMeg1Cf*Tmy9nUbB^LjZ}yF7jD9KHvB3auB`rpPyztMk=~-QlD7rpbn3fd8~|uYKv>nFYGB zp8r1jY;N)iJhRe#OR4_cJKTKxa%wd^G&c}<8(*wH8acm~A7^!N_QTFQ2b+BFYTyTp zyK0~4Tc)n9JDGz#V~6?E;EJ)bZ8^VgN8Q@&%aQGeM(Du8$1B{CmgVVF<@trJgT#@V z8;9T2_C9=na_PWl?yivivsx7&Ex!J7@&0^!Vz{P$w$d>4?a{X1z3EHfynOd1HM)p2 H0}X!xac2^M delta 705 zcmWm9OKZ~r003YpDlTs71h=W^3W^G~uFu%`*i74`ZQ7-2(qu0kBu&~p+OAESwh6*e z4<0A@Ze@;s3`SuP!9tgc<})$DvBp{2f={@U!eH?gYWFB<(0KPqi8H5r)AEe z;W@>h);%$sf?<*)t|Yw@NW*ElAi+UCSxhhpfOfeAjEX}ll*TAW1`C!cT37n{sy>Jm zRhPrf8F@%{fe|AG*t@NoCfWtw<@Gutt2@JrG;HS+mQ(Qug$kd!7k zS*I$?IvDh1%N)YwoIYS66fOvi=@yt+E{+#T6Ct65K9GY2#+Ch_E(u$o}qRTw;GmAeVkUp1`T{Vd1WfWA^v zfZ0)15=*GUAkk=)%3!)Kf?5Uf=fN@r%TO|(mwjRmodub=0#R>k& z@cq>bPbX}klrySu=Z+tc|zb*ihMdpt12EXJ!Ty diff --git a/hosts/nixos/common/users/adrielus_password.age b/hosts/nixos/common/users/adrielus_password.age index 5a564a48816a87ed9b4a7418984a2ad1e9577e14..ab17351b4a79cd34e728d20fcc347c7b047def9c 100644 GIT binary patch delta 620 zcmWm9OKZ~r007{N3I-GfVTc~$13|N{c_)=2rd^vROCM>IHZ2ZG)--8eZId)jqpaY; zqiiCA;$c@|IPjt%-b966gn@YRb(r1+cTwkI;`a}}ZwJ;7uFg(_mWSXF67hK(?|7|F zQ6%UgMha4?PK7ejz#3^R4#q;WXalb2Q+}G`D{dq7f_je|X0kLJRmj*Y2bfP;y#$^J z3?tAYkh%f}ftk`fC_x|@5HnO$Wq#Q zo0C3V>jN&u38 z9L2)BKI|GLN`XUYOdzmYCpbPX(aIuLwEdihp%WZ-BC4^>>vaa0rcx=eW8vjy)Qf5v z6|WEa8cOw5BU3bDLLv|{qxp-B>yxEnvs(i8f4}ICo*&vcdjHk#-2B$3KZt~{Jos^U zbNkrW{YtLC^BUP<_KxrIZ{Iw=bNivvdCd4@BFu delta 561 zcmWm9J&V&|003YIzX*u8=nWziK?HlfHcgtOi_%`+G)gQ#x4>6KK+gM~ma|GKcOTjK-hDe~XH4QJ;re00UG~KC@Gy$$TMB8@JAYv?s)Q#>w(6Q8!2$tCXa?U9Fe+ zsjgW(+d&3pKOzU6zSr`bjDoqNMu}`Rx{~X|ilvDd+w77BqB<3l`r^m>EUJuJ^=!c& zrC7h!+?9QQNcAY*=Ou%Sck39Ya#p0u*@~?rzNnQ1YpdN!StJ)ZfPqA6P|eVcN}6m+ z!Q*m{1|686Xw?77rD7(|Uu`G!u_}9N>|)Q_-eh8IXm9Rlh|>zhU^t#p1#6HR*@{9? zIPg&%o46@cW_O36h+0y}fi%~s0-PyFCIFSVP$W<=hJa)cHLdi+alyxQB#}tObj`+c zCCjBPXhW_OHhZGMJ5z0v1%p1FVe|p0hpZ>o8$IOa?eD9_nn!*7v-9Tb@7KqFJ=|Mu zBoEH+-Se*R|J`S$`6KD+hZ|t|^I7)Vt55H4(fY}^FXxv}Jg%KyKNb4RFUq#F74c8( kyJv)h=jVgz=W{O>YlruX4~TCU*!OL6F4vBfz2%|v4?(xdlmGw# diff --git a/secrets.nix b/secrets.nix index b662867..1bd2211 100644 --- a/secrets.nix +++ b/secrets.nix @@ -13,6 +13,7 @@ in "./hosts/nixos/common/users/adrielus_password.age".publicKeys = all_hosts ++ [ adrielus_tethys ]; # Scoped for the user - # TODO: move this into `pass`. + # TODO: perhaps move this into `pass`?. "./home/features/desktop/wakatime/wakatime_config.age".publicKeys = [ adrielus_tethys ]; + "./home/features/cli/productivity/smos/smos_github_oauth.age".publicKeys = [ adrielus_tethys ]; }