mirror of
https://github.com/VectorKappa/dotfiles.git
synced 2025-12-19 16:26:10 +01:00
1.5.0 A lot of fixes,,
migration to zsh, more to come!
This commit is contained in:
3
apt.sh
3
apt.sh
@@ -40,3 +40,6 @@ apt install bash \
|
|||||||
|
|
||||||
pip install --upgrade pip
|
pip install --upgrade pip
|
||||||
pip install youtube-dl requests
|
pip install youtube-dl requests
|
||||||
|
|
||||||
|
|
||||||
|
#TODO: Make a python install script
|
||||||
47
common/.Xresources
Normal file
47
common/.Xresources
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
! Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
|
||||||
|
! Copyright (c) 2016-present Sven Greb <code@svengreb.de>
|
||||||
|
|
||||||
|
! Project: Nord XResources
|
||||||
|
! Version: 0.1.0
|
||||||
|
! Repository: https://github.com/arcticicestudio/nord-xresources
|
||||||
|
! License: MIT
|
||||||
|
|
||||||
|
#define nord0 #2E3440
|
||||||
|
#define nord1 #3B4252
|
||||||
|
#define nord2 #434C5E
|
||||||
|
#define nord3 #4C566A
|
||||||
|
#define nord4 #D8DEE9
|
||||||
|
#define nord5 #E5E9F0
|
||||||
|
#define nord6 #ECEFF4
|
||||||
|
#define nord7 #8FBCBB
|
||||||
|
#define nord8 #88C0D0
|
||||||
|
#define nord9 #81A1C1
|
||||||
|
#define nord10 #5E81AC
|
||||||
|
#define nord11 #BF616A
|
||||||
|
#define nord12 #D08770
|
||||||
|
#define nord13 #EBCB8B
|
||||||
|
#define nord14 #A3BE8C
|
||||||
|
#define nord15 #B48EAD
|
||||||
|
|
||||||
|
*.foreground: nord4
|
||||||
|
*.background: nord0
|
||||||
|
*.cursorColor: nord4
|
||||||
|
*fading: 35
|
||||||
|
*fadeColor: nord3
|
||||||
|
|
||||||
|
*.color0: nord1
|
||||||
|
*.color1: nord11
|
||||||
|
*.color2: nord14
|
||||||
|
*.color3: nord13
|
||||||
|
*.color4: nord9
|
||||||
|
*.color5: nord15
|
||||||
|
*.color6: nord8
|
||||||
|
*.color7: nord5
|
||||||
|
*.color8: nord3
|
||||||
|
*.color9: nord11
|
||||||
|
*.color10: nord14
|
||||||
|
*.color11: nord13
|
||||||
|
*.color12: nord9
|
||||||
|
*.color13: nord15
|
||||||
|
*.color14: nord7
|
||||||
|
*.color15: nord6
|
||||||
@@ -26,15 +26,58 @@
|
|||||||
changed = green
|
changed = green
|
||||||
untracked = cyan
|
untracked = cyan
|
||||||
|
|
||||||
|
[core]
|
||||||
|
pager = less -R
|
||||||
|
[help]
|
||||||
|
autocorrect = 1 #fucking magic!
|
||||||
|
|
||||||
|
#Kudos for (copied from):
|
||||||
|
#http://git-scm.com/book/en/Customizing-Git-Git-Configuration
|
||||||
|
#http://robots.thoughtbot.com/post/4747482956/streamline-your-git-workflow-with-aliases
|
||||||
|
#http://oli.jp/2012/git-powerup/#conclusion
|
||||||
|
#http://blog.blindgaenger.net/advanced_git_aliases.html
|
||||||
|
#https://gist.github.com/robmiller/6018582 (branch-name, publish, unpublish)
|
||||||
|
|
||||||
|
[apply]
|
||||||
|
whitespace = nowarn
|
||||||
|
|
||||||
|
|
||||||
|
# URL shorthands
|
||||||
|
|
||||||
|
[url "git@github.com:"]
|
||||||
|
insteadOf = "gh:"
|
||||||
|
pushInsteadOf = "github:"
|
||||||
|
pushInsteadOf = "git://github.com/"
|
||||||
|
|
||||||
|
[url "git://github.com/"]
|
||||||
|
insteadOf = "github:"
|
||||||
|
|
||||||
|
[url "git@gist.github.com:"]
|
||||||
|
insteadOf = "gst:"
|
||||||
|
pushInsteadOf = "gist:"
|
||||||
|
pushInsteadOf = "git://gist.github.com/"
|
||||||
|
|
||||||
|
[url "git://gist.github.com/"]
|
||||||
|
insteadOf = "gist:"
|
||||||
|
|
||||||
|
[diff]
|
||||||
|
# Detect copies as well as renames
|
||||||
|
renames = copies
|
||||||
|
|
||||||
|
[diff "bin"]
|
||||||
|
# Use `hexdump` to diff binary files
|
||||||
|
textconv = hexdump -v -C
|
||||||
|
|
||||||
|
|
||||||
[alias]
|
[alias]
|
||||||
#LAZY VERSIONS OF BASIC COMMANDS
|
########LAZY VERSIONS OF BASIC COMMANDS########
|
||||||
|
|
||||||
co = checkout
|
co = checkout
|
||||||
br = branch
|
br = branch
|
||||||
ci = commit
|
ci = commit
|
||||||
st = status
|
st = status
|
||||||
|
|
||||||
#BETTER VERSIONS OF BASIC COMMANDS
|
########BETTER VERSIONS OF BASIC COMMANDS########
|
||||||
|
|
||||||
purr = pull --rebase
|
purr = pull --rebase
|
||||||
puff = pull --ff-only
|
puff = pull --ff-only
|
||||||
@@ -138,38 +181,8 @@
|
|||||||
#add all, commit with message and push to remote
|
#add all, commit with message and push to remote
|
||||||
apm = "!f() { git add --all && git commit -m \"$@\" && git push; }; f"
|
apm = "!f() { git add --all && git commit -m \"$@\" && git push; }; f"
|
||||||
|
|
||||||
[apply]
|
|
||||||
whitespace = nowarn
|
|
||||||
[core]
|
|
||||||
pager = less -R
|
|
||||||
[help]
|
|
||||||
autocorrect = 1 #fucking magic!
|
|
||||||
|
|
||||||
#Kudos for (copied from):
|
###################! Git Kurwa!####################
|
||||||
#http://git-scm.com/book/en/Customizing-Git-Git-Configuration
|
|
||||||
#http://robots.thoughtbot.com/post/4747482956/streamline-your-git-workflow-with-aliases
|
|
||||||
#http://oli.jp/2012/git-powerup/#conclusion
|
|
||||||
#http://blog.blindgaenger.net/advanced_git_aliases.html
|
|
||||||
#https://gist.github.com/robmiller/6018582 (branch-name, publish, unpublish)
|
|
||||||
[color]
|
|
||||||
ui = auto
|
|
||||||
[color "branch"]
|
|
||||||
current = yellow reverse
|
|
||||||
local = yellow
|
|
||||||
remote = green
|
|
||||||
[color "decorate"]
|
|
||||||
remoteBranch = blue bold
|
|
||||||
[color "diff"]
|
|
||||||
meta = yellow bold
|
|
||||||
frag = magenta bold
|
|
||||||
old = red bold
|
|
||||||
new = green bold
|
|
||||||
[color "status"]
|
|
||||||
added = yellow
|
|
||||||
changed = green
|
|
||||||
untracked = cyan
|
|
||||||
|
|
||||||
[alias]
|
|
||||||
drzewokurwa = log --graph --date=relative \
|
drzewokurwa = log --graph --date=relative \
|
||||||
--format=format:'%C(auto)%h %C(bold blue)%an%C(auto)%d %C(green)%ad%C(reset)%n%w(80,8,8)%s'
|
--format=format:'%C(auto)%h %C(bold blue)%an%C(auto)%d %C(green)%ad%C(reset)%n%w(80,8,8)%s'
|
||||||
duzedrzewokurwa= log --graph --date=relative --name-status \
|
duzedrzewokurwa= log --graph --date=relative --name-status \
|
||||||
@@ -223,41 +236,6 @@
|
|||||||
|
|
||||||
palisiekurwa = !sh -c 'git add . && git commit -m \"palilo sie\" --no-gpg-sign --no-verify && git push --force && echo \"Ok, now RUN!\"'
|
palisiekurwa = !sh -c 'git add . && git commit -m \"palilo sie\" --no-gpg-sign --no-verify && git push --force && echo \"Ok, now RUN!\"'
|
||||||
|
|
||||||
[apply]
|
|
||||||
whitespace = nowarn
|
|
||||||
|
|
||||||
[user]
|
[user]
|
||||||
name = VectorKappa
|
name = VectorKappa
|
||||||
email = piotrpatalong@gmail.com
|
email = piotrpatalong@gmail.com
|
||||||
|
|
||||||
# URL shorthands
|
|
||||||
|
|
||||||
[url "git@github.com:"]
|
|
||||||
|
|
||||||
insteadOf = "gh:"
|
|
||||||
pushInsteadOf = "github:"
|
|
||||||
pushInsteadOf = "git://github.com/"
|
|
||||||
|
|
||||||
[url "git://github.com/"]
|
|
||||||
|
|
||||||
insteadOf = "github:"
|
|
||||||
|
|
||||||
[url "git@gist.github.com:"]
|
|
||||||
|
|
||||||
insteadOf = "gst:"
|
|
||||||
pushInsteadOf = "gist:"
|
|
||||||
pushInsteadOf = "git://gist.github.com/"
|
|
||||||
|
|
||||||
[url "git://gist.github.com/"]
|
|
||||||
|
|
||||||
insteadOf = "gist:"
|
|
||||||
|
|
||||||
[diff]
|
|
||||||
|
|
||||||
# Detect copies as well as renames
|
|
||||||
renames = copies
|
|
||||||
|
|
||||||
[diff "bin"]
|
|
||||||
|
|
||||||
# Use `hexdump` to diff binary files
|
|
||||||
textconv = hexdump -v -C
|
|
||||||
|
|||||||
@@ -149,6 +149,7 @@ set -g @plugin 'tmux-plugins/tmux-sensible'
|
|||||||
set -g @plugin 'tmux-plugins/tmux-resurrect'
|
set -g @plugin 'tmux-plugins/tmux-resurrect'
|
||||||
set -g @plugin 'tmux-plugins/tmux-continuum'
|
set -g @plugin 'tmux-plugins/tmux-continuum'
|
||||||
set -g @plugin 'tmux-plugins/tmux-prefix-highlight'
|
set -g @plugin 'tmux-plugins/tmux-prefix-highlight'
|
||||||
|
set -g @plugin "arcticicestudio/nord-tmux"
|
||||||
|
|
||||||
set -g @continuum-restore 'on'
|
set -g @continuum-restore 'on'
|
||||||
|
|
||||||
|
|||||||
74
zsh/.aliases
Normal file
74
zsh/.aliases
Normal file
@@ -0,0 +1,74 @@
|
|||||||
|
#!/bin/zsh
|
||||||
|
|
||||||
|
# Easier navigation: .., ..., ...., ....., ~ and -
|
||||||
|
alias ..="cd .."
|
||||||
|
alias cd..="cd .."
|
||||||
|
alias ...="cd ../.."
|
||||||
|
alias ....="cd ../../.."
|
||||||
|
alias .....="cd ../../../.."
|
||||||
|
alias ......="cd ../../../../.."
|
||||||
|
|
||||||
|
##* Colours!
|
||||||
|
alias ls="command ls --color=auto"
|
||||||
|
alias grep='grep --color=auto'
|
||||||
|
alias fgrep='fgrep --color=auto'
|
||||||
|
alias egrep='egrep --color=auto'
|
||||||
|
|
||||||
|
# Shortcuts
|
||||||
|
alias g="git"
|
||||||
|
alias h="history"
|
||||||
|
alias j="jobs"
|
||||||
|
|
||||||
|
# alternative to tail -f
|
||||||
|
alias lessf="less +F"
|
||||||
|
|
||||||
|
# List all files colorized in long format
|
||||||
|
alias l="ls -l"
|
||||||
|
alias ll="ls -lah"
|
||||||
|
|
||||||
|
# List all files colorized in long format, including dot files
|
||||||
|
alias la="ls -la"
|
||||||
|
|
||||||
|
# List only directories
|
||||||
|
alias lsd="ls -l | grep --color=never '^d'"
|
||||||
|
|
||||||
|
# Enable aliases to be sudo’ed
|
||||||
|
alias sudo='sudo '
|
||||||
|
|
||||||
|
# Get week number
|
||||||
|
alias week='date +%V'
|
||||||
|
|
||||||
|
# Stopwatch
|
||||||
|
alias timer='echo "Timer started. Stop with Ctrl-D." && date && time cat && date'
|
||||||
|
|
||||||
|
# Dice for the undecided
|
||||||
|
alias dice='echo $[ 1 + $RANDOM % 6 ]'
|
||||||
|
alias yn='[ $[ $RANDOM % 2 ] == 0 ] && echo "Yes" || echo "No"'
|
||||||
|
|
||||||
|
# IP addresses
|
||||||
|
alias myip="dig +short myip.opendns.com @resolver1.opendns.com"
|
||||||
|
alias localip="ifconfig wlan0 | grep 'inet addr' | cut -d ':' -f 2 | cut -d ' ' -f 1"
|
||||||
|
alias ips="ifconfig -a | grep -o 'inet6\? \(addr:\)\?\s\?\(\(\([0-9]\+\.\)\{3\}[0-9]\+\)\|[a-fA-F0-9:]\+\)' | awk '{ sub(/inet6? (addr:)? ?/, \"\"); print }'"
|
||||||
|
|
||||||
|
# Canonical hex dump; some systems have this symlinked
|
||||||
|
command -v hd > /dev/null || alias hd="hexdump -C"
|
||||||
|
|
||||||
|
# URL-encode strings
|
||||||
|
alias urlencode='python -c "import sys, urllib as ul; print ul.quote_plus(sys.argv[1]);"'
|
||||||
|
|
||||||
|
# Ring the terminal bell
|
||||||
|
alias ding="tput bel"
|
||||||
|
|
||||||
|
# Intuitive map function
|
||||||
|
# For example, to list all directories that contain a certain file:
|
||||||
|
# find . -name .gitattributes | map dirname
|
||||||
|
alias map="xargs -n1"
|
||||||
|
|
||||||
|
# Reload the shell (i.e. invoke as a login shell)
|
||||||
|
alias reload="exec $SHELL -l"
|
||||||
|
|
||||||
|
# See if connection works
|
||||||
|
alias p="ping 1.1.1.1"
|
||||||
|
|
||||||
|
# Print each PATH entry on a separate line
|
||||||
|
alias path='echo -e ${PATH//:/\\n}'
|
||||||
34
zsh/.zshrc
Normal file
34
zsh/.zshrc
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
source ~/.zplug/init.zsh
|
||||||
|
source ~/.aliases
|
||||||
|
# Supports oh-my-zsh plugins and the like
|
||||||
|
zplug "plugins/git", from:oh-my-zsh
|
||||||
|
zplug "plugins/colored-man-pages", from:oh-my-zsh
|
||||||
|
zplug "plugins/command-not-found", from:oh-my-zsh
|
||||||
|
zplug "plugins/web-search", from:oh-my-zsh
|
||||||
|
zplug "plugins/tmux", from:oh-my-zsh
|
||||||
|
zplug "plugins/urltools", from:oh-my-zsh
|
||||||
|
|
||||||
|
zplug "oldratlee/hacker-quotes"
|
||||||
|
|
||||||
|
zplug "plugins/thefuck", from:oh-my-zsh
|
||||||
|
|
||||||
|
zplug "modules/prompt", from:prezto
|
||||||
|
# Load completion library for those sweet [tab] squares
|
||||||
|
zplug "lib/completion", from:oh-my-zsh
|
||||||
|
|
||||||
|
# Syntax highlighting for commands, load last
|
||||||
|
zplug "zsh-users/zsh-syntax-highlighting", from:github, defer:3
|
||||||
|
zplug "zsh-users/zsh-autosuggestions", defer:3
|
||||||
|
|
||||||
|
# Install plugins if there are plugins that have not been installed
|
||||||
|
if ! zplug check --verbose; then
|
||||||
|
printf "Install? [y/N]: "
|
||||||
|
if read -q; then
|
||||||
|
echo; zplug install
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Then, source plugins and add commands to $PATH
|
||||||
|
zplug load
|
||||||
|
|
||||||
|
prompt pure
|
||||||
Reference in New Issue
Block a user