From 355722517f3acdb609b0bb246765ab903db819c6 Mon Sep 17 00:00:00 2001 From: vincent Date: Mon, 11 Nov 2019 19:42:50 +0100 Subject: [PATCH] commit --- awesome/.config/awesome/autorun.sh | 1 + awesome/.config/awesome/redflat/widget/pulse.lua | 2 +- zsh/.oh-my-zsh/LICENSE.txt | 5 ++--- zsh/.oh-my-zsh/lib/git.zsh | 12 +++++++++++- zsh/.oh-my-zsh/plugins/emacs/emacsclient.sh | 3 ++- zsh/.oh-my-zsh/plugins/fabric/_fab | 2 +- zsh/.oh-my-zsh/plugins/mvn/mvn.plugin.zsh | 2 ++ zsh/.oh-my-zsh/plugins/python/python.plugin.zsh | 7 ++++--- 8 files changed, 24 insertions(+), 10 deletions(-) diff --git a/awesome/.config/awesome/autorun.sh b/awesome/.config/awesome/autorun.sh index 41ed3fa..4aec83d 100755 --- a/awesome/.config/awesome/autorun.sh +++ b/awesome/.config/awesome/autorun.sh @@ -13,3 +13,4 @@ run setxkbmap -layout "fr,us" run keepassxc run aarchup run redshift-gtk +run pulseaudio -start diff --git a/awesome/.config/awesome/redflat/widget/pulse.lua b/awesome/.config/awesome/redflat/widget/pulse.lua index 39279a1..6d4317d 100644 --- a/awesome/.config/awesome/redflat/widget/pulse.lua +++ b/awesome/.config/awesome/redflat/widget/pulse.lua @@ -29,7 +29,7 @@ local redutil = require("redflat.util") -- Initialize tables and vars for module ----------------------------------------------------------------------------------------------------------------------- local pulse = { widgets = {}, mt = {} } -pulse.startup_time = 4 +pulse.startup_time = 10 -- Generate default theme vars ----------------------------------------------------------------------------------------------------------------------- diff --git a/zsh/.oh-my-zsh/LICENSE.txt b/zsh/.oh-my-zsh/LICENSE.txt index 4d465b1..eb9978a 100644 --- a/zsh/.oh-my-zsh/LICENSE.txt +++ b/zsh/.oh-my-zsh/LICENSE.txt @@ -1,7 +1,6 @@ -The MIT License (MIT) +MIT License -Copyright (c) 2009-2019 Robby Russell and contributors -See the full list at https://github.com/robbyrussell/oh-my-zsh/contributors +Copyright (c) 2009-2019 Robby Russell and contributors (https://github.com/robbyrussell/oh-my-zsh/contributors) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/zsh/.oh-my-zsh/lib/git.zsh b/zsh/.oh-my-zsh/lib/git.zsh index 640561e..2054fe2 100644 --- a/zsh/.oh-my-zsh/lib/git.zsh +++ b/zsh/.oh-my-zsh/lib/git.zsh @@ -12,11 +12,21 @@ function git_prompt_info() { function parse_git_dirty() { local STATUS local -a FLAGS - FLAGS=('--porcelain' '--ignore-submodules=dirty') + FLAGS=('--porcelain') if [[ "$(command git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then FLAGS+='--untracked-files=no' fi + case "$GIT_STATUS_IGNORE_SUBMODULES" in + git) + # let git decide (this respects per-repo config in .gitmodules) + ;; + *) + # if unset: ignore dirty submodules + # other values are passed to --ignore-submodules + FLAGS+="--ignore-submodules=${GIT_STATUS_IGNORE_SUBMODULES:-dirty}" + ;; + esac STATUS=$(command git status ${FLAGS} 2> /dev/null | tail -n1) fi if [[ -n $STATUS ]]; then diff --git a/zsh/.oh-my-zsh/plugins/emacs/emacsclient.sh b/zsh/.oh-my-zsh/plugins/emacs/emacsclient.sh index 26b28d4..0aa8d6f 100755 --- a/zsh/.oh-my-zsh/plugins/emacs/emacsclient.sh +++ b/zsh/.oh-my-zsh/plugins/emacs/emacsclient.sh @@ -20,7 +20,8 @@ _emacsfun() # tempfile. (first argument will be `--no-wait` passed in by the plugin.zsh) if [ "$#" -ge "2" -a "$2" = "-" ] then - tempfile="$(mktemp emacs-stdin-$USER.XXXXXXX --tmpdir)" + tempfile="$(mktemp --tmpdir emacs-stdin-$USER.XXXXXXX 2>/dev/null \ + || mktemp -t emacs-stdin-$USER)" # support BSD mktemp cat - > "$tempfile" _emacsfun --no-wait $tempfile else diff --git a/zsh/.oh-my-zsh/plugins/fabric/_fab b/zsh/.oh-my-zsh/plugins/fabric/_fab index 89e73e5..9102dad 100644 --- a/zsh/.oh-my-zsh/plugins/fabric/_fab +++ b/zsh/.oh-my-zsh/plugins/fabric/_fab @@ -6,7 +6,7 @@ declare -A opt_args declare -a target_list target_list=("${(@f)$(fab -l 2>/dev/null | awk '{ - if (NF == 0 || NR == 1) return + if (NF == 0 || NR == 1) next if (NF < 2) print $1 else { docstring=substr($0, index($0,$2)) diff --git a/zsh/.oh-my-zsh/plugins/mvn/mvn.plugin.zsh b/zsh/.oh-my-zsh/plugins/mvn/mvn.plugin.zsh index 01aef81..0866e55 100644 --- a/zsh/.oh-my-zsh/plugins/mvn/mvn.plugin.zsh +++ b/zsh/.oh-my-zsh/plugins/mvn/mvn.plugin.zsh @@ -267,6 +267,8 @@ function listMavenCompletions { stage:copy # toolchain toolchain:toolchain + #liberty + liberty:clean-server liberty:compile-jsp liberty:configure-arquillian liberty:create-server liberty:debug liberty:debug-server liberty:deploy liberty:dev liberty:display-url liberty:dump-server liberty:install-apps liberty:install-feature liberty:install-server liberty:java-dump-server liberty:package-server liberty:run liberty:run-server liberty:server-status liberty:start liberty:start-server liberty:status liberty:stop liberty:stop-server liberty:test-start-server liberty:test-stop-server liberty:undeploy liberty:uninstall-feature # options "-Dmaven.test.skip=true" -DskipTests -DskipITs -Dmaven.surefire.debug -DenableCiProfile "-Dpmd.skip=true" "-Dcheckstyle.skip=true" "-Dtycho.mode=maven" "-Dmaven.test.failure.ignore=true" "-DgroupId=" "-DartifactId=" "-Dversion=" "-Dpackaging=jar" "-Dfile=" diff --git a/zsh/.oh-my-zsh/plugins/python/python.plugin.zsh b/zsh/.oh-my-zsh/plugins/python/python.plugin.zsh index 950b0e0..f39cd80 100644 --- a/zsh/.oh-my-zsh/plugins/python/python.plugin.zsh +++ b/zsh/.oh-my-zsh/plugins/python/python.plugin.zsh @@ -1,13 +1,14 @@ # Find python file alias pyfind='find . -name "*.py"' -# Remove python compiled byte-code and mypy cache in either current directory or in a -# list of specified directories +# Remove python compiled byte-code and mypy/pytest cache in either the current +# directory or in a list of specified directories (including sub directories). function pyclean() { ZSH_PYCLEAN_PLACES=${*:-'.'} find ${ZSH_PYCLEAN_PLACES} -type f -name "*.py[co]" -delete find ${ZSH_PYCLEAN_PLACES} -type d -name "__pycache__" -delete - find ${ZSH_PYCLEAN_PLACES} -type d -name ".mypy_cache" -delete + find ${ZSH_PYCLEAN_PLACES} -depth -type d -name ".mypy_cache" -exec rm -r "{}" + + find ${ZSH_PYCLEAN_PLACES} -depth -type d -name ".pytest_cache" -exec rm -r "{}" + } # Grep among .py files