merge: main

This commit is contained in:
AngeD 2022-08-23 09:33:56 +02:00
parent c099b69d85
commit 16131f8dfe
8 changed files with 12 additions and 13 deletions

View File

@ -118,7 +118,7 @@ font:
# - (macOS) Menlo # - (macOS) Menlo
# - (Linux/BSD) monospace # - (Linux/BSD) monospace
# - (Windows) Consolas # - (Windows) Consolas
family: MesloLGS NF family: DejaVuSansMono Nerd Font
# The `style` can be specified to pick a specific face. # The `style` can be specified to pick a specific face.
#style: Regular #style: Regular

@ -1 +1 @@
Subproject commit 6e0ad52e7a30771d0056fa60bfe5e368f2bc2417 Subproject commit 21218b666aeafd1c089cbe998e730f97605d25b2

@ -1 +1 @@
Subproject commit 70af1bf414d7f9926fc883a008246db8a544f69c Subproject commit c04189061a937d5b6bf526c68cd4fbcb1b8cf567

@ -1 +1 @@
Subproject commit 4b536a9709fa4cbbc4c9ae8b32e7a32821a7249e Subproject commit a2ee5610ae5986797809358c9ace840eca6fd030

View File

@ -1,5 +1,6 @@
# fix slow startup time # fix slow startup time
exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
xwayland force
# Turn off screen after $screen_timeout # Turn off screen after $screen_timeout
# Lock after $screen_timeout + 10s # Lock after $screen_timeout + 10s

View File

@ -13,18 +13,18 @@ alias zshconf="$EDITOR $ZDOTDIR/.zshrc && . $ZDOTDIR/.zshrc"
function fnalias() { function fnalias() {
# alias alias_cmd='cmd' # alias alias_cmd='cmd'
cmd="$(alias "${2}")" cmd="$(alias "$2")"
if [ -n "${cmd}" ]; then if [ -n "$cmd" ]; then
# remove everything before and including the first = # remove everything before and including the first =
cmd="${cmd#*=}" cmd="${cmd#*=}"
# remove first and last char in this case, quotes # remove first and last char in this case, quotes
cmd="${cmd:1:-1}" cmd="${cmd:1:-1}"
else else
cmd="${2}" cmd="$2"
fi fi
env "${1}" "${cmd}" "${@:3}" env "$1" "$cmd" "${@:3}"
} }
alias watch='fnalias watch' alias watch='fnalias watch'

6
.gitmodules vendored
View File

@ -10,6 +10,9 @@
[submodule ".config/nvim/pack/plugins/opt/nvim-treesitter"] [submodule ".config/nvim/pack/plugins/opt/nvim-treesitter"]
path = .config/nvim/pack/plugins/opt/nvim-treesitter path = .config/nvim/pack/plugins/opt/nvim-treesitter
url = https://github.com/nvim-treesitter/nvim-treesitter.git url = https://github.com/nvim-treesitter/nvim-treesitter.git
[submodule ".config/nvim/pack/plugins/opt/nvim-treesitter-context"]
path = .config/nvim/pack/plugins/opt/nvim-treesitter-context
url = https://github.com/nvim-treesitter/nvim-treesitter-context.git
[submodule ".config/nvim/pack/plugins/opt/vim-dirdiff"] [submodule ".config/nvim/pack/plugins/opt/vim-dirdiff"]
path = .config/nvim/pack/plugins/opt/vim-dirdiff path = .config/nvim/pack/plugins/opt/vim-dirdiff
url = https://github.com/will133/vim-dirdiff.git url = https://github.com/will133/vim-dirdiff.git
@ -19,6 +22,3 @@
[submodule ".pyenv"] [submodule ".pyenv"]
path = .pyenv path = .pyenv
url = https://github.com/pyenv/pyenv.git url = https://github.com/pyenv/pyenv.git
[submodule ".config/nvim/pack/plugins/opt/nvim-treesitter-context"]
path = .config/nvim/pack/plugins/opt/nvim-treesitter-context
url = https://github.com/nvim-treesitter/nvim-treesitter-context.git

View File

@ -1,7 +1,5 @@
#!/bin/bash #!/bin/bash
NORMAL='\e[0m'
PS="$(docker ps -aq 2> /dev/null)" PS="$(docker ps -aq 2> /dev/null)"
if [ "$?" ] && [ "$EUID" != 0 ]; then if [ "$?" ] && [ "$EUID" != 0 ]; then