diff --git a/home/.chezmoitemplates/windows/common-dependencies b/home/.chezmoitemplates/windows/common-dependencies index afd24f6a..28e5a882 100644 --- a/home/.chezmoitemplates/windows/common-dependencies +++ b/home/.chezmoitemplates/windows/common-dependencies @@ -1 +1,2 @@ +openssl pywin32 \ No newline at end of file diff --git a/home/Library/Managed Preferences/private_com.cloudflare.warp.plist.tmpl b/home/Library/Managed Preferences/private_com.cloudflare.warp.plist.tmpl index 62e2e49a..124cf866 100644 --- a/home/Library/Managed Preferences/private_com.cloudflare.warp.plist.tmpl +++ b/home/Library/Managed Preferences/private_com.cloudflare.warp.plist.tmpl @@ -1,3 +1,5 @@ +{{- if lookPath "warp-cli" -}} +{{- if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_TEAMS_CLIENT_ID")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_TEAMS_CLIENT_SECRET")) -}} @@ -16,3 +18,5 @@ {{- if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_TEAMS_CLIENT_SECRET")) -}}{{- includeTemplate "secrets/CLOUDFLARE_TEAMS_CLIENT_SECRET" | decrypt | trim -}}{{- else -}}{{- env "CLOUDFLARE_TEAMS_CLIENT_SECRET" -}}{{- end -}} +{{- end -}} +{{- end -}} diff --git a/home/dot_config/shell/macos.sh.tmpl b/home/dot_config/shell/macos.sh.tmpl index afaf9b02..f091b685 100644 --- a/home/dot_config/shell/macos.sh.tmpl +++ b/home/dot_config/shell/macos.sh.tmpl @@ -24,6 +24,11 @@ sudo systemsetup -setremotelogin {{ .macosRemoteLogin }} > /dev/null # settings we’re about to change osascript -e 'tell application "System Preferences" to quit' +# Change font to Hack for icon support +osascript -e "tell application \"Terminal\" to set the font name of window 1 to \"Hack Nerd Font\"" +osascript -e "tell application \"Terminal\" to set the font size of window 1 to 12" +# TODO - Add anti-aliasing + # Keep-alive: update existing `sudo` time stamp until `.macos` has finished while true; do sudo -n true; sleep 60; kill -0 "$$" || exit; done 2>/dev/null & diff --git a/home/dot_local/bin/post-installx/executable_post-wazuh.sh b/home/dot_local/bin/post-installx/executable_post-wazuh.sh index 5e9f4012..72437ddd 100644 --- a/home/dot_local/bin/post-installx/executable_post-wazuh.sh +++ b/home/dot_local/bin/post-installx/executable_post-wazuh.sh @@ -13,7 +13,7 @@ if [ -d /Applications ] && [ -d /System ]; then wget -q "$PKG_URL" -O /tmp/wazuh-agent.pkg &> /dev/null logg info 'Setting Wazuh launch parameters in /tmp/wazuh_envs' # https://documentation.wazuh.com/current/user-manual/agent/deployment-variables/deployment-variables-macos.html - echo "WAZUH_MANAGER="$WAZUH_MANAGER" && WAZUH_REGISTRATION_SERVER="$WAZUH_MANAGER" && WAZUH_REGISTRATION_PASSWORD="WazuhRegister" && WAZUH_AGENT_NAME="$WAZUH_AGENT_NAME"" > /tmp/wazuh_envs + echo 'WAZUH_MANAGER="$WAZUH_MANAGER" && WAZUH_REGISTRATION_SERVER="$WAZUH_MANAGER" && WAZUH_REGISTRATION_PASSWORD="WazuhRegister" && WAZUH_AGENT_NAME="$WAZUH_AGENT_NAME"' > /tmp/wazuh_envs logg info 'Installing the Wazuh agent pkg' sudo installer -pkg /tmp/wazuh-agent.pkg -target / sudo chmod 755 /Library/Ossec diff --git a/software.yml b/software.yml index eb8e688d..f601b65f 100644 --- a/software.yml +++ b/software.yml @@ -1841,16 +1841,20 @@ softwarePackages: _short: "Apache Cordova is an open-source mobile development framework that allows developers to build mobile applications using web technologies like HTML, CSS, and JavaScript. " npm: cordova coreutils: - _bin: - - cat - - ls - - rm + _bin: chown _bin:darwin: gchown _github: false apt: coreutils brew: coreutils dnf: coreutils pacman: coreutils + copilot-for-xcode: + _app: Copilot for Xcode.app + _bin: copilot-for-xcode + _desc: The missing GitHub Copilot, Codeium and ChatGPT Xcode Source Editor Extension + _github: https://github.com/intitni/CopilotForXcode + _name: CoPilot for Xcode + cask: copilot-for-xcode croc: _bin: croc _desc: Easily and securely send things from one computer to another @@ -3286,6 +3290,16 @@ softwarePackages: _name: Fleet CLI _short: "Fleet is an open-source device management platform for macOS, Windows, and Linux systems. " npm: fleetctl + flipper: + _app: Flipper.app + _bin: flipper + _desc: A desktop debugging platform for mobile developers. + _docs: https://fbflipper.com/docs/getting-started/ + _github: https://github.com/facebook/flipper + _home: https://fbflipper.com/ + _name: Flipper + cask: flipper + choco: flipper flow-launcher: _bin: null _desc: Quick file search & app launcher for Windows with community-made plugins diff --git a/system/Library/Managed Preferences/private_com.cloudflare.warp.plist.tmpl b/system/Library/Managed Preferences/private_com.cloudflare.warp.plist.tmpl new file mode 100644 index 00000000..124cf866 --- /dev/null +++ b/system/Library/Managed Preferences/private_com.cloudflare.warp.plist.tmpl @@ -0,0 +1,22 @@ +{{- if lookPath "warp-cli" -}} +{{- if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_TEAMS_CLIENT_ID")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_TEAMS_CLIENT_SECRET")) -}} + + + + + enable + + onboarding + + organization + {{ .host.cloudflare.teamsOrg }} + service_mode + warp + auth_client_id + {{- if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_TEAMS_CLIENT_ID")) -}}{{- includeTemplate "secrets/CLOUDFLARE_TEAMS_CLIENT_ID" | decrypt | trim -}}{{- else -}}{{- env "CLOUDFLARE_TEAMS_CLIENT_ID" -}}{{- end -}} + auth_client_secret + {{- if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_TEAMS_CLIENT_SECRET")) -}}{{- includeTemplate "secrets/CLOUDFLARE_TEAMS_CLIENT_SECRET" | decrypt | trim -}}{{- else -}}{{- env "CLOUDFLARE_TEAMS_CLIENT_SECRET" -}}{{- end -}} + + +{{- end -}} +{{- end -}}