From 2501ad2344ea23bb5051bfad3f75bc5d5b11ff15 Mon Sep 17 00:00:00 2001 From: Daniel Kowalczyk Date: Thu, 17 Mar 2022 20:55:55 +0100 Subject: [PATCH] solved issues remote branch --- .gitmodules | 11 +++++------ apps/alacritty/alacritty.yml | 8 +++----- apps/broot/launcher/bash/br | 1 - apps/broot/launcher/installed-v1 | 4 ---- development/gitconfig | 14 ++++++++------ development/topgrade.toml | 2 +- shells/zprofile | 8 ++++++-- shells/zsh/completion/vcpkg_completion.zsh | 9 +++++++++ shells/zshrc | 4 +++- 9 files changed, 35 insertions(+), 26 deletions(-) delete mode 120000 apps/broot/launcher/bash/br delete mode 100644 apps/broot/launcher/installed-v1 create mode 100644 shells/zsh/completion/vcpkg_completion.zsh diff --git a/.gitmodules b/.gitmodules index 6bf0889..1093bcc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,16 +1,15 @@ [submodule "meta/dotbot"] path = meta/dotbot - url = git://github.com/anishathalye/dotbot - ignore = dirty + url = https://github.com/anishathalye/dotbot.git [submodule "meta/yay"] path = meta/yay - url = git://github.com/oxson/dotbot-yay + url = https://github.com/oxson/dotbot-yay.git [submodule "meta/rust"] path = meta/rust - url = git://github.com/alexcormier/dotbot-rust + url = https://github.com/alexcormier/dotbot-rust.git [submodule "shells/tmux/plugins/tpm"] path = shells/tmux/plugins/tpm - url = https://github.com/tmux-plugins/tpm + url = https://github.com/tmux-plugins/tpm.git [submodule "shells/tmux/plugins/tmux-cpu"] path = shells/tmux/plugins/tmux-cpu - url = https://github.com/tmux-plugins/tmux-cpu + url = https://github.com/tmux-plugins/tmux-cpu.git diff --git a/apps/alacritty/alacritty.yml b/apps/alacritty/alacritty.yml index 6f00e72..3b354b2 100644 --- a/apps/alacritty/alacritty.yml +++ b/apps/alacritty/alacritty.yml @@ -20,8 +20,6 @@ window: decorations: none - startup_mode: Maximized - # The FreeType rasterizer needs to know the device DPI for best results # (changes require restart) dpi: @@ -35,19 +33,19 @@ draw_bold_text_with_bright_colors: false font: # The normal (roman) font face to use. normal: - family: "monospace" # should be "Menlo" or something on macOS. + family: "Hack Nerd Font" # should be "Menlo" or something on macOS. # Style can be specified to pick a specific face. # style: "Regular" # The bold font face bold: - family: "monospace" # should be "Menlo" or something on macOS. + family: "Hack Nerd Font" # should be "Menlo" or something on macOS. # Style can be specified to pick a specific face. style: "Bold" # The italic font face italic: - family: "monospace" # should be "Menlo" or something on macOS. + family: "Gack Nerd Font" # should be "Menlo" or something on macOS. # Style can be specified to pick a specific face. style: "Italic" diff --git a/apps/broot/launcher/bash/br b/apps/broot/launcher/bash/br deleted file mode 120000 index d377e37..0000000 --- a/apps/broot/launcher/bash/br +++ /dev/null @@ -1 +0,0 @@ -/home/daniel/.local/share/broot/launcher/bash/1 \ No newline at end of file diff --git a/apps/broot/launcher/installed-v1 b/apps/broot/launcher/installed-v1 deleted file mode 100644 index 3f026af..0000000 --- a/apps/broot/launcher/installed-v1 +++ /dev/null @@ -1,4 +0,0 @@ - -This file tells broot the installation of the br function was done. -If there's a problem and you want to install it again run - broot -- install diff --git a/development/gitconfig b/development/gitconfig index 8d4d2e1..d40f7cd 100644 --- a/development/gitconfig +++ b/development/gitconfig @@ -107,10 +107,12 @@ [push] default = upstream [core] - pager = delta --theme='Nord' - autocrlf = input - editor = subl -n -w + pager = delta + autocrlf = false + editor = nvim excludesfile = /Users/Daniel/.global_gitignore +[delta] + theme = 'nord' [advice] statusHints = false [diff] @@ -121,9 +123,9 @@ [include] path = .gitconfig.user [user] - name = Kowalczyk, D. - email = d.kowalczyk@tue.nl - username = DanielKowalczyk1984 + name = Daniel Kowalczyk + email = Daniel.Kowalczyk@camco.be + username = daniel [difftool "sourcetree"] cmd = opendiff \"$LOCAL\" \"$REMOTE\" path = diff --git a/development/topgrade.toml b/development/topgrade.toml index aa5d45b..a0ed871 100644 --- a/development/topgrade.toml +++ b/development/topgrade.toml @@ -2,7 +2,7 @@ #assume_yes = true # Disable specific steps - same options as the command line flag -disable = ["flatpak"] +disable = ["flatpak", "firmware"] # Ignore failures for these steps #ignore_failures = ["powershell"] diff --git a/shells/zprofile b/shells/zprofile index 857b624..22dba29 100644 --- a/shells/zprofile +++ b/shells/zprofile @@ -113,8 +113,12 @@ source $HOME/.config/broot/launcher/bash/br # }}} # VirtualEnv {{{ export WORKON_HOME=$HOME/.virtualenvs -export PROJECT_HOME=$HOME/projects -source $HOME/.local/bin/virtualenvwrapper.sh +export PROJECT_HOME=$HOME/Code +export VIRTUALENVWRAPPER_PYTHON=/usr/bin/python3 +source /usr/local/bin/virtualenvwrapper.sh +# }}} +# VCPKG_ENV {{{ +export VCPKG_ROOT=$HOME/vcpkg # }}} #" Folding the .vimrc {{{ # vim:foldmethod=marker:foldlevel=0 diff --git a/shells/zsh/completion/vcpkg_completion.zsh b/shells/zsh/completion/vcpkg_completion.zsh new file mode 100644 index 0000000..ee499f6 --- /dev/null +++ b/shells/zsh/completion/vcpkg_completion.zsh @@ -0,0 +1,9 @@ + +_vcpkg_completions() +{ + local vcpkg_executable=${COMP_WORDS[0]} + local remaining_command_line=${COMP_LINE:(${#vcpkg_executable}+1)} + COMPREPLY=($(${vcpkg_executable} autocomplete "${remaining_command_line}" -- 2>/dev/null)) +} + +complete -F _vcpkg_completions vcpkg diff --git a/shells/zshrc b/shells/zshrc index dcc80dc..bce5e55 100644 --- a/shells/zshrc +++ b/shells/zshrc @@ -61,7 +61,6 @@ zplug "hlissner/zsh-autopair", defer:2 zplug "junegunn/fzf", use:"shell/*.zsh" zplug "lotabout/skim", as:command, use:"bin/sk-tmux" zplug "plugins/archlinux", from:oh-my-zsh -zplug "plugins/cargo", from:oh-my-zsh zplug "plugins/command-not-found", from:oh-my-zsh zplug "plugins/git", from:oh-my-zsh zplug "plugins/git-flow", from:oh-my-zsh @@ -97,3 +96,6 @@ zplug load # Folding the .vimrc {{{ # vim:foldmethod=marker:foldlevel=0 # }}} + +autoload bashcompinit +source /home/daniel/Code/vcpkg/scripts/vcpkg_completion.zsh