From 16618eb983975937b86b11c9df1c999e72853a00 Mon Sep 17 00:00:00 2001 From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com> Date: Sat, 6 Jan 2024 04:28:02 +0000 Subject: [PATCH] Latest --- docs/INSPIRATION.md | 7 ++ docs/TODO.md | 5 +- home/.chezmoidata.yaml | 5 + .../group.com.docker/settings.json.tmpl | 108 ++++++++++++++++++ home/dot_bashrc | 24 ++-- home/dot_config/docker/config.json.tmpl | 7 +- home/dot_config/docker/daemon.json.tmpl | 6 +- home/dot_zshrc | 24 ++-- software.yml | 35 ++++++ system/etc/wsl.conf | 5 + 10 files changed, 196 insertions(+), 30 deletions(-) create mode 100644 home/Library/Group Containers/group.com.docker/settings.json.tmpl create mode 100644 system/etc/wsl.conf diff --git a/docs/INSPIRATION.md b/docs/INSPIRATION.md index fcfe4938..11e3591b 100644 --- a/docs/INSPIRATION.md +++ b/docs/INSPIRATION.md @@ -10,6 +10,7 @@ ## System - https://github.com/Andy-Python-Programmer/aero +- https://github.com/Qihoo360/QConf/tree/master ## Website @@ -54,6 +55,7 @@ - [Title](https://github.com/isomorphic-git/isomorphic-git) - https://github.com/tolgee/tolgee-platform - https://github.com/dogbin/dogbin +- https://github.com/judge0/judge0 ## Serverless @@ -69,3 +71,8 @@ - https://namelix.com/ - https://gchq.github.io/CyberChef - https://github.com/sourcerer-io/sourcerer-app + +## OS + +https://github.com/skift-org/skift +https://github.com/MikeMcQuaid/strap/tree/main diff --git a/docs/TODO.md b/docs/TODO.md index f7fc8e5f..8931ac91 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -1,4 +1,4 @@ - +https://github.com/harababurel/gcsf * Move age decryption higher * Add ~/.local/share/sounds was symlink to {{ .host.home }}/.local/share/betelgeuse/share/sounds xattr -d com.apple.quarantine rclone @@ -18,6 +18,8 @@ adobe-creative-cloud curl: (18) HTTP/2 stream 1 was reset - https://github.com/linuxserver/docker-webtop - https://app.warp.dev/referral/7PMXRV - https://github.com/chocolatey/boxstarter +- https://github.com/home-sweet-gnome/dash-to-panel +- https://github.com/Shougo/neocomplcache.vim - https://nginxui.com/ # Create the $HOME/opt destination folder mkdir -p ~/opt @@ -223,6 +225,7 @@ The following items have been reviewed but need to be revisited due to complexit - https://github.com/open-hand/choerodon - https://github.com/1backend/1backend - https://github.com/redkubes/otomi-core +- https://github.com/shunfei/cronsun - https://github.com/yunionio/cloudpods - https://github.com/tkestack/tke - https://www.rancher.com/ diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml index a3bc4956..1796732f 100644 --- a/home/.chezmoidata.yaml +++ b/home/.chezmoidata.yaml @@ -844,6 +844,7 @@ softwareGroups: - license - lightproxy - lua + - makeself - meta - mono - ntl @@ -1007,6 +1008,7 @@ softwareGroups: Shell-Scripting: &Shell-Scripting - argc - bashly + - bats - shc - shdoc - shellcheck @@ -1030,8 +1032,10 @@ softwareGroups: - iproute2mac - macprefs - masscan + - plumber - prefsniff - pulumi + - rtop - sysbench - sysdig - sysz @@ -1122,6 +1126,7 @@ softwareGroups: - deno - deta - devbox + - devspace - electron - emma - fastify diff --git a/home/Library/Group Containers/group.com.docker/settings.json.tmpl b/home/Library/Group Containers/group.com.docker/settings.json.tmpl new file mode 100644 index 00000000..34665614 --- /dev/null +++ b/home/Library/Group Containers/group.com.docker/settings.json.tmpl @@ -0,0 +1,108 @@ +{ + "acceptCanaryUpdates": false, + "activeOrganizationName": "", + "allowBetaFeatures": true, + "allowExperimentalFeatures": true, + "analyticsEnabled": true, + "autoDownloadUpdates": true, + "autoPauseTimedActivitySeconds": 30, + "autoPauseTimeoutSeconds": 3600, + "autoStart": false, + "backupData": false, + "blockDockerLoad": false, + "containerTerminal": "integrated", + "cpus": 8, + "credentialHelper": "docker-credential-osxkeychain", + "customWslDistroDir": "", + "dataFolder": "{{ .chezmoi.homeDir }}/Library/Containers/com.docker.docker/Data/vms/0/data", + "deprecatedCgroupv1": false, + "disableHardwareAcceleration": false, + "disableUpdate": false, + "diskFlush": "os", + "diskSizeMiB": 122070, + "diskStats": "", + "diskTRIM": true, + "displayRestartDialog": true, + "displaySwitchWinLinContainers": false, + "displayed18362Deprecation": false, + "displayedElectronPopup": [], + "displayedOnboarding": false, + "dockerAppLaunchPath": "/Applications/Docker.app", + "dockerBinInstallPath": "system", + "enableDefaultDockerSocket": true, + "enableIntegrationWithDefaultWslDistro": false, + "enableIntegrityCheck": false, + "enableSegmentDebug": false, + "enableWasmShims": true, + "enhancedContainerIsolation": false, + "exposeDockerAPIOnTCP2375": false, + "extensionsEnabled": true, + "extensionsPrivateMarketplace": false, + "extensionsPrivateMarketplaceAdminContactURL": "", + "filesharingDirectories": [ + "/Users", + "/Volumes", + "/private", + "/tmp", + "/var/folders" + ], + "integratedWslDistros": null, + "kernelForUDP": false, + "kubernetesEnabled": true, + "kubernetesInitialInstallPerformed": true, + "lastLoginDate": 0, + "latestBannerKey": "", + "licenseTermsVersion": 2, + "lifecycleTimeoutSeconds": 600, + "memoryMiB": 15360, + "networkType": "gvisor", + "noWindowsContainers": false, + "onlyMarketplaceExtensions": false, + "openUIOnStartupDisabled": false, + "overrideProxyExclude": "", + "overrideProxyHttp": "", + "overrideProxyHttps": "", + "overrideProxyPAC": "", + "overrideWindowsDockerdPort": -1, + "proxyHttpMode": "system", + "requireVmnetd": true, + "runWinServiceInWslMode": false, + "sbomIndexing": true, + "settingsVersion": 35, + "showAnnouncementNotifications": false, + "showExtensionsSystemContainers": false, + "showGeneralNotifications": false, + "showInstallScreen": true, + "showKubernetesSystemContainers": false, + "showSurveyNotifications": false, + "skipUpdateToWSLPrompt": false, + "skipWSLMountPerfWarning": false, + "socksProxyPort": 0, + "swapMiB": 4096, + "synchronizedDirectories": [], + "themeSource": "system", + "updateAvailableTime": 0, + "updateHostsFile": false, + "updateInstallTime": 0, + "useBackgroundIndexing": true, + "useContainerdSnapshotter": true, + "useCredentialHelper": true, + "useGrpcfuse": true, + "useNightlyBuildUpdates": false, + "useResourceSaver": true, + "useVirtualizationFramework": true, + "useVirtualizationFrameworkRosetta": false, + "useVirtualizationFrameworkVirtioFS": true, + "useVpnkit": true, + "useWindowsContainers": false, + "vpnKitAllowedBindAddresses": "0.0.0.0", + "vpnKitMTU": 1500, + "vpnKitMaxConnections": 2000, + "vpnKitMaxPortIdleTime": 300, + "vpnKitTransparentProxy": true, + "vpnkitCIDR": "192.168.67.0/24", + "wslEnableGrpcfuse": false, + "wslEngineEnabled": false, + "wslInstallMode": "installLatestWsl", + "wslUpdateRequired": false +} \ No newline at end of file diff --git a/home/dot_bashrc b/home/dot_bashrc index a0de0fab..67714464 100644 --- a/home/dot_bashrc +++ b/home/dot_bashrc @@ -112,18 +112,18 @@ if [ "$BASH_SUPPORT" = 'true' ] && [ -n "$BASH" ]; then ! command -v cod > /dev/null || source <(cod init $$ bash) ### Conda - if command -v conda > /dev/null && [ -f "${HOMEBREW_PREFIX:-/opt/homebrew}/Caskroom/mambaforge/base/bin/conda" ]; then - __conda_setup="$("${HOMEBREW_PREFIX:-/opt/homebrew}/Caskroom/mambaforge/base/bin/conda" "shell.zsh" "hook" 2> /dev/null)" - if [ $? -eq 0 ]; then - eval "$__conda_setup" - else - if [ -f "${HOMEBREW_PREFIX:-/opt/homebrew}/Caskroom/mambaforge/base/etc/profile.d/conda.sh" ]; then - . "${HOMEBREW_PREFIX:-/opt/homebrew}/Caskroom/mambaforge/base/etc/profile.d/conda.sh" - else - export PATH="${HOMEBREW_PREFIX:-/opt/homebrew}/Caskroom/mambaforge/base/bin:$PATH" - fi - fi - fi + # if command -v conda > /dev/null && [ -f "${HOMEBREW_PREFIX:-/opt/homebrew}/Caskroom/mambaforge/base/bin/conda" ]; then + # __conda_setup="$("${HOMEBREW_PREFIX:-/opt/homebrew}/Caskroom/mambaforge/base/bin/conda" "shell.zsh" "hook" 2> /dev/null)" + # if [ $? -eq 0 ]; then + # eval "$__conda_setup" + # else + # if [ -f "${HOMEBREW_PREFIX:-/opt/homebrew}/Caskroom/mambaforge/base/etc/profile.d/conda.sh" ]; then + # . "${HOMEBREW_PREFIX:-/opt/homebrew}/Caskroom/mambaforge/base/etc/profile.d/conda.sh" + # else + # export PATH="${HOMEBREW_PREFIX:-/opt/homebrew}/Caskroom/mambaforge/base/bin:$PATH" + # fi + # fi + # fi ### Google Cloud SDK [ ! -f "${HOMEBREW_PREFIX}/share/google-cloud-sdk/path.bash.inc" ] || source "$HOMEBREW_PREFIX/share/google-cloud-sdk/path.bash.inc" diff --git a/home/dot_config/docker/config.json.tmpl b/home/dot_config/docker/config.json.tmpl index 2ed2b386..cf634ba3 100644 --- a/home/dot_config/docker/config.json.tmpl +++ b/home/dot_config/docker/config.json.tmpl @@ -2,5 +2,10 @@ "auths": { "https://index.docker.io/v1/": {} }, - "credsStore": "{{ if (eq .host.distro.id "darwin") }}osxkeychain{{ else }}{{ if (eq .host.distro.id "windows") }}wincred{{ else }}secretservice{{ end }}{{ end }}" + "credsStore": "{{ if (eq .host.distro.id "darwin") }}osxkeychain{{ else }}{{ if (eq .host.distro.id "windows") }}wincred{{ else }}secretservice{{ end }}{{ end }}", + "plugins": { + "-x-cli-hints": { + "enabled": "true" + } + } } \ No newline at end of file diff --git a/home/dot_config/docker/daemon.json.tmpl b/home/dot_config/docker/daemon.json.tmpl index c5ea4d8c..0b6dfcc4 100644 --- a/home/dot_config/docker/daemon.json.tmpl +++ b/home/dot_config/docker/daemon.json.tmpl @@ -5,12 +5,10 @@ "enabled": true } }, - "experimental": true, - {{ if (eq .host.distro.family "linux") -}} + "experimental": true{{ if (eq .host.distro.family "linux") }}, "runtimes": { "runsc": { "path": "/usr/local/bin/runsc" } - } -{{ end -}} + }{{ end }} } diff --git a/home/dot_zshrc b/home/dot_zshrc index e04d12fc..fbc46a62 100644 --- a/home/dot_zshrc +++ b/home/dot_zshrc @@ -408,18 +408,18 @@ fi ! command -v cod > /dev/null || source <(cod init $$ zsh) ### Conda -if command -v conda > /dev/null && [ -f "${HOMEBREW_PREFIX:-/opt/homebrew}/Caskroom/mambaforge/base/bin/conda" ]; then - __conda_setup="$("${HOMEBREW_PREFIX:-/opt/homebrew}/Caskroom/mambaforge/base/bin/conda" "shell.zsh" "hook" 2> /dev/null)" - if [ $? -eq 0 ]; then - eval "$__conda_setup" - else - if [ -f "${HOMEBREW_PREFIX:-/opt/homebrew}/Caskroom/mambaforge/base/etc/profile.d/conda.sh" ]; then - . "${HOMEBREW_PREFIX:-/opt/homebrew}/Caskroom/mambaforge/base/etc/profile.d/conda.sh" - else - export PATH="${HOMEBREW_PREFIX:-/opt/homebrew}/Caskroom/mambaforge/base/bin:$PATH" - fi - fi -fi +# if command -v conda > /dev/null && [ -f "${HOMEBREW_PREFIX:-/opt/homebrew}/Caskroom/mambaforge/base/bin/conda" ]; then +# __conda_setup="$("${HOMEBREW_PREFIX:-/opt/homebrew}/Caskroom/mambaforge/base/bin/conda" "shell.zsh" "hook" 2> /dev/null)" +# if [ $? -eq 0 ]; then +# eval "$__conda_setup" +# else +# if [ -f "${HOMEBREW_PREFIX:-/opt/homebrew}/Caskroom/mambaforge/base/etc/profile.d/conda.sh" ]; then +# . "${HOMEBREW_PREFIX:-/opt/homebrew}/Caskroom/mambaforge/base/etc/profile.d/conda.sh" +# else +# export PATH="${HOMEBREW_PREFIX:-/opt/homebrew}/Caskroom/mambaforge/base/bin:$PATH" +# fi +# fi +# fi ### direnv ! command -v direnv > /dev/null || eval "$(direnv hook zsh)" diff --git a/software.yml b/software.yml index afc13796..1bc6c184 100644 --- a/software.yml +++ b/software.yml @@ -1432,6 +1432,18 @@ softwarePackages: brew: bfg choco: bfg-repo-cleaner port: bfg + plumber: + _bin: plumber + _github: https://github.com/streamdal/plumber + _name: Plumber + brew: streamdal/public/plumber + exe: https://github.com/streamdal/plumber/releases/latest/download/plumber-windows.exe + bats: + _bin: bats + _github: https://github.com/bats-core/bats-core + _name: Bats Bash Testing + brew: bats-core + npm: bats bat: _bin: bat _desc: '[bat](https://github.com/sharkdp/bat) is a cat(1) clone with syntax highlighting and Git integration.' @@ -1466,6 +1478,13 @@ softwarePackages: _name: Beets ansible: professormanhattan.beets pipx: beets + devspace: + _bin: devspace + _github: https://github.com/devspace-sh/devspace + _name: DevSpace + brew: devspace + npm: devspace + scoop: devspace betwixt: _bin: null _desc: Web Debugging Proxy based on Chrome DevTools Network panel @@ -3212,6 +3231,11 @@ softwarePackages: script: | #!/usr/bin/env bash pip3 install ntfy[emoji,matrix,pid,slack] + makeself: + _bin: makeself + _github: https://github.com/megastep/makeself + _name: MakeSelf + brew: makeself docker-desktop: _desc: '[Docker](https://www.docker.com/) is a set of platform-as-a-service products that use OS-level virtualization to deliver software in packages called containers. Containers are isolated from one another and bundle their own software, libraries and configuration files; they can communicate with each other through well-defined channels. [Docker Desktop](https://www.docker.com/products/docker-desktop/) adds a sleek UI for Docker and makes it easier to manage Docker on macOS and Windows.' _docs: https://docs.docker.com/ @@ -10664,6 +10688,17 @@ softwarePackages: go: github.com/charmbracelet/skate@latest nix: nixpkgs.skate pacman: skate + rtop: + _bin: rtop + _name: rtop + _github: https://github.com/rapidloop/rtop + go: github.com/rapidloop/rtop@latest + unikraft: + _bin: kraft + _name: Unikraft + _github: https://github.com/unikraft/unikraft + brew: unikraft/cli/kraftkit + script: curl --proto '=https' --tlsv1.2 -sSf https://get.kraftkit.sh | sh skaffold: _bin: skaffold _name: Skaffold diff --git a/system/etc/wsl.conf b/system/etc/wsl.conf new file mode 100644 index 00000000..10e043cc --- /dev/null +++ b/system/etc/wsl.conf @@ -0,0 +1,5 @@ +[wsl2] +nestedVirtualization=true + +[boot] +command = /bin/bash -c 'chown -v root:kvm /dev/kvm && chmod 660 /dev/kvm' \ No newline at end of file