Some modifications

Style default to slim theme
config updated to include bashrc
dcup, dcdown to work in parallel (supported by dco)
This commit is contained in:
lksz 2021-02-22 14:58:49 -05:00
parent c8869ae393
commit 4da3726760
8 changed files with 64 additions and 41 deletions

View File

@ -1,6 +1,6 @@
Get-Command Set-PSReadLineKeyHandler | ForEach-Object { Set-PSReadLineKeyHandler -Key Tab -Function MenuComplete } Get-Command Set-PSReadLineKeyHandler | ForEach-Object { Set-PSReadLineKeyHandler -Key Tab -Function MenuComplete }
if( Get-Command Set-PoshPrompt -ErrorAction SilentlyContinue ) { if( Get-Command Set-PoshPrompt -ErrorAction SilentlyContinue ) {
$local:poshPrompt = Join-Path $HOME ".oh-my-posh.omp.json" $local:poshPrompt = Join-Path $HOME ".oh-my-posh.omp.json"
if( -not (Test-Path $poshPrompt) ) { $poshPrompt = "powerlevel10k_classic" } if( -not (Test-Path $poshPrompt) ) { $poshPrompt = "slim" }
Set-PoshPrompt -Theme $poshPrompt Set-PoshPrompt -Theme $poshPrompt
} elseif( Get-Command Set-Theme -ErrorAction SilentlyContinue ) { Set-Theme Paradox } } elseif( Get-Command Set-Theme -ErrorAction SilentlyContinue ) { Set-Theme Paradox }

View File

@ -7,6 +7,12 @@
], ],
"vi": "~/.virc", "vi": "~/.virc",
"omp": "~/.oh-my-posh.omp.json", "omp": "~/.oh-my-posh.omp.json",
"profile": [
"~/.profile",
"/etc/profile",
"/etc/profile.d/"
],
"bashrc": "~/.bashrc",
"zshrc": "~/.zshrc", "zshrc": "~/.zshrc",
"zsys": "/etc/zsys.conf", "zsys": "/etc/zsys.conf",
"shrc": "~/.shrc", "shrc": "~/.shrc",
@ -17,6 +23,11 @@
"@shell-loading-snippets/bash", "@shell-loading-snippets/bash",
"@shell-loading-snippets/sh" "@shell-loading-snippets/sh"
], ],
"sz-bashrc": [
"~/.sz.bashrc.sh",
"#bashrc",
"@shell-loading-snippets/bash"
],
"sz-zshrc": [ "sz-zshrc": [
"~/.sz.zshrc.sh", "~/.sz.zshrc.sh",
"#zshrc", "#zshrc",

View File

@ -8,7 +8,7 @@
) )
[DockerComposeDirs]::_GetValidValues($wordToComplete,$true) [DockerComposeDirs]::_GetValidValues($wordToComplete,$true)
})] })]
[string[]]$ProjectPath=@($PWD), [string[]]$ProjectPath,
[switch]$Recurse, [switch]$Recurse,
[int]$Depth=1, [int]$Depth=1,
[switch]$Force, [switch]$Force,
@ -17,6 +17,8 @@
[array]$CliParams [array]$CliParams
) )
if( -not $ProjectPath ) { $ProjectPath=@($PWD) }
$script:JobQueue = @() $script:JobQueue = @()
$script:CleanupJobQueue = @() $script:CleanupJobQueue = @()
function CompleteJobs { function CompleteJobs {

View File

@ -8,13 +8,15 @@
) )
[DockerComposeDirs]::_GetValidValues($wordToComplete,$true) [DockerComposeDirs]::_GetValidValues($wordToComplete,$true)
})] })]
[string[]]$ProjectPath=@($PWD), [string[]]$ProjectPath,
[switch]$Recurse,
[int]$Depth=1,
[Parameter(Position = 0, ValueFromRemainingArguments = $true)] [Parameter(Position = 0, ValueFromRemainingArguments = $true)]
[array]$CliParams=@('--timeout=3','--volumes','--remove-orphans') [array]$CliParams=@('--timeout=3','--volumes','--remove-orphans')
) )
if( $CliParams[0] -is [string] ) { $CliParams = @($CliParams,@($null)) } if( -not $CliParams -or $CliParams[0] -is [string] ) { $CliParams = @($CliParams,@($null)) }
$CliParams[0] = @('down') + $CliParams[0] $CliParams[0] = @('&','down') + $CliParams[0]
Invoke-DockerCompose -ProjectPath $ProjectPath -CliParams $CliParams Invoke-DockerCompose -ProjectPath $ProjectPath -CliParams $CliParams -Recurse:$Recurse -Depth $Depth

View File

@ -46,10 +46,10 @@ if( -not $LogsParams[0] ) {
$local:moreParams = @() $local:moreParams = @()
#if( $ForceNoFollow ) { $moreParams = @('--no-color', '--quiet-pull') } #if( $ForceNoFollow ) { $moreParams = @('--no-color', '--quiet-pull') }
$PullParams[0] = @('pull' ) + $PullParams[0] + $Containers $PullParams[0] = @('&', 'pull' ) + $PullParams[0] + $Containers
if( $ForceNoFollow ) { $PullParams[0] = @('&') + $PullParams[0] } #if( $ForceNoFollow ) { $PullParams[0] = @('&') + $PullParams[0] }
$UpParams[0] = @('up' ) + $UpParams[0] + $Containers $UpParams[0] = @('&', 'up' ) + $UpParams[0] + $Containers
if( $ForceNoFollow ) { $UpParams[0] = @('&') + $UpParams[0] } #if( $ForceNoFollow ) { $UpParams[0] = @('&') + $UpParams[0] }
$LogsParams[0] = @('logs' ) + $LogsParams[0] + $Containers $LogsParams[0] = @('logs' ) + $LogsParams[0] + $Containers
if( -not $NoPull ) { $allParams += $PullParams + @(@('!')) } if( -not $NoPull ) { $allParams += $PullParams + @(@('!')) }

View File

@ -1,5 +1,5 @@
## Place the following line at the top of your .zshrc to make powershell your default shell. ## Place the following line at the top of your .zshrc to make powershell your default shell.
# local P=".local/share/powershell/Scripts/shell-loading-snippets/$(basename $SHELL)"; find ~/$P -exec echo 'Starting PowerShell SZcripts...' \; && . ~/$P ## __P=".local/share/powershell/Scripts/shell-loading-snippets/$(basename $SHELL)"; find ~/$__P -exec true \; && . ~/$__P
if [[ -x ~/.dotnet/tools/pwsh && "1" != "$(which pwsh > /dev/null && echo 1)" ]]; then if [[ -x ~/.dotnet/tools/pwsh && "1" != "$(which pwsh > /dev/null && echo 1)" ]]; then
PWSH='~/.dotnet/tools/pwsh' PWSH='~/.dotnet/tools/pwsh'
@ -7,14 +7,16 @@ if [[ -x ~/.dotnet/tools/pwsh && "1" != "$(which pwsh > /dev/null && echo 1)" ]]
export DOTNET_CLI_TELEMETRY_OPTOUT=1 export DOTNET_CLI_TELEMETRY_OPTOUT=1
fi fi
echo "$(date) SZ_SKIP_DEFAULT_SHELL='$SZ_SKIP_DEFAULT_SHELL'; pwsh: $(which pwsh); Setup-Profile: $(ls ~/.local/share/powershell/Scripts/Setup-Profile.ps1) " >> /tmp/default_shell echo "$(date) SZ_SKIP_DEFAULT_SHELL='$SZ_SKIP_DEFAULT_SHELL'; pwsh: $(which pwsh); Setup-Profile: $(ls ~/.local/share/powershell/Scripts/Setup-Profile.ps1) " >> /tmp/default_shell
if [[ "$SZ_SKIP_DEFAULT_SHELL" != "1" && "1" == "$(which pwsh > /dev/null && echo 1)" && -f ~/.local/share/powershell/Scripts/Setup-Profile.ps1 ]]; then if [[ "$SZ_SKIP_DEFAULT_SHELL" != "1" ]]; then
export SZ_SKIP_DEFAULT_SHELL=1
if [[ "1" == "$(which pwsh > /dev/null && echo 1)" && -f ~/.local/share/powershell/Scripts/Setup-Profile.ps1 ]]; then
echo 'Starting PowerShell SZcripts...'
echo "pwsh" >> /tmp/default_shell echo "pwsh" >> /tmp/default_shell
pwsh pwsh
exit exit
fi fi
fi
echo "continue" >> /tmp/default_shell echo "continue" >> /tmp/default_shell
export SZ_SKIP_DEFAULT_SHELL=1 export SZ_SKIP_DEFAULT_SHELL=1

View File

@ -1,5 +1,5 @@
## Place the following line at the top of your .zshrc to make powershell your default shell. ## Place the following line at the top of your .zshrc to make powershell your default shell.
# local P=".local/share/powershell/Scripts/shell-loading-snippets/$(basename $SHELL)"; find ~/$P -exec echo 'Starting PowerShell SZcripts...' \; && . ~/$P ## __P=".local/share/powershell/Scripts/shell-loading-snippets/$(basename $SHELL)"; find ~/$__P -exec true \; && . ~/$__P
if [[ -x ~/.dotnet/tools/pwsh && "1" != "$(which pwsh > /dev/null && echo 1)" ]]; then if [[ -x ~/.dotnet/tools/pwsh && "1" != "$(which pwsh > /dev/null && echo 1)" ]]; then
PWSH='~/.dotnet/tools/pwsh' PWSH='~/.dotnet/tools/pwsh'
@ -7,14 +7,16 @@ if [[ -x ~/.dotnet/tools/pwsh && "1" != "$(which pwsh > /dev/null && echo 1)" ]]
export DOTNET_CLI_TELEMETRY_OPTOUT=1 export DOTNET_CLI_TELEMETRY_OPTOUT=1
fi fi
echo "$(date) SZ_SKIP_DEFAULT_SHELL='$SZ_SKIP_DEFAULT_SHELL'; pwsh: $(which pwsh); Setup-Profile: $(ls ~/.local/share/powershell/Scripts/Setup-Profile.ps1) " >> /tmp/default_shell echo "$(date) SZ_SKIP_DEFAULT_SHELL='$SZ_SKIP_DEFAULT_SHELL'; pwsh: $(which pwsh); Setup-Profile: $(ls ~/.local/share/powershell/Scripts/Setup-Profile.ps1) " >> /tmp/default_shell
if [[ "$SZ_SKIP_DEFAULT_SHELL" != "1" && "1" == "$(which pwsh > /dev/null && echo 1)" && -f ~/.local/share/powershell/Scripts/Setup-Profile.ps1 ]]; then if [[ "$SZ_SKIP_DEFAULT_SHELL" != "1" ]]; then
export SZ_SKIP_DEFAULT_SHELL=1
if [[ "1" == "$(which pwsh > /dev/null && echo 1)" && -f ~/.local/share/powershell/Scripts/Setup-Profile.ps1 ]]; then
echo 'Starting PowerShell SZcripts...'
echo "pwsh" >> /tmp/default_shell echo "pwsh" >> /tmp/default_shell
pwsh pwsh
exit exit
fi fi
fi
echo "continue" >> /tmp/default_shell echo "continue" >> /tmp/default_shell
export SZ_SKIP_DEFAULT_SHELL=1 export SZ_SKIP_DEFAULT_SHELL=1

View File

@ -1,5 +1,5 @@
## Place the following line at the top of your .zshrc to make powershell your default shell. ## Place the following line at the top of your .zshrc to make powershell your default shell.
# local P=".local/share/powershell/Scripts/shell-loading-snippets/$(basename $SHELL)"; find ~/$P -exec echo 'Starting PowerShell SZcripts...' \; && . ~/$P ## __P=".local/share/powershell/Scripts/shell-loading-snippets/$(basename $SHELL)"; find ~/$__P -exec true \; && . ~/$__P
if [[ -x ~/.dotnet/tools/pwsh && "1" != "$(which pwsh > /dev/null && echo 1)" ]]; then if [[ -x ~/.dotnet/tools/pwsh && "1" != "$(which pwsh > /dev/null && echo 1)" ]]; then
PWSH='~/.dotnet/tools/pwsh' PWSH='~/.dotnet/tools/pwsh'
@ -7,13 +7,17 @@ if [[ -x ~/.dotnet/tools/pwsh && "1" != "$(which pwsh > /dev/null && echo 1)" ]]
export DOTNET_CLI_TELEMETRY_OPTOUT=1 export DOTNET_CLI_TELEMETRY_OPTOUT=1
fi fi
echo "$(date) SZ_SKIP_DEFAULT_SHELL='$SZ_SKIP_DEFAULT_SHELL'; pwsh: $(which pwsh); Setup-Profile: $(ls ~/.local/share/powershell/Scripts/Setup-Profile.ps1) " >> /tmp/default_shell echo "$(date) SZ_SKIP_DEFAULT_SHELL='$SZ_SKIP_DEFAULT_SHELL'; pwsh: $(which pwsh); Setup-Profile: $(ls ~/.local/share/powershell/Scripts/Setup-Profile.ps1) " >> /tmp/default_shell
if [[ "$SZ_SKIP_DEFAULT_SHELL" != "1" && "1" == "$(which pwsh > /dev/null && echo 1)" && -f ~/.local/share/powershell/Scripts/Setup-Profile.ps1 ]]; then if [[ "$SZ_SKIP_DEFAULT_SHELL" != "1" ]]; then
export SZ_SKIP_DEFAULT_SHELL=1
if [[ "1" == "$(which pwsh > /dev/null && echo 1)" && -f ~/.local/share/powershell/Scripts/Setup-Profile.ps1 ]]; then
echo 'Starting PowerShell SZcripts...'
echo "pwsh" >> /tmp/default_shell echo "pwsh" >> /tmp/default_shell
pwsh pwsh
exit exit
fi fi
fi
echo "continue" >> /tmp/default_shell echo "continue" >> /tmp/default_shell
export SZ_SKIP_DEFAULT_SHELL=1 export SZ_SKIP_DEFAULT_SHELL=1