diff --git a/init.sh b/init.sh index 570c025..0a10c7f 100755 --- a/init.sh +++ b/init.sh @@ -2,8 +2,7 @@ mkdir -p ~/.backup mkdir -p ~/.config/qtile ln -snf `pwd`/vimrc ~/.vimrc ln -snf `pwd`/tmux.conf ~/.tmux.conf -ln -snf `pwd`/zshrc.local ~/.zshrc.local -ln -snf `pwd`/zshrc ~/.zshrc +ln -snf `pwd`/ohmyzshrc ~/.zshrc ln -snf `pwd`/qtile_config.py ~/.config/qtile/config.py ln -snf `pwd`/gitconfig ~/.gitconfig ln -snf `pwd`/gitignore ~/.gitignore diff --git a/ohmyzshrc b/ohmyzshrc new file mode 100644 index 0000000..44c386e --- /dev/null +++ b/ohmyzshrc @@ -0,0 +1,89 @@ +export TERM=xterm-256color +export ZSH_TMUX_AUTOSTART=true +export ZSH_TMUX_FIXTERM=false + +# Path to your oh-my-zsh installation. + export ZSH=/home/asmaps/.oh-my-zsh + +# Set name of the theme to load. +# Look in ~/.oh-my-zsh/themes/ +# Optionally, if you set this to "random", it'll load a random theme each +# time that oh-my-zsh is loaded. +ZSH_THEME="clean" + +# Uncomment the following line to use case-sensitive completion. +# CASE_SENSITIVE="true" + +# Uncomment the following line to use hyphen-insensitive completion. Case +# sensitive completion must be off. _ and - will be interchangeable. +# HYPHEN_INSENSITIVE="true" + +# Uncomment the following line to disable bi-weekly auto-update checks. +# DISABLE_AUTO_UPDATE="true" + +# Uncomment the following line to change how often to auto-update (in days). +# export UPDATE_ZSH_DAYS=13 + +# Uncomment the following line to disable colors in ls. +# DISABLE_LS_COLORS="true" + +# Uncomment the following line to disable auto-setting terminal title. +# DISABLE_AUTO_TITLE="true" + +# Uncomment the following line to enable command auto-correction. +# ENABLE_CORRECTION="true" + +# Uncomment the following line to display red dots whilst waiting for completion. +# COMPLETION_WAITING_DOTS="true" + +# Uncomment the following line if you want to disable marking untracked files +# under VCS as dirty. This makes repository status check for large repositories +# much, much faster. +# DISABLE_UNTRACKED_FILES_DIRTY="true" + +# Uncomment the following line if you want to change the command execution time +# stamp shown in the history command output. +# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" +# HIST_STAMPS="mm/dd/yyyy" + +# Would you like to use another custom folder than $ZSH/custom? +# ZSH_CUSTOM=/path/to/new-custom-folder + +# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) +# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ +# Example format: plugins=(rails git textmate ruby lighthouse) +# Add wisely, as too many plugins slow down shell startup. +plugins=(git cp dirpersist tmux debian) + +# User configuration + + export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games" +# export MANPATH="/usr/local/man:$MANPATH" + +source $ZSH/oh-my-zsh.sh + +# You may need to manually set your language environment +# export LANG=en_US.UTF-8 + +# Preferred editor for local and remote sessions +# if [[ -n $SSH_CONNECTION ]]; then +# export EDITOR='vim' +# else +# export EDITOR='mvim' +# fi + +# Compilation flags +# export ARCHFLAGS="-arch x86_64" + +# ssh +# export SSH_KEY_PATH="~/.ssh/dsa_id" + +# Set personal aliases, overriding those provided by oh-my-zsh libs, +# plugins, and themes. Aliases can be placed here, though oh-my-zsh +# users are encouraged to define aliases within the ZSH_CUSTOM folder. +# For a full list of active aliases, run `alias`. +# +# Example aliases +# alias zshconfig="mate ~/.zshrc" +# alias ohmyzsh="mate ~/.oh-my-zsh" + diff --git a/qtile_config.py b/qtile_config.py index 4937df8..a6300bf 100644 --- a/qtile_config.py +++ b/qtile_config.py @@ -85,7 +85,7 @@ keys = [ Key([mod], "r", lazy.spawncmd()), ] -groups = [Group(i) for i in "123456789"] +groups = [Group(i) for i in "12345"] for i in groups: # mod1 + letter of group = switch to group @@ -106,7 +106,7 @@ layouts = [ widget_defaults = dict( font='Arial', - fontsize=16, + fontsize=12, padding=3, ) @@ -117,9 +117,17 @@ screens = [ widget.GroupBox(), widget.Prompt(), widget.TaskList(), + widget.Notify(), widget.ThermalSensor(tag_sensor='Core 0'), widget.ThermalSensor(tag_sensor='temp1'), + widget.Sep(), widget.Memory(fmt="{MemAvailable}M"), + widget.Sep(), + widget.TextBox(text='eth'), + widget.Net(interface="enp3s0"), + widget.Sep(), + widget.TextBox(text='wifi'), + widget.Net(interface="wlp5s0"), widget.DF(), widget.Sep(), widget.BatteryIcon(), @@ -127,10 +135,8 @@ screens = [ widget.Sep(), widget.Systray(), widget.Clock(format='%a %d.%m. %H:%M'), - widget.Sep(), - widget.CurrentLayout(), ], - 30, + 25, ), ), ] diff --git a/vimrc b/vimrc index e31aa94..d9defb5 100644 --- a/vimrc +++ b/vimrc @@ -164,18 +164,8 @@ let g:pymode_virtualenv = 1 " Docker highlighting Bundle 'docker/docker', {'rtp': 'contrib/syntax/vim'} -" Bundle 'tpope/vim-vividchalk' -Bundle 'tomasr/molokai' set background=dark -try - colorscheme molokai -catch /^Vim\%((\a\+)\)\=:E185/ - " deal with it -endtry +Bundle 'trevorrjohn/vim-obsidian' +colorscheme obsidian Plugin 'othree/html5.vim' - -" Plugin 'godlygeek/tabular' -" Plugin 'plasticboy/vim-markdown' -Plugin 'mustache/vim-mustache-handlebars' -let g:mustache_abbreviations = 1 diff --git a/zshrc.local b/zshrc.local index f96b3be..e607e4d 100644 --- a/zshrc.local +++ b/zshrc.local @@ -1,29 +1,5 @@ alias dc=docker-compose -if which apt-get 2>&1 >/dev/null; then - alias ack=ack-grep - if [ -e "/usr/local/bin/virtualenvwrapper.sh" ]; then - source /usr/local/bin/virtualenvwrapper.sh - fi - if [ -e "/etc/bash_completion.d/virtualenvwrapper" ]; then - source /etc/bash_completion.d/virtualenvwrapper - fi - if [ -e "/usr/lib/rbenv/completions/rbenv.zsh" ]; then - source /usr/lib/rbenv/completions/rbenv.zsh - eval "$(rbenv init -)" - fi -fi - -if which pacman 2>&1 >/dev/null; then - if [ -e "/usr/bin/virtualenvwrapper.sh" ]; then - source /usr/bin/virtualenvwrapper.sh - fi -fi - -if [ -e "/home/asmaps/.rvm/scripts/rvm" ]; then - source /home/asmaps/.rvm/scripts/rvm -fi - # autostart tmux if [ "$TMUX" = "" ]; then export TERM=xterm-256color