Skip to content

Commit 06c0429

Browse files
authored
Merge branch 'master' into 26_elasticagent
2 parents cd2a814 + 9da9100 commit 06c0429

File tree

97 files changed

+4157
-262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+4157
-262
lines changed

docs/ERROR.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
```
2+
🍺 /usr/local/Cellar/sftpgo/2.5.3: 174 files, 50.3MB
3+
==> Running `brew cleanup sftpgo`...
4+
Removing: /usr/local/Cellar/sftpgo/2.5.2... (174 files, 50.2MB)
5+
==> Upgrading angular-cli
6+
16.1.1 -> 16.1.4
7+
8+
==> Pouring angular-cli--16.1.4.ventura.bottle.tar.gz
9+
🍺 /usr/local/Cellar/angular-cli/16.1.4: 6,965 files, 31.2MB
10+
==> Running `brew cleanup angular-cli`...
11+
Removing: /usr/local/Cellar/angular-cli/16.1.1... (6,970 files, 31.2MB)
12+
==> Upgrading docker-compose
13+
2.19.0 -> 2.19.1
14+
15+
==> Pouring docker-compose--2.19.1.ventura.bottle.tar.gz
16+
Error: The `brew link` step did not complete successfully
17+
The formula built, but is not symlinked into /usr/local
18+
Could not symlink bin/docker-compose
19+
Target /usr/local/bin/docker-compose
20+
already exists. You may want to remove it:
21+
rm '/usr/local/bin/docker-compose'
22+
23+
To force the link and overwrite all conflicting files:
24+
brew link --overwrite docker-compose
25+
26+
To list all files that would be deleted:
27+
brew link --overwrite --dry-run docker-compose
28+
29+
Possible conflicting files are:
30+
/usr/local/bin/docker-compose -> /Applications/Docker.app/Contents/Resources/bin/docker-compose
31+
==> Caveats
32+
Compose is now a Docker plugin. For Docker to find this plugin, symlink it:
33+
mkdir -p ~/.docker/cli-plugins
34+
ln -sfn /usr/local/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose
35+
```

docs/INSPIRATION.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
* https://cliffy.io/[email protected]
1818
* https://github.com/gotify/server
1919
* https://github.com/typicode/lowdb
20+
* https://github.com/sindresorhus/execa
21+
* [Title](https://github.com/mde/ejs)
2022

2123
## System
2224

@@ -61,6 +63,8 @@
6163
* https://uppy.io/docs/dashboard/
6264
* https://unkey.dev/
6365
* [Title](https://github.com/vercel-labs/ai-chatbot)
66+
* [Title](https://github.com/apostrophecms/apostrophe)
67+
* [Title](https://github.com/isomorphic-git/isomorphic-git)
6468

6569
## Serverless
6670

docs/TODO.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
sysbench rhino platformio emscripten mkvtoolnix ncftp gauge foremost autogen duti multitail testdisk ccat qrencode autoconf-archive tomcat filebeat godep arping lua git-credential-manager rbenv-default-gems source-highlight theora shtool giter8 ipmitool saltstack squid ettercap pidcat calc mongodb wdiff dialog john reaver oath-toolkit xhyve elm icdiff polipo fcrackzip ddrescue pngcrush gitlab-ci-multi-runner tcl-tk flac elinks stunnel caddy tcpreplay fping zenity terragrunt dbus pigz grpc diffutils hping fdupes sonarqube fabric links pinentry augeas haproxy autossh binwalk unzip cabal-install cscope sonar-scanner wakeonlan tmate sshuttle solr tcptraceroute pinentry-mac swiftformat uncrustify hashcat handbrake iproute2mac 2fsprogs hydra you-get cabextract neofetch trash sphinx-doc iftop htop-osx dockutil xctool aspell w3m grc screenfetch moreutils apktool brew-cask-completion openconnect media-info lftp unison logstash pstree rpm opam peco netcat iperf3 libav gifsicle iperf colordiff lmdb mcrypt httprack aircrack-ng ntfs-3g glide bower glog parallel cloc mitmproxy bison rename kubernetes-helm gdbm mobile-shell geckodriver socat pv sdl swig pcre winetricks doxygen mtr graphicsmagick dos2unix highlight putty llvm bazel flow watch hugo sqlite gdb ant mariadb mercurial nmap pidof autoconf maven readline libtool automake chromedriver pkg-config coreutils
2+
13
# TODOs
24

35
This page outlines various projects and tasks that we are currently working on. Creating a GitHub issue for each of these items would be overkill.
@@ -135,6 +137,14 @@ The following items are Docker containers that we may want to include as default
135137
* https://github.com/node-red/node-red
136138
* https://www.overleaf.com/
137139
* https://github.com/caprover/caprover
140+
* [Title](https://github.com/xemle/home-gallery)
141+
* [Title](https://github.com/chartbrew/chartbrew)
142+
* [Title](https://github.com/AlexSciFier/neonlink)
143+
* [Title](https://github.com/ForestAdmin/lumber)
144+
* [Title](https://github.com/subnub/myDrive)
145+
* [Title](https://github.com/mickael-kerjean/filestash)
146+
* [Title](https://github.com/GetStream/Winds)
147+
* [Title](https://github.com/GladysAssistant/Gladys)
138148

139149
## AI
140150

@@ -203,6 +213,11 @@ The following items have been reviewed but need to be revisited due to complexit
203213
* [Title](https://github.com/hyprwm/Hypr)
204214
* [Title](https://github.com/Sygil-Dev/sygil-webui)
205215
* [Title](https://github.com/psychic-api/psychic)
216+
* [Title](https://github.com/telekom-security/tpotce)
217+
* [Title](https://flathub.org/apps/com.airtame.Client)
218+
* [Title](https://github.com/Aloxaf/fzf-tab)
219+
[Title](https://github.com/haproxy/haproxy)
220+
* [Title](https://frappeframework.com/docs/v14/user/en/installation)
206221

207222
## Docker Issue
208223

home/.chezmoi.yaml.tmpl

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{{- $cloudflareR2AccountId := (default "84fa0d1b16ff8086dd958c468ce7fd59" (env "CLOUDFLARE_R2_ID")) -}}
22
{{- $cloudflareUsername := (default "[email protected]" (env "CLOUDFLARE_USERNAME")) -}}
3+
{{- $cloudflareTeamsOrg := (default "manhattan" (env "CLOUDFLARE_TEAMS_ORG")) -}}
34
{{- $desktopSession := true -}}
45
{{- $domain := (default "megabyte.space" (env "PUBLIC_SERVICES_DOMAIN")) -}}
56
{{- $email := (default "[email protected]" (env "PRIMARY_EMAIL")) -}}
@@ -127,6 +128,8 @@ gpg:
127128
data:
128129
host:
129130
arch: "{{ .chezmoi.arch }}"
131+
cloudflare:
132+
teamsOrg: "{{ $cloudflareTeamsOrg }}"
130133
cpu:
131134
cores: "{{ $cpuCores }}"
132135
threads: "{{ $cpuThreads }}"
@@ -141,6 +144,15 @@ data:
141144
doRegion: nyc1
142145
domain: "{{ $domain }}"
143146
elasticFleetServer: "https://elastic-fleet.{{ $PUBLIC_SERVICES_DOMAIN }}:8220"
147+
gitlabRunners:
148+
- glurl: "https://gitlab.com/"
149+
runnerDescription: "Docker executor"
150+
runnerImage: "alpine:latest"
151+
runnerTags: "alpine,linux"
152+
- glurl: "https://gitlab.com/"
153+
baseVM: "debian"
154+
runnerDescription: "VirtualBox executor - Debian, OpenJDK 20"
155+
runnerTags: "bash,openjdk20,linux"
144156
headless: {{ $headless }}
145157
home: "{{ .chezmoi.homeDir }}"
146158
homeParentFolder: "{{ if eq .chezmoi.os "linux" }}/home{{ else if eq .chezmoi.os "darwin" }}/Users{{ else }}C:\Users{{ end }}"
@@ -172,7 +184,7 @@ data:
172184
r2: "{{ $cloudflareR2AccountId }}"
173185
username: "{{ $cloudflareUsername }}"
174186
defaultBrowser: chrome
175-
defaultBrowserDarwin: browserosaurus
187+
defaultBrowserDarwin: chrome
176188
digitalOceanClusterId: b7fc4e37-ffe7-4ea1-887a-0e19ee077f32
177189
# `domain` is kept here for backwards compatibility, but the .host.domain is the preferred selector
178190
domain: "{{ $domain }}"
@@ -182,6 +194,9 @@ data:
182194
email: "{{ $gcloudEmail }}"
183195
github:
184196
username: "{{ $githubUsername }}"
197+
gitomatic:
198+
- git: "{{ default "[email protected]:megabyte-labs/install.doctor.git" (env "START_REPO") }}"
199+
path: /usr/local/src/install.doctor
185200
gmail:
186201
username: "{{ $gmailAddress }}"
187202
gpg:

home/.chezmoidata.yaml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ chromeExtensions:
5050
- bitwarden-free-password-m/nngceckbapebfimnlniiiahkandclblb
5151
- briskine-email-templates/lmcngpkjkplipamgflhioabnhnopeabf
5252
- buffer/noojglkidnpfjbincgijbaiedldjfbhh
53+
- buster-captcha-solver-for/mpbjkejclgfgadiemmefgebjfooflfhl
5354
- chatgpt-app-for-chrome-me/camppjleccjaphfdbohjdohecfnoikec
5455
- chatgpt-for-google/jgjaeacdkonaoafenlfkkkmbaopkbilf
5556
- chrome-remote-desktop/inomeogfingihgjfjlpeplalcfajhgai
@@ -106,6 +107,7 @@ firefoxAddOns:
106107
- automa
107108
- bitwarden-password-manager
108109
- buffer-for-firefox
110+
- buster-captcha-solver
109111
- canvasblocker
110112
- chatgpt-for-google
111113
- clearurls
@@ -166,6 +168,7 @@ softwareGroups:
166168
- mage-ai
167169
- shell-gpt
168170
Android: &Android
171+
- apktool
169172
- scrcpy
170173
Android-Desktop: &Android-Desktop
171174
- android-studio
@@ -332,6 +335,7 @@ softwareGroups:
332335
- fig
333336
- filebrowser
334337
- fm
338+
- gitmoji-cli
335339
- gopass
336340
- grex
337341
- gron
@@ -370,8 +374,10 @@ softwareGroups:
370374
- stegcloak
371375
- thefuck
372376
- tldr
377+
- xdotool
373378
- tmuxinator
374379
- up
380+
- wallpaper-cli
375381
- xz
376382
- yank
377383
Cloud: &Cloud
@@ -471,6 +477,7 @@ softwareGroups:
471477
- meld
472478
- powershell
473479
- redis-desktop-manager
480+
- redis-insight
474481
- visual-studio
475482
- warp-terminal
476483
- winui-gallery
@@ -486,6 +493,7 @@ softwareGroups:
486493
- dive
487494
- docker-slim
488495
- dockle
496+
- dockly
489497
- footloose
490498
- grype
491499
- trivy
@@ -520,6 +528,7 @@ softwareGroups:
520528
- kvantum
521529
- lapce
522530
- malwarebytes
531+
- mpv
523532
- portmaster
524533
- rofi
525534
- sddm
@@ -648,6 +657,7 @@ softwareGroups:
648657
- exiftool
649658
- ffmpeg
650659
- imagemagick
660+
- jpegoptim
651661
- korkut
652662
- pandoc
653663
- sharp
@@ -736,6 +746,7 @@ softwareGroups:
736746
- gradle
737747
- ideviceinstaller
738748
- ios-deploy
749+
- ios-sim
739750
- java
740751
- libimobiledevice
741752
- license
@@ -777,6 +788,7 @@ softwareGroups:
777788
- nebula
778789
- ngrok
779790
- privaxy
791+
- pwnat
780792
- rustscan
781793
- ssl-proxy
782794
- tailscale
@@ -872,13 +884,13 @@ softwareGroups:
872884
- privileges
873885
- protonvpn
874886
- santa
887+
- swifty
875888
- tunnelblick
876889
- yubikey-authenticator
877890
- yubikey-manager-qt
878891
Server: &Server
879892
- cockpit
880893
- cups
881-
- elastic-agent
882894
- netdata
883895
- samba
884896
- sftpgo
@@ -898,6 +910,7 @@ softwareGroups:
898910
- goaccess
899911
- gtop
900912
- htop
913+
- masscan
901914
- pulumi
902915
- sysbench
903916
- sysdig
@@ -1045,6 +1058,7 @@ softwareGroups:
10451058
- ts2c
10461059
- typescript
10471060
- typescript-to-lua
1061+
- web-ext
10481062
- websocat
10491063
- wordops
10501064
- wordpressify
@@ -1109,7 +1123,6 @@ softwareGroups:
11091123
- cockpit
11101124
- docker
11111125
- dotnet
1112-
- elastic-agent
11131126
- envchain
11141127
- etcd
11151128
- exiftool

home/.chezmoiexternal.toml.tmpl

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626
type = "file"
2727
url = "https://developers.cloudflare.com/cloudflare-one/static/documentation/connections/Cloudflare_CA.pem"
2828

29+
### Curl / Google Cloud SDK
30+
[".local/share/curl/cacert.pem"]
31+
type = "file"
32+
url = "https://curl.se/ca/cacert.pem"
33+
2934
### Betelgeuse Theme
3035
[".local/src/betelgeuse"]
3136
type = "git-repo"
@@ -189,16 +194,6 @@
189194
clone.args = ["--depth", "1"]
190195
pull.args = ["--ff-only"]
191196

192-
### iTerm2 Shell Integration
193-
[".local/src/iterm2/shell-integration.zsh"]
194-
type = "file"
195-
url = "https://iterm2.com/shell_integration/zsh"
196-
refreshPeriod = "{{ $refreshPeriod }}"
197-
[".local/src/iterm2/shell-integration.bash"]
198-
type = "file"
199-
url = "https://iterm2.com/shell_integration/bash"
200-
refreshPeriod = "{{ $refreshPeriod }}"
201-
202197
### Ansible Roles / Playbook
203198
[".local/src/gas-station"]
204199
type = "git-repo"

0 commit comments

Comments
 (0)