Skip to content

Commit

Permalink
solved issues remote branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Kowalczyk authored and Daniel Kowalczyk committed Mar 17, 2022
1 parent 8681181 commit 2501ad2
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 26 deletions.
11 changes: 5 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
8 changes: 3 additions & 5 deletions apps/alacritty/alacritty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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"

Expand Down
1 change: 0 additions & 1 deletion apps/broot/launcher/bash/br

This file was deleted.

4 changes: 0 additions & 4 deletions apps/broot/launcher/installed-v1

This file was deleted.

14 changes: 8 additions & 6 deletions development/gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -121,9 +123,9 @@
[include]
path = .gitconfig.user
[user]
name = Kowalczyk, D.
email = [email protected]
username = DanielKowalczyk1984
name = Daniel Kowalczyk
email = [email protected]
username = daniel
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
Expand Down
2 changes: 1 addition & 1 deletion development/topgrade.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
8 changes: 6 additions & 2 deletions shells/zprofile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions shells/zsh/completion/vcpkg_completion.zsh
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion shells/zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

0 comments on commit 2501ad2

Please sign in to comment.