diff --git a/.Xresources b/.Xresources index 86203cd..03031d9 100644 --- a/.Xresources +++ b/.Xresources @@ -1,7 +1,9 @@ Xft.dpi: 166 +#Xft.dpi: 210 Xft.autohint: 1 Xft.lcdfilter: lcddefault -Xft.hintstyle: hintfull +#Xft.hintstyle: hintfull +Xft.hintstyle: hintslight Xft.hinting: 1 Xft.antialias: 1 Xft.rgba: rgb diff --git a/.config/i3/config b/.config/i3/config index dee2d06..2be97ec 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -18,7 +18,8 @@ exec xrandr --dpi 180 # is used in the bar {} block below. #font pango:monospace 8 #font pango:Fira Code 10 -font pango:Cantarell 10 +#font pango:Cantarell 10 +font pango:Fira Mono, Icons 9 # This font is widely installed, provides lots of unicode glyphs, right-to-left # text rendering and scalability on retina/hidpi displays (thanks to pango). @@ -41,8 +42,8 @@ floating_modifier $mod # Small (non-scaled) chrome bindsym $mod+shift+w exec chromium --force-device-scale-factor=1 # Increase volume -bindsym $mod+shift+d exec pamixer -i 5 -bindsym XF86AudioRaiseVolume exec pamixer -i 5 +bindsym $mod+shift+d exec "pamixer -i 5 && pkill -RTMIN+1 i3blocks" +bindsym XF86AudioRaiseVolume exec "pamixer -i 5 && pkill -RTMIN+1 i3blocks" # Decrease volume bindsym $mod+shift+s exec pamixer -d 5 bindsym XF86AudioLowerVolume exec pamixer -d 5 @@ -57,10 +58,10 @@ bindsym $mod+Return exec gnome-terminal bindsym $mod+Shift+q kill # start dmenu (a program launcher) -bindsym $mod+d exec dmenu_run +#bindsym $mod+d exec dmenu_run # start rofi (alt program launcher) -#bindsym $mod+d exec rofi_run +bindsym $mod+d exec --no-startup-id "rofi -combi-modi window,drun -show combi -modi combi -config ~/.local/rofi/config" # There also is the (new) i3-dmenu-desktop which only displays applications # shipping a .desktop file. It is a wrapper around dmenu, so you need that @@ -180,17 +181,26 @@ mode "resize" { bindsym $mod+r mode "resize" +# External monitor +bindsym $mod+o exec xrandr --output DP1 --auto --right-of eDP1 --pos 2440x0 + # Start i3bar to display a workspace bar (plus the system information i3status # finds out, if available) bar { position top - status_command i3status + #status_command i3status + status_command i3blocks colors{ background #232323 statusline #DCDCDC + focused_workspace #007c26 #005119 #fdf6e3 } + font pango:Fira Mono, Icons 10 } +# Colors +client.focused #003611 #003611 #ffffff #007c26 #003611 + ####################### # i3 startup commands # @@ -217,6 +227,9 @@ exec feh --bg-fill ~/Pictures/wlp.jpg # Network manager applet exec nm-applet +# Keyboard layout +exec_always "setxkbmap -layout us,si -option 'grp:alt_shift_toggle'" + # gaps between windows gaps inner 5 gaps outer 1 diff --git a/.i3blocks.conf b/.i3blocks.conf new file mode 100644 index 0000000..c75527c --- /dev/null +++ b/.i3blocks.conf @@ -0,0 +1,158 @@ +# i3blocks config file +# +# Please see man i3blocks for a complete reference! +# The man page is also hosted at http://vivien.github.io/i3blocks +# +# List of valid properties: +# +# align +# color +# command +# full_text +# instance +# interval +# label +# min_width +# name +# separator +# separator_block_width +# short_text +# signal +# urgent + +# Global properties +# +# The top properties below are applied to every block, but can be overridden. +# Each block command defaults to the script name to avoid boilerplate. +command=/usr/lib/i3blocks/$BLOCK_NAME +separator_block_width=15 +markup=none + +# Volume indicator +# +# The first parameter sets the step (and units to display) +# The second parameter overrides the mixer selection +# See the script for details. +[volume] +#label=VOL +label=♪ +#label=🔉 +instance=Master +#instance=PCM +interval=once +signal=10 + +# Memory usage +# +# The type defaults to "mem" if the instance is not specified. +[memory] +label=MEM +separator=false +interval=10 + +[memory] +label=SWAP +instance=swap +#separator=false +interval=10 + +# Disk usage +# +# The directory defaults to $HOME if the instance is not specified. +# The script may be called with a optional argument to set the alert +# (defaults to 10 for 10%). +[disk] +label=HOME +#instance=/mnt/data +interval=30 + +# Network interface monitoring +# +# If the instance is not specified, use the interface used for default route. +# The address can be forced to IPv4 or IPv6 with -4 or -6 switches. +[iface] +#instance=wlan0 +color=#00FF00 +interval=10 +separator=false + +[wifi] +instance=wlp4s0 +interval=10 +#separator=false + +#[bandwidth] +#instance=eth0 +#interval=5 + +# CPU usage +# +# The script may be called with -w and -c switches to specify thresholds, +# see the script for details. +[cpu_usage] +label=CPU +interval=1 +min_width=CPU: 80.00% +#separator=false + +#[load_average] +#interval=10 + +# Battery indicator +# +# The battery instance defaults to 0. +[battery] +#label=BAT +label=⚡ +#instance=1 +command=count=$(acpi -b | wc -l); sum=$(acpi -b | egrep -o '[0-9]{1,3}%' | tr -d '%' | xargs -I% echo -n '+%'); echo '' $(( sum / count ))% +interval=30 + +# Date Time +# +[time] +#command=date '+%Y-%m-%d %H:%M:%S' +command=date '+%a, %d %b %H:%M' +interval=5 + +[separator] + +# Generic media player support +# +# This displays "ARTIST - SONG" if a music is playing. +# Supported players are: spotify, vlc, audacious, xmms2, mplayer, and others. +#[mediaplayer] +#instance=spotify +#interval=5 +#signal=10 + +# OpenVPN support +# +# Support multiple VPN, with colors. +#[openvpn] +#interval=20 + +# Temperature +# +# Support multiple chips, though lm-sensors. +# The script may be called with -w and -c switches to specify thresholds, +# see the script for details. +#[temperature] +#label=TEMP +#interval=10 + +# Key indicators +# +# Add the following bindings to i3 config file: +# +# bindsym --release Caps_Lock exec pkill -SIGRTMIN+11 i3blocks +# bindsym --release Num_Lock exec pkill -SIGRTMIN+11 i3blocks +#[keyindicator] +#instance=CAPS +#interval=once +#signal=11 + +#[keyindicator] +#instance=NUM +#interval=once +#signal=11 diff --git a/.local/rofi/config b/.local/rofi/config new file mode 100644 index 0000000..eee66b4 --- /dev/null +++ b/.local/rofi/config @@ -0,0 +1,7 @@ +rofi.color-normal: #00383c4a, #c4cbd4, #96404552, #4084d6, #f9f9f9 +rofi.color-urgent: #002d303b, #cc6666, #e52d303b, #a54242, #f9f9f9 +rofi.color-active: #002d303b, #b5bd68, #e42d303b, #8c9440, #f9f9f9 +rofi.color-window: #f22d303b, #7c8389, #1d1f21 +rofi.separator-style: solid +rofi.font: terminus 16 + diff --git a/.spacemacs b/.spacemacs index 9d892f9..e4a2c51 100644 --- a/.spacemacs +++ b/.spacemacs @@ -477,7 +477,7 @@ This function is called at the very end of Spacemacs initialization." ;; If there is more than one, they won't work right. '(package-selected-packages (quote - (yapfify which-key use-package org-brain live-py-mode ivy-rich evil-unimpaired dumb-jump define-word counsel-projectile counsel goto-chg helm helm-core alert projectile org-plus-contrib magit git-commit ghub dash-functional php-mode cider f dash zenburn-theme yaml-mode ws-butler with-editor winum wgrep web-mode web-beautify volatile-highlights vimrc-mode vi-tilde-fringe uuidgen unfill typit toml-mode toc-org tao-theme tagedit symon swiper suscolors-theme sudoku sublimity string-inflection sql-indent spaceline solarized-theme smex smeargle slim-mode scss-mode sayid sass-mode rvm rudel ruby-tools ruby-test-mode ruby-refactor rubocop rspec-mode robe restart-emacs request rbenv rake rainbow-delimiters racer queue pyvenv pytest pyenv-mode py-isort pug-mode popwin pippel pip-requirements phpunit phpcbf php-extras php-auto-yasnippets persp-mode password-generator paradox pacmacs overseer orgit org-projectile org-present org-pomodoro org-download org-bullets open-junk-file neotree nameless mwim move-text mmm-mode minitest markdown-toc magit-gitflow macrostep lorem-ipsum log4e livid-mode linum-relative link-hint less-css-mode json-mode js2-refactor js-doc ivy-purpose ivy-hydra info+ indent-guide importmagic impatient-mode hy-mode hungry-delete hl-todo highlight-parentheses highlight-numbers highlight-indentation hide-comnt help-fns+ helm-make gruvbox-theme google-translate golden-ratio gnuplot gntp gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md geiser fuzzy flycheck-rust flycheck-pos-tip flx-ido floobits fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-tutor evil-surround evil-search-highlight-persist evil-org evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-lion evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu emmet-mode elisp-slime-nav editorconfig drupal-mode diminish diff-hl dakrone-light-theme dactyl-mode cython-mode counsel-css company-web company-tern company-statistics company-php company-auctex company-anaconda column-enforce-mode coffee-mode clojure-snippets clojure-cheatsheet clj-refactor clean-aindent-mode cider-eval-sexp-fu chruby cargo bundler browse-at-remote bind-key auto-yasnippet auto-highlight-symbol auto-compile auctex-latexmk all-the-icons-dired aggressive-indent adaptive-wrap ace-window ace-link ac-ispell 2048-game)))) + (zenburn-theme spaceline-all-the-icons org-brain live-py-mode hy-mode auto-compile ac-php-core counsel helm helm-core magit with-editor yasnippet cider yapfify yaml-mode xcscope ws-butler winum which-key wgrep web-mode web-beautify volatile-highlights vimrc-mode vi-tilde-fringe uuidgen use-package unfill typit toml-mode toc-org tao-theme tagedit symon swiper suscolors-theme sudoku sublimity string-inflection sql-indent spaceline solarized-theme smex smeargle slim-mode scss-mode sayid sass-mode rvm rudel ruby-tools ruby-test-mode ruby-refactor rubocop rspec-mode robe restart-emacs request rbenv rake rainbow-delimiters racer queue pyvenv pytest pyenv-mode py-isort pug-mode popwin pippel pip-requirements phpunit phpcbf php-extras php-auto-yasnippets persp-mode password-generator paradox pacmacs packed overseer orgit org-projectile org-present org-pomodoro org-download org-bullets open-junk-file neotree nameless mwim move-text mmm-mode minitest markdown-toc magit-gitflow macrostep lorem-ipsum livid-mode linum-relative link-hint less-css-mode json-mode js2-refactor js-doc ivy-rich ivy-purpose ivy-hydra info+ indent-guide importmagic impatient-mode hungry-delete hl-todo highlight-parentheses highlight-numbers highlight-indentation hide-comnt help-fns+ helm-make gruvbox-theme google-translate golden-ratio gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ ghub gh-md geiser fuzzy flycheck-rust flycheck-pos-tip flx-ido floobits fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-org evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-lion evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu emmet-mode elisp-slime-nav editorconfig dumb-jump drupal-mode diminish diff-hl define-word dakrone-light-theme dactyl-mode cython-mode counsel-projectile counsel-css company-web company-tern company-statistics company-php company-auctex company-anaconda column-enforce-mode coffee-mode clojure-snippets clojure-cheatsheet clj-refactor clean-aindent-mode cider-eval-sexp-fu chruby cargo bundler browse-at-remote auto-yasnippet auto-highlight-symbol auctex-latexmk all-the-icons-dired aggressive-indent adaptive-wrap ace-window ace-link ac-ispell 2048-game)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/.zshrc b/.zshrc index 08310be..a70bc40 100644 --- a/.zshrc +++ b/.zshrc @@ -4,24 +4,14 @@ HISTSIZE=1000 SAVEHIST=10000 bindkey -v export KEYTIMEOUT=1 -# End of lines configured by zsh-newuser-install -# The following lines were added by compinstall zstyle :compinstall filename '/home/g1smo/.zshrc' autoload -Uz compinit compinit -# End of lines added by compinstall - -# The following lines were added by compinstall -zstyle :compinstall filename '/home/g1smo/.zshrc' export EDITOR="vim" export VISUAL="vim" -autoload -Uz compinit -compinit -# End of lines added by compinstall - # Color autoload colors zsh/terminfo colors @@ -62,26 +52,19 @@ alias gitclean="git fetch -p && for branch in \$(git branch -vv | grep ': gone]' #alias llc="sshfs 10.0.0.203:/Users/g1smo/Projects/LickList ~/ll -oauto_cache,reconnect,no_readahead -o Ciphers=arcfour -o Compression=no" #alias llcc="sshfs 192.168.1.103:/Users/g1smo/Projects/LickList ~/ll -oauto_cache,reconnect,no_readahead" alias llc="sudo mount -t nfs 10.0.0.203:/Users/g1smo/Projects/LickList ~/ll" -alias lld="sudo umount ~/ll" +alias lld="sudo umount -l ~/ll" # Firefox scaling! -# regular firefox alias sf="find ~/.mozilla/firefox -name \"prefs.js\" -exec sed -ri 's/(devPixelsPerPx\\\", \\\")[0-9\\.]+/\\11\.00/' {} + ; firefox" +# regular firefox alias ff="find ~/.mozilla/firefox -name \"prefs.js\" -exec sed -ri 's/(devPixelsPerPx\\\", \\\")[0-9\\.]+/\\11\.75/' {} + ; firefox" -# Wandera env -alias wdev="cp /home/g1smo/Projects/w_params_dev.yml /srv/http/portal/app/config/environment.yml" -alias wqa="cp /home/g1smo/Projects/w_params_qa.yml /srv/http/portal/app/config/environment.yml" -alias wfeat="cp /home/g1smo/Projects/w_params_feat.yml /srv/http/portal/app/config/environment.yml" - # Reverse search shortcut bindkey '^R' history-incremental-pattern-search-backward -# Skype fix -# export PULSE_LATENCY_MSEC=60 - # Xdebug export XDEBUG_CONFIG="idekey=xdebug remote_host=localhost remote_enable=1 remote_handler=dbgp remote_host=localhost remote_port=9001" + export SCALA_HOME="/usr/share/scala" export SAL_USE_VCLPLUGIN="gtk" export PHP_INI_SCAN_DIR="/etc/php56/conf.d/" @@ -115,9 +98,6 @@ export PHANTOMJS_BIN=/usr/bin/phantomjs # Guile deprecated warnings export GUILE_WARN_DEPRECATED="detailed" -# RBEnv -command -v rbenv && eval "$(rbenv init -)" - # Java fix? export NLS_LANG=American_America.UTF8