Skip to content

Commit

Permalink
Merge branch 'master' into 26_elasticagent
Browse files Browse the repository at this point in the history
  • Loading branch information
enggnr authored Jul 10, 2023
2 parents cd2a814 + 9da9100 commit 06c0429
Show file tree
Hide file tree
Showing 97 changed files with 4,157 additions and 262 deletions.
35 changes: 35 additions & 0 deletions docs/ERROR.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
```
🍺 /usr/local/Cellar/sftpgo/2.5.3: 174 files, 50.3MB
==> Running `brew cleanup sftpgo`...
Removing: /usr/local/Cellar/sftpgo/2.5.2... (174 files, 50.2MB)
==> Upgrading angular-cli
16.1.1 -> 16.1.4
==> Pouring angular-cli--16.1.4.ventura.bottle.tar.gz
🍺 /usr/local/Cellar/angular-cli/16.1.4: 6,965 files, 31.2MB
==> Running `brew cleanup angular-cli`...
Removing: /usr/local/Cellar/angular-cli/16.1.1... (6,970 files, 31.2MB)
==> Upgrading docker-compose
2.19.0 -> 2.19.1
==> Pouring docker-compose--2.19.1.ventura.bottle.tar.gz
Error: The `brew link` step did not complete successfully
The formula built, but is not symlinked into /usr/local
Could not symlink bin/docker-compose
Target /usr/local/bin/docker-compose
already exists. You may want to remove it:
rm '/usr/local/bin/docker-compose'
To force the link and overwrite all conflicting files:
brew link --overwrite docker-compose
To list all files that would be deleted:
brew link --overwrite --dry-run docker-compose
Possible conflicting files are:
/usr/local/bin/docker-compose -> /Applications/Docker.app/Contents/Resources/bin/docker-compose
==> Caveats
Compose is now a Docker plugin. For Docker to find this plugin, symlink it:
mkdir -p ~/.docker/cli-plugins
ln -sfn /usr/local/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose
```
4 changes: 4 additions & 0 deletions docs/INSPIRATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
* https://cliffy.io/[email protected]
* https://github.com/gotify/server
* https://github.com/typicode/lowdb
* https://github.com/sindresorhus/execa
* [Title](https://github.com/mde/ejs)

## System

Expand Down Expand Up @@ -61,6 +63,8 @@
* https://uppy.io/docs/dashboard/
* https://unkey.dev/
* [Title](https://github.com/vercel-labs/ai-chatbot)
* [Title](https://github.com/apostrophecms/apostrophe)
* [Title](https://github.com/isomorphic-git/isomorphic-git)

## Serverless

Expand Down
15 changes: 15 additions & 0 deletions docs/TODO.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
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

# TODOs

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.
Expand Down Expand Up @@ -135,6 +137,14 @@ The following items are Docker containers that we may want to include as default
* https://github.com/node-red/node-red
* https://www.overleaf.com/
* https://github.com/caprover/caprover
* [Title](https://github.com/xemle/home-gallery)
* [Title](https://github.com/chartbrew/chartbrew)
* [Title](https://github.com/AlexSciFier/neonlink)
* [Title](https://github.com/ForestAdmin/lumber)
* [Title](https://github.com/subnub/myDrive)
* [Title](https://github.com/mickael-kerjean/filestash)
* [Title](https://github.com/GetStream/Winds)
* [Title](https://github.com/GladysAssistant/Gladys)

## AI

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

## Docker Issue

Expand Down
17 changes: 16 additions & 1 deletion home/.chezmoi.yaml.tmpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{{- $cloudflareR2AccountId := (default "84fa0d1b16ff8086dd958c468ce7fd59" (env "CLOUDFLARE_R2_ID")) -}}
{{- $cloudflareUsername := (default "[email protected]" (env "CLOUDFLARE_USERNAME")) -}}
{{- $cloudflareTeamsOrg := (default "manhattan" (env "CLOUDFLARE_TEAMS_ORG")) -}}
{{- $desktopSession := true -}}
{{- $domain := (default "megabyte.space" (env "PUBLIC_SERVICES_DOMAIN")) -}}
{{- $email := (default "[email protected]" (env "PRIMARY_EMAIL")) -}}
Expand Down Expand Up @@ -127,6 +128,8 @@ gpg:
data:
host:
arch: "{{ .chezmoi.arch }}"
cloudflare:
teamsOrg: "{{ $cloudflareTeamsOrg }}"
cpu:
cores: "{{ $cpuCores }}"
threads: "{{ $cpuThreads }}"
Expand All @@ -141,6 +144,15 @@ data:
doRegion: nyc1
domain: "{{ $domain }}"
elasticFleetServer: "https://elastic-fleet.{{ $PUBLIC_SERVICES_DOMAIN }}:8220"
gitlabRunners:
- glurl: "https://gitlab.com/"
runnerDescription: "Docker executor"
runnerImage: "alpine:latest"
runnerTags: "alpine,linux"
- glurl: "https://gitlab.com/"
baseVM: "debian"
runnerDescription: "VirtualBox executor - Debian, OpenJDK 20"
runnerTags: "bash,openjdk20,linux"
headless: {{ $headless }}
home: "{{ .chezmoi.homeDir }}"
homeParentFolder: "{{ if eq .chezmoi.os "linux" }}/home{{ else if eq .chezmoi.os "darwin" }}/Users{{ else }}C:\Users{{ end }}"
Expand Down Expand Up @@ -172,7 +184,7 @@ data:
r2: "{{ $cloudflareR2AccountId }}"
username: "{{ $cloudflareUsername }}"
defaultBrowser: chrome
defaultBrowserDarwin: browserosaurus
defaultBrowserDarwin: chrome
digitalOceanClusterId: b7fc4e37-ffe7-4ea1-887a-0e19ee077f32
# `domain` is kept here for backwards compatibility, but the .host.domain is the preferred selector
domain: "{{ $domain }}"
Expand All @@ -182,6 +194,9 @@ data:
email: "{{ $gcloudEmail }}"
github:
username: "{{ $githubUsername }}"
gitomatic:
- git: "{{ default "[email protected]:megabyte-labs/install.doctor.git" (env "START_REPO") }}"
path: /usr/local/src/install.doctor
gmail:
username: "{{ $gmailAddress }}"
gpg:
Expand Down
17 changes: 15 additions & 2 deletions home/.chezmoidata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ chromeExtensions:
- bitwarden-free-password-m/nngceckbapebfimnlniiiahkandclblb
- briskine-email-templates/lmcngpkjkplipamgflhioabnhnopeabf
- buffer/noojglkidnpfjbincgijbaiedldjfbhh
- buster-captcha-solver-for/mpbjkejclgfgadiemmefgebjfooflfhl
- chatgpt-app-for-chrome-me/camppjleccjaphfdbohjdohecfnoikec
- chatgpt-for-google/jgjaeacdkonaoafenlfkkkmbaopkbilf
- chrome-remote-desktop/inomeogfingihgjfjlpeplalcfajhgai
Expand Down Expand Up @@ -106,6 +107,7 @@ firefoxAddOns:
- automa
- bitwarden-password-manager
- buffer-for-firefox
- buster-captcha-solver
- canvasblocker
- chatgpt-for-google
- clearurls
Expand Down Expand Up @@ -166,6 +168,7 @@ softwareGroups:
- mage-ai
- shell-gpt
Android: &Android
- apktool
- scrcpy
Android-Desktop: &Android-Desktop
- android-studio
Expand Down Expand Up @@ -332,6 +335,7 @@ softwareGroups:
- fig
- filebrowser
- fm
- gitmoji-cli
- gopass
- grex
- gron
Expand Down Expand Up @@ -370,8 +374,10 @@ softwareGroups:
- stegcloak
- thefuck
- tldr
- xdotool
- tmuxinator
- up
- wallpaper-cli
- xz
- yank
Cloud: &Cloud
Expand Down Expand Up @@ -471,6 +477,7 @@ softwareGroups:
- meld
- powershell
- redis-desktop-manager
- redis-insight
- visual-studio
- warp-terminal
- winui-gallery
Expand All @@ -486,6 +493,7 @@ softwareGroups:
- dive
- docker-slim
- dockle
- dockly
- footloose
- grype
- trivy
Expand Down Expand Up @@ -520,6 +528,7 @@ softwareGroups:
- kvantum
- lapce
- malwarebytes
- mpv
- portmaster
- rofi
- sddm
Expand Down Expand Up @@ -648,6 +657,7 @@ softwareGroups:
- exiftool
- ffmpeg
- imagemagick
- jpegoptim
- korkut
- pandoc
- sharp
Expand Down Expand Up @@ -736,6 +746,7 @@ softwareGroups:
- gradle
- ideviceinstaller
- ios-deploy
- ios-sim
- java
- libimobiledevice
- license
Expand Down Expand Up @@ -777,6 +788,7 @@ softwareGroups:
- nebula
- ngrok
- privaxy
- pwnat
- rustscan
- ssl-proxy
- tailscale
Expand Down Expand Up @@ -872,13 +884,13 @@ softwareGroups:
- privileges
- protonvpn
- santa
- swifty
- tunnelblick
- yubikey-authenticator
- yubikey-manager-qt
Server: &Server
- cockpit
- cups
- elastic-agent
- netdata
- samba
- sftpgo
Expand All @@ -898,6 +910,7 @@ softwareGroups:
- goaccess
- gtop
- htop
- masscan
- pulumi
- sysbench
- sysdig
Expand Down Expand Up @@ -1045,6 +1058,7 @@ softwareGroups:
- ts2c
- typescript
- typescript-to-lua
- web-ext
- websocat
- wordops
- wordpressify
Expand Down Expand Up @@ -1109,7 +1123,6 @@ softwareGroups:
- cockpit
- docker
- dotnet
- elastic-agent
- envchain
- etcd
- exiftool
Expand Down
15 changes: 5 additions & 10 deletions home/.chezmoiexternal.toml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@
type = "file"
url = "https://developers.cloudflare.com/cloudflare-one/static/documentation/connections/Cloudflare_CA.pem"

### Curl / Google Cloud SDK
[".local/share/curl/cacert.pem"]
type = "file"
url = "https://curl.se/ca/cacert.pem"

### Betelgeuse Theme
[".local/src/betelgeuse"]
type = "git-repo"
Expand Down Expand Up @@ -189,16 +194,6 @@
clone.args = ["--depth", "1"]
pull.args = ["--ff-only"]

### iTerm2 Shell Integration
[".local/src/iterm2/shell-integration.zsh"]
type = "file"
url = "https://iterm2.com/shell_integration/zsh"
refreshPeriod = "{{ $refreshPeriod }}"
[".local/src/iterm2/shell-integration.bash"]
type = "file"
url = "https://iterm2.com/shell_integration/bash"
refreshPeriod = "{{ $refreshPeriod }}"

### Ansible Roles / Playbook
[".local/src/gas-station"]
type = "git-repo"
Expand Down
Loading

0 comments on commit 06c0429

Please sign in to comment.