y0rune/myhome
1
0
Fork 0
Code Issues Releases Activity

Compare commits

base: y0rune:a8eeb7f7f6c88b158fe946b8b699e8b2e78fed34
Branches Tags
y0rune:master
..
compare: y0rune:ceb24b02168ebf764666e76beecdcb599b52e58f
Branches Tags
y0rune:master

2 Commits
a8eeb7f7f6 ... ceb24b0216

Author SHA1 Message Date
Marcin Woźniak
ceb24b0216
Added gfg to script not in the zshrc 2021-10-17 14:32:13 +02:00
Marcin Woźniak
e0c7cad5cf
Added python in the coc-settings fixed problem in MacOS 2021-10-17 14:31:43 +02:00
3 changed files with 4 additions and 1 deletions
Show Stats Expand all files Collapse all files

1
.config/nvim/coc-settings.json
View File

@ -1,5 +1,6 @@
{ {
"python.formatting.provider": "black", "python.formatting.provider": "black",
"python.pythonPath": "python3",
"coc.preferences.formatOnSaveFiletypes": [ "coc.preferences.formatOnSaveFiletypes": [
"sh", "sh",
"yaml", "yaml",

3
.local/bin/gfg Executable file
View File

@ -0,0 +1,3 @@
#!/bin/bash
BRANCH_GIT=$(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@')
git checkout "$BRANCH_GIT" && git fetch upstream && git pull upstream "$BRANCH_GIT"

1
.zshrc
View File

@ -89,7 +89,6 @@ alias gst="git status -s"
alias gdiff="git diff" alias gdiff="git diff"
alias gnew="git checkout -b" alias gnew="git checkout -b"
alias glog="git log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --branches" alias glog="git log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --branches"
alias gfg="(git checkout master; git checkout main) && git fetch upstream && git pull upstream master"
alias cal="cal -3" alias cal="cal -3"
alias code="vscodium-bin" alias code="vscodium-bin"
alias vpn="sudo /root/.local/bin/protonvpn c -f" alias vpn="sudo /root/.local/bin/protonvpn c -f"