From 8c768dc77f88c97a3bc9c90a64cd88a737626e35 Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Tue, 1 Apr 2025 08:00:56 +1100 Subject: [PATCH 1/3] Add bellado the todo manager --- home-manager/flake.lock | 127 ++++++++++++++++++++++------------ home-manager/flake.nix | 6 +- home-manager/packages.nix | 6 ++ local/share/bellado/todo.json | 1 + 4 files changed, 93 insertions(+), 47 deletions(-) create mode 100644 local/share/bellado/todo.json diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 10525b9..4eae307 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -1,5 +1,23 @@ { "nodes": { + "bellado": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1702690530, + "narHash": "sha256-evko1/qE4oRXTMdCOGuwJRUkRm7Sxb5MhQCTLgx5Z+4=", + "owner": "isabelroses", + "repo": "bellado", + "rev": "8b9bb4e19b06a35acd8b2d39830c2751246ff189", + "type": "github" + }, + "original": { + "owner": "isabelroses", + "repo": "bellado", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -43,11 +61,11 @@ ] }, "locked": { - "lastModified": 1742655702, - "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", + "lastModified": 1743387206, + "narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=", "owner": "nix-community", "repo": "home-manager", - "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", + "rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146", "type": "github" }, "original": { @@ -81,16 +99,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736344531, - "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", - "owner": "nixos", + "lastModified": 1701263465, + "narHash": "sha256-lNXUIlkfyDyp9Ox21hr+wsEf/IBklLvb6bYcyeXbdRc=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "rev": "50aa30a13c4ab5e7ba282da460a3e3d44e9d0eb3", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -112,6 +130,54 @@ } }, "nixpkgs-unstable": { + "locked": { + "lastModified": 1743315132, + "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "52faf482a3889b7619003c0daec593a1912fddc1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1743367904, + "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1743095683, "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", @@ -127,42 +193,10 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1743231893, - "narHash": "sha256-tpJsHMUPEhEnzySoQxx7+kA+KUtgWqvlcUBqROYNNt0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c570c1f5304493cafe133b8d843c7c1c4a10d3a6", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1742889210, - "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "698214a32beb4f4c8e3942372c694f40848b360d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "pnpm2nix": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1736457458, @@ -180,9 +214,10 @@ }, "root": { "inputs": { + "bellado": "bellado", "home-manager": "home-manager", "moonlight": "moonlight", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-gsr-ui": "nixpkgs-gsr-ui", "nixpkgs-unstable": "nixpkgs-unstable", "shadps4-git": "shadps4-git" @@ -190,16 +225,16 @@ }, "shadps4-git": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1, "narHash": "sha256-F++9IlKzjo5nlNYC+fpx4GfbJiEUqLarfQPBBT5uz3A=", - "path": "/nix/store/ikcx9p7a52gmfbyyq3j5bhqk1a0xzfhq-source/programs/shadps4", + "path": "/nix/store/cy0ca66xq8c7hcs68nry9y6qka1wx91b-source/programs/shadps4", "type": "path" }, "original": { - "path": "/nix/store/ikcx9p7a52gmfbyyq3j5bhqk1a0xzfhq-source/programs/shadps4", + "path": "/nix/store/cy0ca66xq8c7hcs68nry9y6qka1wx91b-source/programs/shadps4", "type": "path" } }, diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 03b963c..d6f0f4b 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -21,6 +21,8 @@ nixpkgs-gsr-ui = { url = "github:js6pak/nixpkgs/gpu-screen-recorder-ui/init"; # Add `/develop` to the flake URL to use nightly. }; + + bellado.url = "github:isabelroses/bellado"; }; @@ -30,6 +32,7 @@ home-manager, nixpkgs-unstable, nixpkgs-gsr-ui, + bellado, ... }@inputs: let @@ -57,7 +60,8 @@ inherit unstable; inherit inputs; inherit gsr-ui; - }; + inherit bellado; + }; # Specify your home configuration modules here, for example, # the path to your home.nix. diff --git a/home-manager/packages.nix b/home-manager/packages.nix index 56acdc0..b58d6db 100644 --- a/home-manager/packages.nix +++ b/home-manager/packages.nix @@ -11,6 +11,7 @@ imports = [ inputs.moonlight.homeModules.default + inputs.bellado.homeManagerModules.default ]; nixpkgs = { @@ -214,6 +215,11 @@ ]; }; + programs.bellado = { + enable = true; + enableAliases = true; + }; + # === ssh === programs.ssh.enable = true; programs.ssh.addKeysToAgent = "yes"; diff --git a/local/share/bellado/todo.json b/local/share/bellado/todo.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/local/share/bellado/todo.json @@ -0,0 +1 @@ +[] \ No newline at end of file From d38d71434824c09f6b9e1da5e136cd4ab3972583 Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Tue, 1 Apr 2025 08:01:20 +1100 Subject: [PATCH 2/3] Add blockbench --- home-manager/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/packages.nix b/home-manager/packages.nix index b58d6db..c6cd5dd 100644 --- a/home-manager/packages.nix +++ b/home-manager/packages.nix @@ -140,6 +140,7 @@ unstable.freecad-wayland pkgs.unityhub pkgs.material-maker + unstable.blockbench unstable.gpu-screen-recorder-gtk gsr-ui.gpu-screen-recorder-ui From e05c685a391cbbf2e9b9acf4e0c657a50fbe3d2b Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Tue, 1 Apr 2025 08:01:31 +1100 Subject: [PATCH 3/3] Update typrstats --- local/share/nvim/typrstats | Bin 1893 -> 1930 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/local/share/nvim/typrstats b/local/share/nvim/typrstats index 37f8a0b1430f9aa59299dd75036311d90b9eaa18..aa02acee41cf3f6335bc94a56fca568d64fc3f77 100644 GIT binary patch literal 1930 zcmaJ?%W`8y3^iG@fDd3p^@dGXSL@Lag~yTwHGe=+sf#BNLoyz0PXf5I;iFk|blrZ0 zB3v(YTXkAj(m9epd-L7Z$A5jgSbT)v)fbD!;?3e}@%JbDu)E#vZthmw-Fov!xc+`0 zp58x%Yta~{I!Rd5#0F@(NtfaFr8W>LuLl7+l*qcsrpz z#((Cbe1a>T;V*(;q%QpouV?scm0rU21Q#TGPUa$Ygc*I&{2CgW9lBUA+CtAi#IU@Z zHaF+E`|#W7`ukz;!?mG1D;Px4;hl#46>d-<<4D8)1UK^iaU6Gt<8~auriWa@pfh=R zKO8`B$FUB(Ik?y37>E6R*ms9mzl`Ib!#)lBIPA~E+OTcdKJ4AFpAQQq&ICe(R$}1! z_#9oMvt}V!Xhv&`& z59FG0(k_I3EXcb9irxI{bsViC$sx>rc$h$#PucW{3{YWsSb;hS_AvIZA{fJase4!Q zdN-NQKDotM=Ak_QS>VCk(#}FLlr)kElIBh`Nr@yR&Y;-4x&#WlXL29 ztrRovge8RerJgEWtr@8?n87f!rCOVD(@NG5*9TiERS|eA9yAq0P9+JEW$u+(;PZ*+ z#8RblHhdU)LdmE*7bP~Y(^rzOB28e6tZ+d}xC?0^_X?^DQL~m&09J&wRK!Zhb*8-Na~~;dDXbYjpCo97I+xnCA%S_}p)^n|rUI3@ zLVVSfn$T>@WpIi;37ku@fa(K({&(m7F4oEC+4X?EQ%j=SNITrx(NkYdnp7I9sI4RE a7_io$QLx#-R}5eICzBve9`bm8Ui<^0N6Sb6 literal 1893 zcma)-&2D2w5QR;aEanB+px&^#YISw>uZ38$K=TF&MIKKehIkxoPXa{qkURkI!dGoO zcEm)&R$P7io~o{@bGq`?+aIpJ{O8SV_66UoZ)UUE+u7CZ?>A3wv0Q%KE|!0~d9Rau zykEQdlUuJoxOvpctrvf|dE&+5;TJd8{AqIA#U&_w7PDCHR}ZT_L7$vT&=_KNa|yUF zZx`F^-F~s(*~`c6<^zH4fV(>oDJhu!&2E2vyV~tHTSEMJnWO|x90_Q8&c&Ad)%wQG zGe=y)pKD5Ibjl~R)|cpu;9!o0>N7m`*WlKwBixpUTxxs`ZVf%cZFzuec?s|RSZFF| zG|MBpy+mK6ey;SQFY+2Zom02vA$pQeKXLkI`~E*v(Tzb>v~C>OG@rpH1jOt`qC~AJ zh0-SX(alTtsr0U~#H=MwZi4AreF#w_kl#?2`q*$1$q~=VA-fVi(n(a7OSioh;gi>x zrKz?aG9CJzP_g@3s)krX5|a{p>U&Q$gl50wyumkkfhDffc=BWVYpORZT`k1demJA9iL4UO$sqm^Qp zsruGZEiLh8a?J{993j-I_LR&5*@aI2nW7Sna*F&7`C zOUTD4-`bwn6v*dP54W70qKft`qDg5-985{6l3H*4u*aQL@lt!Qq{=>fX=FgtDBaXc z8`RezO&WxXkQKL_Gk?X79pEV&KK*~22bVG-J}h-+BL8`flGen@9n#HslTqp`A_{hvsd(nKiD=!q2d9GAy@kSb9G!avzqP zZeeKdc!Vx2O&r5;Onk=^cd;Cg{q%+tj>C`tZL@y?