Compare commits

..

105 Commits

Author SHA1 Message Date
79f7c42e5b Updated Note cigars.md 2025-10-18 19:27:55 -06:00
ef304b21dc Updated Note cigars.md 2025-10-12 14:17:28 -06:00
edeb72bcbe Updated Note to watch.md 2025-09-25 21:29:44 -06:00
6d0b7f153a Updated Note to watch.md 2025-09-22 11:42:35 -06:00
2309764522 foam_sync.ps1 (LIFEBALANCE) 2025-09-20T18:26:09Z 2025-09-20 18:26:09 -06:00
7e78fe06db foam_sync.ps1 (LIFEBALANCE) 2025-09-20T18:00:08Z 2025-09-20 18:00:08 -06:00
ca065a132a Updated Note cigars.md 2025-09-19 07:15:23 -06:00
658d877c57 foam_sync.ps1 (LIFEBALANCE) 2025-09-18T23:06:11Z 2025-09-18 23:06:11 -06:00
b311a961ab foam_sync.ps1 (LIFEBALANCE) 2025-09-18T07:50:19Z 2025-09-18 07:50:21 -06:00
b1732a2289 Updated Note to watch.md 2025-09-18 07:36:19 -06:00
141ec5aa05 Updated Note to watch.md 2025-09-18 00:45:20 -06:00
f3db7cb65e Updated Note to watch.md 2025-09-17 19:52:49 -06:00
6b54ee374e Updated Note cigars.md 2025-09-15 17:37:29 -06:00
b107936fd0 Updated Note cigars.md 2025-09-14 21:23:59 -06:00
f82ff03b1c Updated Note cigars.md 2025-09-14 21:10:57 -06:00
c0136c7502 Updated Note cigars.md 2025-09-13 19:02:15 -06:00
bc2cd3554b Updated Note cigars.md 2025-09-13 18:59:49 -06:00
f3a918746a Updated Note cigars.md 2025-09-13 18:57:13 -06:00
ben
e1605f3589 Update cigars.md 2025-09-11 13:37:07 -06:00
aa5431c280 foam_sync.ps1 (LIFEBALANCE) 2025-09-11T11:24:11Z 2025-09-11 11:24:13 -06:00
a1b1d7e090 foam_sync.ps1 (LIFEBALANCE) 2025-09-11T11:18:12Z 2025-09-11 11:18:12 -06:00
364bd496b7 Updated Note cigars.md 2025-09-11 11:07:47 -06:00
e8b777fa24 foam_sync.ps1 (LIFEBALANCE) 2025-09-10T16:28:13Z 2025-09-10 16:28:14 -06:00
44dc4dd088 foam_sync.ps1 (LIFEBALANCE) 2025-09-10T16:26:10Z 2025-09-10 16:26:11 -06:00
5e941486dd foam_sync.ps1 (LIFEBALANCE) 2025-09-09T02:14:09Z 2025-09-09 02:14:09 -06:00
5cfc9ebbc0 foam_sync.ps1 (LIFEBALANCE) 2025-09-09T02:12:10Z 2025-09-09 02:12:10 -06:00
ben
bbc6c94924 Update cigars.md 2025-09-05 20:29:56 -06:00
ben
f923ca686e Update cigars.md 2025-09-05 16:31:23 -06:00
4f9560fc1e Updated Note to watch.md 2025-09-04 09:34:27 -06:00
5b339c57bc Updated Note cigars.md 2025-09-03 17:49:34 -06:00
4fcfafd7a9 Updated Note to watch.md 2025-09-02 01:54:25 -06:00
7633b3daaa Updated Note to watch.md 2025-09-01 14:21:46 -06:00
84397ea6ba foam_sync.ps1 (LIFEBALANCE) 2025-08-31T00:50:10Z 2025-08-31 00:50:10 -06:00
501f88eeb6 foam_sync.ps1 (LIFEBALANCE) 2025-08-31T00:40:09Z 2025-08-31 00:40:09 -06:00
28862c2d12 foam_sync.ps1 (LIFEBALANCE) 2025-08-31T00:38:09Z 2025-08-31 00:38:09 -06:00
66359f847c foam_sync.ps1 (LIFEBALANCE) 2025-08-31T00:26:09Z 2025-08-31 00:26:10 -06:00
574f050907 foam_sync.ps1 (LIFEBALANCE) 2025-08-31T00:24:09Z 2025-08-31 00:24:09 -06:00
546605759f foam_sync.ps1 (LIFEBALANCE) 2025-08-31T00:00:09Z 2025-08-31 00:00:09 -06:00
ac48760742 foam_sync.ps1 (LIFEBALANCE) 2025-08-30T23:28:09Z 2025-08-30 23:28:09 -06:00
9b83cb2f49 foam_sync.ps1 (LIFEBALANCE) 2025-08-30T23:12:10Z 2025-08-30 23:12:10 -06:00
be1e8c6696 foam_sync.ps1 (LIFEBALANCE) 2025-08-30T22:20:09Z 2025-08-30 22:20:09 -06:00
ac8a8603ff foam_sync.ps1 (LIFEBALANCE) 2025-08-30T21:50:08Z 2025-08-30 21:50:08 -06:00
a97da04177 foam_sync.ps1 (LIFEBALANCE) 2025-08-30T21:48:08Z 2025-08-30 21:48:08 -06:00
5a3142e8f5 foam_sync.ps1 (LIFEBALANCE) 2025-08-30T21:46:08Z 2025-08-30 21:46:08 -06:00
1e30897d8e foam_sync.ps1 (LIFEBALANCE) 2025-08-29T21:56:08Z 2025-08-29 21:56:08 -06:00
a133d63923 foam_sync.ps1 (LIFEBALANCE) 2025-08-29T20:58:08Z 2025-08-29 20:58:08 -06:00
443d44abeb foam_sync.ps1 (LIFEBALANCE) 2025-08-24T16:46:08Z 2025-08-24 16:46:08 -06:00
6c4f805501 foam_sync.ps1 (LIFEBALANCE) 2025-08-24T15:32:08Z 2025-08-24 15:32:08 -06:00
a3baf0086b foam_sync.ps1 (LIFEBALANCE) 2025-08-24T15:28:08Z 2025-08-24 15:28:08 -06:00
34c132569d Updated Note to watch.md 2025-08-23 16:22:11 -06:00
1fb65e616a Updated Note to watch.md 2025-08-22 20:58:26 -06:00
8b3e6b2df4 Updated Note to watch.md 2025-08-21 08:55:36 -06:00
f24f7b5ed4 Added Note to watch.md 2025-08-20 11:26:51 -06:00
2d52c7dc36 foam_sync.ps1 (DESKTOP-DBGBRBK) 2025-08-15T23:50:29Z 2025-08-15 23:50:29 -06:00
ben
cc842ba3d3 Update cigars.md 2025-08-13 20:44:21 -06:00
ben
73f60fe3c8 Update cigars.md 2025-08-13 20:12:20 -06:00
ben
6d240b97d8 Update cigars.md 2025-08-13 12:12:28 -06:00
ben
1fb7a95ac7 Update cigars.md 2025-08-11 15:30:26 -06:00
ben
5624ec5523 Update cigars.md 2025-08-11 15:21:22 -06:00
ben
41fa8e657f Update cigars.md 2025-08-11 14:41:33 -06:00
a3ded544a6 foam_sync.ps1 (DESKTOP-DBGBRBK) 2025-08-10T03:17:27Z 2025-08-10 03:17:27 -06:00
ben
5958b6dbed Update cigars.md 2025-08-07 16:59:05 -06:00
2dc08e7d05 Updated Note cigars.md 2025-08-05 17:10:29 -06:00
fa7121f443 foam_sync.ps1 (DESKTOP-DBGBRBK) 2025-08-02T11:56:28Z 2025-08-03 16:28:42 -06:00
b189952e8b foam_sync.ps1 (LIFEBALANCE) 2025-08-03T02:16:08Z 2025-08-03 02:16:08 -06:00
895ca7942f foam_sync.ps1 (LIFEBALANCE) 2025-07-31T20:54:08Z 2025-07-31 20:54:08 -06:00
115b337e3a foam_sync.ps1 (LIFEBALANCE) 2025-07-31T18:36:09Z 2025-07-31 18:36:09 -06:00
ben
0d62095206 Update cigars.md 2025-07-21 10:43:25 -06:00
f0634603ee foam_sync.ps1 (LIFEBALANCE) 2025-07-19T15:38:08Z 2025-07-19 15:38:08 -06:00
367e69faf6 foam_sync.ps1 (LIFEBALANCE) 2025-07-19T15:36:08Z 2025-07-19 15:36:08 -06:00
81467ee075 foam_sync.ps1 (LIFEBALANCE) 2025-07-19T15:34:08Z 2025-07-19 15:34:08 -06:00
ben
47552367b6 Update cigars.md 2025-07-18 19:36:46 -06:00
ben
d28f64ceb7 Update cigars.md 2025-07-17 13:47:13 -06:00
b3b3c9cde0 Updated Note making.md 2025-07-15 15:30:33 -06:00
ben
7cde42eb75 Update cigars.md 2025-07-14 15:48:51 -06:00
ben
ba48fa5303 Update cigars.md 2025-07-14 15:18:10 -06:00
ea3dce9ec9 Updated Note cigars.md 2025-07-11 16:29:41 -06:00
ben
73fac49347 Update cigars.md 2025-07-10 19:56:56 -06:00
ben
11fcdae114 Update cigars.md 2025-07-09 12:55:49 -06:00
ben
e4a12af050 Update cigars.md 2025-07-08 11:31:38 -06:00
9637bab983 foam_sync.ps1 (LIFEBALANCE) 2025-07-08T00:12:09Z 2025-07-08 00:12:09 -06:00
f6f499ab8a foam_sync.ps1 (LIFEBALANCE) 2025-07-07T23:34:08Z 2025-07-07 23:34:08 -06:00
c429a855da foam_sync.ps1 (LIFEBALANCE) 2025-07-07T22:26:09Z 2025-07-07 22:26:09 -06:00
b06c145575 foam_sync.ps1 (LIFEBALANCE) 2025-07-07T22:24:09Z 2025-07-07 22:24:09 -06:00
ben
47e960449c Update cigars.md 2025-07-07 15:03:33 -06:00
6acee9b716 foam_sync.ps1 (LIFEBALANCE) 2025-07-07T08:52:09Z 2025-07-07 08:52:09 -06:00
ba087a8fe3 foam_sync.ps1 (LIFEBALANCE) 2025-07-06T22:38:08Z 2025-07-06 22:38:08 -06:00
2fc8080666 foam_sync.ps1 (LIFEBALANCE) 2025-07-06T11:38:09Z 2025-07-06 11:38:09 -06:00
1d2a258823 foam_sync.ps1 (LIFEBALANCE) 2025-07-05T18:56:08Z 2025-07-05 18:56:08 -06:00
9b500703c5 foam_sync.ps1 (LIFEBALANCE) 2025-07-05T18:52:08Z 2025-07-05 18:52:08 -06:00
016540aae3 foam_sync.ps1 (LIFEBALANCE) 2025-07-05T18:48:08Z 2025-07-05 18:48:08 -06:00
a27a22e669 foam_sync.ps1 (LIFEBALANCE) 2025-07-05T18:34:08Z 2025-07-05 18:34:08 -06:00
5aa5fe4978 foam_sync.ps1 (LIFEBALANCE) 2025-07-05T18:30:08Z 2025-07-05 18:30:08 -06:00
bd80ee74d3 foam_sync.ps1 (LIFEBALANCE) 2025-07-05T18:28:08Z 2025-07-05 18:28:08 -06:00
1df6ed2e32 foam_sync.ps1 (LIFEBALANCE) 2025-07-05T17:50:08Z 2025-07-05 17:50:08 -06:00
594c2ab3f8 foam_sync.ps1 (LIFEBALANCE) 2025-07-04T17:58:09Z 2025-07-04 17:58:09 -06:00
cd0903ce53 foam_sync.ps1 (DESKTOP-DBGBRBK) 2025-07-03T22:09:14Z 2025-07-03 22:09:14 -06:00
2e4842e649 foam_sync.ps1 (LIFEBALANCE) 2025-07-03T21:12:09Z 2025-07-03 21:12:09 -06:00
9be353d908 foam_sync.ps1 (LIFEBALANCE) 2025-07-03T20:32:08Z 2025-07-03 20:32:09 -06:00
a63cc408f5 foam_sync.ps1 (LIFEBALANCE) 2025-07-03T20:30:08Z 2025-07-03 20:30:08 -06:00
b49020e3d5 foam_sync.ps1 (LIFEBALANCE) 2025-07-03T20:02:08Z 2025-07-03 20:02:08 -06:00
306ee0619c foam_sync.ps1 (LIFEBALANCE) 2025-07-03T12:50:09Z 2025-07-03 12:50:09 -06:00
096bae0e84 Updated Note cigars.md 2025-07-02 07:35:33 -06:00
b26ccf1391 foam_sync.ps1 (LIFEBALANCE) 2025-07-01T16:00:08Z 2025-07-01 16:00:08 -06:00
e8f83829bb foam_sync.ps1 (LIFEBALANCE) 2025-07-01T15:58:08Z 2025-07-01 15:58:08 -06:00
23 changed files with 288 additions and 10 deletions

1
2025-07-01.md Normal file
View File

@ -0,0 +1 @@
# 2025-07-01

1
2025-07-03.md Normal file
View File

@ -0,0 +1 @@
# 2025-07-03

1
2025-07-06.md Normal file
View File

@ -0,0 +1 @@
# 2025-07-06

1
2025-08-15.md Normal file
View File

@ -0,0 +1 @@
# 2025-08-15

1
2025-08-24.md Normal file
View File

@ -0,0 +1 @@
# 2025-08-24

1
2025-08-29.md Normal file
View File

@ -0,0 +1 @@
# 2025-08-29

1
2025-08-30.md Normal file
View File

@ -0,0 +1 @@
# 2025-08-30

1
2025-09-09.md Normal file
View File

@ -0,0 +1 @@
# 2025-09-09

1
2025-09-10.md Normal file
View File

@ -0,0 +1 @@
# 2025-09-10

33
AI.md Normal file
View File

@ -0,0 +1,33 @@
# AI
## Learning
* [The Ultimate Guide to Local AI and AI Agents (The Future is Here) - YouTube](https://www.youtube.com/watch?v=mNcXue7X8H0)
* Docker Compose based framework for running AI locally
* https://github.com/coleam00/local-ai-packaged
* https://www.reddit.com/r/LocalLLaMA/
*
## LocalAI Packaged
### Services
* [Open WebUI](http://localhost:8080/)
* [n8n](http://localhost:5678/)
* [Langfuse](http://localhost:3000/)
* [Ollama](http://localhost:11434/)
* [Qdrant](http://localhost:6333/)
### Start services
```shell
python start_services.py --profile gpu-nvidia
```
## AgentOS
* https://github.com/buildermethods/agent-os
## AG2
* https://github.com/ag2ai/ag2

View File

@ -3,8 +3,23 @@
* https://store.booloumud.com * https://store.booloumud.com
* *
## Tech
### DNS
* Squarespace
* booloumud.com --> store.booloumud.com (Shopify)
* Porkbun
* Transfer in progress, need to re-establish after transfer
* booloumud.org --> booloumud.com
* booloumud.net --> booloumud.com
## Designs ## Designs
### Earring holders and storage
* `G:\My Drive\booloumud\designs\earring_display`
### Tooth pendants ### Tooth pendants
* [🦷 Real Anatomy Tooth Seth #1・ 3D File for 3D printing・Cults](https://cults3d.com/en/3d-model/art/real-anatomy-tooth-seth-1) * [🦷 Real Anatomy Tooth Seth #1・ 3D File for 3D printing・Cults](https://cults3d.com/en/3d-model/art/real-anatomy-tooth-seth-1)

View File

@ -0,0 +1,3 @@
{
"folders": []
}

104
cigars.md
View File

@ -2,35 +2,65 @@
## to try ## to try
* Drew Estate Deadwood Crazy Alice * Drew Estate
* Deadwood Crazy Alice
* Java Mint Maduro
* https://www.reddit.com/r/cigars/s/gEAeA9gw2o * https://www.reddit.com/r/cigars/s/gEAeA9gw2o
* https://www.reddit.com/r/cigars/s/O42EdsJXSf * https://www.reddit.com/r/cigars/s/O42EdsJXSf
* Johnny Tabaconaught * Johnny Tabaconaught
* https://www.reddit.com/r/cigars/s/A8KFQ9sovB
* Brickhouse
* Maduro
* https://www.reddit.com/r/cigars/s/bRg03rKkZ1
* Crowned Heads Le Careme
* https://www.reddit.com/r/cigars/s/798wqgYHMp
## I like ## I like
* Deadwood * Deadwood
* Leather Rose * Leather Rose
* Girl with No Name * Girl with No Name
* Undercrown Shade
* Mild flavor, strong buzz
* Famous Smoke Shop
* Nicaraguan Selection 3000
* Foundation * Foundation
* Tabernacle Havana Seed * Tabernacle Havana Seed
* Maduro * Maduro
* Dark Natural - a little strong * Dark Natural - a little strong
* Gurkha
* Rogue
* Chateau de Prive - nice burn, very mild, toasted
* Evil - leather and mild pepper
* L'Atelier
* Surrogates Bone Crusher
* Oliva * Oliva
* Serie O Corona * Serie O Corona
* 3rd Degree
* Master Blends 3
* Kentuky Fire Cured * Kentuky Fire Cured
* Muwat
* Just a Friend * Just a Friend
* Fat Molly
* Arturo Fuente * Arturo Fuente
* Gran Reserva Curly Head Deluxe Maduro - a little shaggy, but inexpensive * Gran Reserva Curly Head Deluxe Maduro - a little shaggy, but inexpensive
* Selection Privada No. 1 Double Claro * Selection Privada No. 1 Double Claro
* Rojas
* Street Tacos Barbacoa Robusta
* Breakfast Tacos Sumatra
* Tatuaje
* Reserva Broadleaf
## I don't like ## I don't like
* Rocky Patel Seed to Smoke Share Toro
* Just, gross. Tastes like a book depository.
## meh ## meh
* Drew Estate * Drew Estate
* Factory Smokes Belicoso Sweet * Factory Smokes Belicoso Sweet
* Rocky Patel
* Seed to Smoke Classic
## shops ## shops
@ -40,6 +70,76 @@
## Journal ## Journal
* [[2025-09-18]] - Tatuaje Reserva Broadleaf ([[2024-09-13]])
* [[2025-09-16]] - Arturo Fuente Curly Head Delux Maduro ([[2024-11-20]])
* [[2025-09-15]] - Acid Twenty (2024-01-16)
* [[2025-09-14]] - Gurkha The Tabernacle (2024-11-20)
* Chocolate, leather
* [[2025-09-13]] - L'Atelier Surrogates Bone Crusher ([[2024-09-13]])
* Earthy soil, dark roast coffee. Tight ash, even burn.
* [[2025-09-12]] - Arturo Fuente Curly Head Delux Maduro ([[2024-11-20]])
* [[2025-09-11]] - Arturo Fuente Curly Head Delux Maduro ([[2024-11-20]])
* [[2025-09-10]]
* Nub Habano ([[2024-07-08]])
* Not bad - mild to medium. Lumber and leather. Wrapper was really thin and fell apart, had to relight a few times
* Arturo Fuente Curly Head Delux Maduro ([[2024-11-20]])
* [[2025-09-09]] - Famous Smoke Shop Nicaraguan Selection 3000
* [[2025-09-05]] - Gurkha Cellar Reserve 18 Years
* [[2025-09-04]]
* Rojas Breakfast Tacos Sumatra ([[2025-08-01]])
* Oliva Serie O ([[2024-11-20]])
* [[2025-09-03]] - Gurkha Castle Hall ([[2025-08-01]])
* [[2025-08-30]] - Gurkha Beast ([[2025-08-01]])
* tight, horrible draw on this stick
* once loosened up, not bad - medium-dark, gassy, dark wood
* [[2025-08-29]] - Gurkha Evil ([[2025-08-01]])
* Mild to medium - leather, a little pepper
* [[2025-08-24]] - Gurkha Marquesa ([[2025-08-01]])
* [[2025-08-15]] - Oliva Serie O ([[2024-11-20]])
* [[2025-08-13]] - Gurkha Chateau de Prive ([[2025-08-01]])
* [[2025-08-12]] - Kentucky Fire Cured Fat Molly ([[2025-08-01]])
* [[2025-08-11]] - Gurkha Rogue ([[2025-08-01]])
* Good medium strength. Some burn issues, esp towards the end
* ~[[2025-08-11]] - Rocky Patel Seed to Smoke Shade Toro ([[2025-08-01]])~
* Abandoned after one draw - nasty!
* [[2025-08-09]] - Rojas Street Tacos Carnitas Toro ([[2025-08-01]])
* [[2025-08-07]] - Kentucky Fire Cured Fat Molly ([[2025-08-01]])
* [[2025-08-05]] - Rojas Street Tacos Barbacoa Robusta ([[2025-08-01]])
* Easy draw, lots of smoke. Pepper, leather, medium strong
* [[2025-08-01]] - Rocky Patel Seed to Smoke Classic ([[2025-08-01]])
* Dry leaves, flat, not offensive, but not very good
* [[2025-07-31]] - Kentuky Fire Cured Muwat ([[2024-07-08]])
* [[2025-07-30]] - Oliva Master Blends 3 ([[2024-07-08]])
* [[2025-07-20]] - Inferno by Oliva ([[2024-07-08]])
* [[2025-07-18]]
* Oliva Serie O ([[2024-11-20]])
* Selection Privada No. 1 Double Claro ([[2024-01-19]])
* [[2025-07-16]] - Oliva Serie O ([[2024-11-20]])
* [[2025-07-14]] - Selection Privada No. 1 Double Claro ([[2024-01-19]])
* [[2025-07-11]] - Oliva Serie V ([[2024-12-25]])
* [[2025-07-10]] - Acid Progeny ([[2024-01-16]])
* Cedary, spicy wood
* [[2025-07-08]] - Selection Privada No. 1 Double Claro ([[2024-01-19]])
* [[2025-07-08]] - Oliva Serie O ([[2024-11-20]])
* [[2025-07-07]] - Oliva 3rd Degree ([[2024-07-08]])
* Strong, but not smoky. Tight, even burn. Took a while to get through, pretty buzzy.
* [[2025-07-06]] - Undercrown Shade ([[2024-01]])
* [[2025-07-03]] - Oliva Serie O ([[2024-11-20]])
* [[2025-07-01]] - Factory Smokes Belicoso Sweet ([[2024-01-16]]) * [[2025-07-01]] - Factory Smokes Belicoso Sweet ([[2024-01-16]])
* [[2025-06-30]] - Selection Privada No. 1 Double Claro ([[2024-01-19]]) * [[2025-06-30]] - Selection Privada No. 1 Double Claro ([[2024-01-19]])
* [[2025-06-25]] - Selection Privada No. 1 Double Claro * [[2025-06-25]] - Selection Privada No. 1 Double Claro
[//begin]: # "Autogenerated link references for markdown compatibility"
[2025-09-10]: 2025-09-10.md "2025-09-10"
[2025-09-09]: 2025-09-09.md "2025-09-09"
[2025-08-30]: 2025-08-30.md "2025-08-30"
[2025-08-29]: 2025-08-29.md "2025-08-29"
[2025-08-24]: 2025-08-24.md "2025-08-24"
[2025-08-15]: 2025-08-15.md "2025-08-15"
[2025-07-06]: 2025-07-06.md "2025-07-06"
[2025-07-03]: 2025-07-03.md "2025-07-03"
[2025-07-01]: 2025-07-01.md "2025-07-01"
[2025-06-30]: 2025-06-30.md "2025-06-30"
[//end]: # "Autogenerated link references"

View File

@ -237,11 +237,11 @@ try {
if ($remoteTimestamp -gt $localTimestamp) { if ($remoteTimestamp -gt $localTimestamp) {
Write-Information "Remote is newer. Pulling with rebase, strategy 'theirs'..." Write-Information "Remote is newer. Pulling with rebase, strategy 'theirs'..."
git pull --rebase -X theirs origin main git pull --rebase --strategy recursive --strategy-option theirs origin main
} }
else { else {
Write-Information "Local is newer or same age. Pulling with rebase, strategy 'ours'..." Write-Information "Local is newer or same age. Pulling with rebase, strategy 'ours'..."
git pull --rebase -X ours origin main git pull --rebase --strategy recursive --strategy-option ours origin main
} }
if ($LASTEXITCODE -ne 0) { Write-Error "Rebase during divergence failed. Manual intervention may be required."; exit 1 } if ($LASTEXITCODE -ne 0) { Write-Error "Rebase during divergence failed. Manual intervention may be required."; exit 1 }

4
foam_sync.sh Executable file → Normal file
View File

@ -100,10 +100,10 @@ else
# if remote is newer, use a 'theirs' strategy # if remote is newer, use a 'theirs' strategy
if [[ $(git log --pretty=format:"%at" -n 1 origin/main) -gt $(git log --pretty=format:"%at" -n 1 HEAD) ]]; then if [[ $(git log --pretty=format:"%at" -n 1 origin/main) -gt $(git log --pretty=format:"%at" -n 1 HEAD) ]]; then
echo "remote is newer" echo "remote is newer"
git pull --rebase -X theirs origin main git pull --rebase --strategy recursive --strategy-option theirs origin main
else else
echo "local is newer" echo "local is newer"
git pull --rebase -X ours origin main git pull --rebase --strategy recursive --strategy-option ours origin main
fi fi
git push origin main git push origin main
fi fi

View File

@ -1,6 +1,7 @@
# homelab # homelab
* OPNsense firewall: https://opnsense.hh.lan:8443 * OPNsense firewall: https://opnsense.hh.lan:8443
* 192.168.86.45
* Proxmox virtualization cluster: https://proxmox1.hh.lan * Proxmox virtualization cluster: https://proxmox1.hh.lan
## services ## services
@ -24,10 +25,15 @@
## things to set up ## things to set up
* Network UPS Tool? (NUT) * Network UPS Tool? (NUT)
* Monitor reservoir levels
* https://dwr.state.co.us/Tools/StationsLite/UNIRESCO?params=STORAGE
* Caddy * Caddy
* Authentik * Authentik
* Proxmox backup * Proxmox backup
* CrashPlan (or other backup service) * CrashPlan (or other backup service)
* [Proxmox Crashplan](https://nguvu.org/proxmox/proxmox-crashplan-install/)
* https://github.com/nix-community/terraform-nixos/blob/master/examples/hermetic_config/default.tf
* https://spacelift.io/blog/terraform-proxmox-provider#5-run-terraform-to-create-the-vm
* Home auth * Home auth
* Windows auth * Windows auth
* SSO access to services * SSO access to services
@ -106,7 +112,6 @@ graph LR;
unbound<-->vault; unbound<-->vault;
unbound<-->proxmox; unbound<-->proxmox;
proxmox[proxmox + VMs]; proxmox[proxmox + VMs];
``` ```
* External domain: `hobbithole.org` * External domain: `hobbithole.org`
@ -140,6 +145,12 @@ graph LR;
* Hosted on OPNsense * Hosted on OPNsense
* *
* hobby domains
* Transferring to Porkbun
* b3n.ooo
* benmiller.xyz
* beepmill.com
### IPAM ### IPAM
* wifi: `192.168.86.0/24` * wifi: `192.168.86.0/24`

BIN
image-1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 MiB

BIN
image.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 MiB

View File

@ -8,3 +8,24 @@
* Control panel: https://charachorder.io/ * Control panel: https://charachorder.io/
* Practice: https://www.iq-eq.io/#/ * Practice: https://www.iq-eq.io/#/
* *
## Custom Build 1
* Dactyl Manuform style built with Cosmos Keyboard Configurator
* https://ryanis.cool/cosmos/beta#cm:Cn4KDxIFEJBBIBMSABIAODFAAAoPEgUQkE0gExIAEgA4HUAAChsSBRCQWSATEgASAxCwLxIDELBfOAlAgPCG+AEKGRIFEJBlIBMSABIDELA7EgMQsGs4CkCAgAwKExIFEJBxIBMSABIAOB5AgJqL0AIYAEDqhaCu8FVI3Iyr0AEKaAoXEhMQwIACQICAmAJIwpmglZC8AVBDOAgKFRIQEEBAgIAgSNCVgN2Q9QNQC1CeAgoUEhAQQECAgPgBSOaZ/KeQC1BXUH8KA1CCAhgCIgoIyAEQyAEYACAAQMuL/J/QMUitkdyNwZMGCngKDxIFEJA1IBMSABIAODJAAAoPEgUQkCkgExIAEgA4HkAAChgSBRCQHSATEgASABIDELBfOApAgISK2AIKFhIFEJARIBMSABIAEgMQsGs4CUCA6DQKExIFEJAFIBMSABIAOB1AgJqOsAMYAUDphaCu8FVI3IqryAEKaQoXEhMQwIACQICAmAJIwpmclaC8AVBDOAcKFRIQEEBAgIAgSNCV/Nyg9QNQC1CdAgoVEhAQQECAgPgBSOaZgKygC1BXUIABCgNQgQIYAyIKCMgBEMgBGAAgAEDMi/yf0DFIrZHgjbGTBiIDIK4NggEKAJ4FyAFllwEBAlhCYANoAPoBCRCIDhg8KGQoMg==
* https://www.printables.com/model/158559-handwire-hot-swap-socket-for-mechanical-keyboard-s
* `G:\My Drive\making\files\cosmotyl`
### Wiring
![Alt text](image.png)
![Alt text](image-1.png)
* https://ryanis.cool/cosmos/docs/qmk-rp2040/#wire-the-keyboard
*
## Training
* https://typecelerate.com/

View File

@ -0,0 +1,29 @@
{
"folders": [
{
"path": "../local-ai-beepmill"
}
],
"settings": {
"workbench.colorCustomizations": {
"activityBar.activeBackground": "#982a11",
"activityBar.background": "#982a11",
"activityBar.foreground": "#e7e7e7",
"activityBar.inactiveForeground": "#e7e7e799",
"activityBarBadge.background": "#031d08",
"activityBarBadge.foreground": "#e7e7e7",
"commandCenter.border": "#e7e7e799",
"sash.hoverBorder": "#982a11",
"statusBar.background": "#6a1d0c",
"statusBar.foreground": "#e7e7e7",
"statusBarItem.hoverBackground": "#982a11",
"statusBarItem.remoteBackground": "#6a1d0c",
"statusBarItem.remoteForeground": "#e7e7e7",
"titleBar.activeBackground": "#6a1d0c",
"titleBar.activeForeground": "#e7e7e7",
"titleBar.inactiveBackground": "#6a1d0c99",
"titleBar.inactiveForeground": "#e7e7e799"
},
"peacock.color": "#6a1d0c"
}
}

View File

@ -1,5 +1,5 @@
# making # making
## Collections ## Collections
* https://makerworld.com/en/@beepmill/collections * https://makerworld.com/en/@beepmill/collections
@ -26,7 +26,10 @@
## Things to print ## Things to print
* https://thangs.com/designer/ForgeCore
* Desk plants
* Resin teeth #booloumud * Resin teeth #booloumud
* [Modern Gridifinity Case](https://www.printables.com/model/894202-modern-gridfinity-case)
* [Space Efficient Socket Holders - Gridfinity](https://www.printables.com/model/1101988-space-efficient-socket-holders-gridfinity/files) * [Space Efficient Socket Holders - Gridfinity](https://www.printables.com/model/1101988-space-efficient-socket-holders-gridfinity/files)
* Printing metric [[2025-06-15]] * Printing metric [[2025-06-15]]
* Printing imperial [[2025-06-17]] * Printing imperial [[2025-06-17]]
@ -38,6 +41,7 @@
## Things that I've printed ## Things that I've printed
* [[2025-07-01]] - [Rubber Duck straw cap for Stanley tumbler](https://makerworld.com/en/models/495619-rubber-duck-straw-cap-for-stanley-tumbler#profileId-409800)
* [[2025-06-30]] - https://www.printables.com/model/836037-earring-holder-earring-display-stand-t-shape * [[2025-06-30]] - https://www.printables.com/model/836037-earring-holder-earring-display-stand-t-shape
* [[2025-06-19]] - [Anti-Stress Spikeroll by Paul_Drosser - Thingiverse](https://www.thingiverse.com/thing:4575204) * [[2025-06-19]] - [Anti-Stress Spikeroll by Paul_Drosser - Thingiverse](https://www.thingiverse.com/thing:4575204)
* [[2025-06-18]] - [Lid Riser for Bambu Lab AMS](https://www.printables.com/model/602705-ams-lid-riser-for-bambu-lab-ams/comments) * [[2025-06-18]] - [Lid Riser for Bambu Lab AMS](https://www.printables.com/model/602705-ams-lid-riser-for-bambu-lab-ams/comments)
@ -46,6 +50,7 @@
## Calibration guides ## Calibration guides
* [Ellis Print Tuning Guide](https://ellis3dp.com/Print-Tuning-Guide/)
* [J3DTech Guide to Resin 3D Printing - Google Docs](https://docs.google.com/document/d/1aoMSE6GBGMcoYXNGfPP9s_Jg8vr1wQmmZuvqP3suago/edit?tab=t.0#heading=h.gjdgxs) * [J3DTech Guide to Resin 3D Printing - Google Docs](https://docs.google.com/document/d/1aoMSE6GBGMcoYXNGfPP9s_Jg8vr1wQmmZuvqP3suago/edit?tab=t.0#heading=h.gjdgxs)
* [Printer Calibration Lychee Documentation](https://doc.mango3d.io/doc/printer-calibration/) * [Printer Calibration Lychee Documentation](https://doc.mango3d.io/doc/printer-calibration/)
@ -69,7 +74,8 @@
[//begin]: # "Autogenerated link references for markdown compatibility" [//begin]: # "Autogenerated link references for markdown compatibility"
[2025-06-15]: 2025-06-15.md "2025-06-15" [2025-06-15]: 2025-06-15.md "2025-06-15"
[2025-06-17]: 2025-06-17.md "2025-06-17" [2025-06-17]: 2025-06-17.md "2025-06-17"
[2025-07-01]: 2025-07-01.md "2025-07-01"
[2025-06-30]: 2025-06-30.md "2025-06-30" [2025-06-30]: 2025-06-30.md "2025-06-30"
[2025-06-19]: 2025-06-19.md "2025-06-19" [2025-06-19]: 2025-06-19.md "2025-06-19"
[2025-06-18]: 2025-06-18.md "2025-06-18" [2025-06-18]: 2025-06-18.md "2025-06-18"
[//end]: # "Autogenerated link references" [//end]: # "Autogenerated link references"

View File

@ -0,0 +1,29 @@
{
"folders": [
{
"path": "../shopify_theme"
}
],
"settings": {
"workbench.colorCustomizations": {
"activityBar.activeBackground": "#accc6e",
"activityBar.background": "#accc6e",
"activityBar.foreground": "#15202b",
"activityBar.inactiveForeground": "#15202b99",
"activityBarBadge.background": "#3a81a5",
"activityBarBadge.foreground": "#e7e7e7",
"commandCenter.border": "#15202b99",
"sash.hoverBorder": "#accc6e",
"statusBar.background": "#96bf48",
"statusBar.foreground": "#15202b",
"statusBarItem.hoverBackground": "#7a9d37",
"statusBarItem.remoteBackground": "#96bf48",
"statusBarItem.remoteForeground": "#15202b",
"titleBar.activeBackground": "#96bf48",
"titleBar.activeForeground": "#15202b",
"titleBar.inactiveBackground": "#96bf4899",
"titleBar.inactiveForeground": "#15202b99"
},
"peacock.color": "#96bf48"
}
}

22
to watch.md Normal file
View File

@ -0,0 +1,22 @@
---
created: 2025-08-20T11:26:28-06:00
modified: 2025-09-25T21:29:44-06:00
---
# to watch
- [x] Department Q
- [ ] Superman
- [ ] Thunderbolts
- [ ] Alien Earth
- [ ] Honey Don't
- [ ] Loki season 2
- [ ] The Naked Gun
- [ ] Decameron
- [ ] The Death of Stalin
- [ ] Love Lies Bleeding
- [ ] Fleabag
- [ ] The Midnight Hour
- [ ] Paprika
- [ ] What We Do In The Shadows
- [ ] Bugonia