Merge branch 'master' of github.com:g1smo/dotfiles

x1carbon
Jure Podgoršek 2017-02-21 17:20:50 +01:00
commit eb6d0d2683
5 changed files with 96 additions and 42 deletions

7
.Xresources 100644
View File

@ -0,0 +1,7 @@
Xft.dpi: 180
Xft.autohint: 1
Xft.lcdfilter: lcddefault
Xft.hintstyle: hintfull
Xft.hinting: 1
Xft.antialias: 1
Xft.rgba: rgb

View File

@ -9,13 +9,16 @@
# #
# Please see http://i3wm.org/docs/userguide.html for a complete reference! # Please see http://i3wm.org/docs/userguide.html for a complete reference!
set $mod Mod1 set $mod Mod4
# DPI scaling
exec xrandr --dpi 180
# Font for window titles. Will also be used by the bar unless a different font # Font for window titles. Will also be used by the bar unless a different font
# is used in the bar {} block below. # is used in the bar {} block below.
#font pango:monospace 8 #font pango:monospace 8
#font pango:Fira Code 10 #font pango:Fira Code 10
font pango:Cantarell 12 font pango:Cantarell 10
# This font is widely installed, provides lots of unicode glyphs, right-to-left # This font is widely installed, provides lots of unicode glyphs, right-to-left
# text rendering and scalability on retina/hidpi displays (thanks to pango). # text rendering and scalability on retina/hidpi displays (thanks to pango).
@ -31,24 +34,6 @@ font pango:Cantarell 12
# Use Mouse+$mod to drag floating windows to their wanted position # Use Mouse+$mod to drag floating windows to their wanted position
floating_modifier $mod floating_modifier $mod
#######################
# i3 startup commands #
#######################
# Touchpad tap to click
exec --no-startup-id xinput set-prop 14 292 1
# Touchpad natural scrolling
exec --no-startup-id xinput set-prop 14 280 1
# Redshift (hello sleep)
exec redshift-gtk
# Background
exec feh --bg-fill /home/g1smo/Pictures/kupka.jpg
# Network manager applet
exec nm-applet
######################### #########################
# Various app shortcuts # # Various app shortcuts #
######################### #########################
@ -196,3 +181,27 @@ bindsym $mod+r mode "resize"
bar { bar {
status_command i3status status_command i3status
} }
#######################
# i3 startup commands #
#######################
# Touchpad tap to click
#exec --no-startup-id xinput set-prop 14 292 1
exec --no-startup-id xinput set-prop 13 280 1
# Touchpad natural scrolling
#exec --no-startup-id xinput set-prop 14 280 1
exec --no-startup-id xinput set-prop 13 290 1
# Transparency
exec compton -b
# Redshift (hello sleep)
exec redshift-gtk
# Background
exec feh --bg-fill /home/g1smo/Pictures/kupka.jpg
# Network manager applet
exec nm-applet

View File

@ -37,13 +37,15 @@ values."
;; Uncomment some layer names and press <SPC f e R> (Vim style) or ;; Uncomment some layer names and press <SPC f e R> (Vim style) or
;; <M-m f e R> (Emacs style) to install them. ;; <M-m f e R> (Emacs style) to install them.
;; ---------------------------------------------------------------- ;; ----------------------------------------------------------------
helm ;;helm
ivy
auto-completion auto-completion
;;better-defaults better-defaults
emacs-lisp emacs-lisp
git git
markdown markdown
org org
yaml
;; (shell :variables ;; (shell :variables
;; shell-default-height 30 ;; shell-default-height 30
;; shell-default-position 'bottom) ;; shell-default-position 'bottom)
@ -65,14 +67,13 @@ values."
;; configuration in `dotspacemacs/user-config'. ;; configuration in `dotspacemacs/user-config'.
dotspacemacs-additional-packages '( dotspacemacs-additional-packages '(
editorconfig editorconfig
;;sublimity sublimity
all-the-icons all-the-icons
all-the-icons-dired all-the-icons-dired
yascroll ;;yascroll
solarized-theme solarized-theme
color-theme-solarized
color-theme-sanityinc-solarized
zenburn-theme zenburn-theme
suscolors-theme
) )
;; A list of packages that cannot be updated. ;; A list of packages that cannot be updated.
dotspacemacs-frozen-packages '() dotspacemacs-frozen-packages '()
@ -147,10 +148,10 @@ values."
;; with 2 themes variants, one dark and one light) ;; with 2 themes variants, one dark and one light)
dotspacemacs-themes '( dotspacemacs-themes '(
;;zenburn ;;zenburn
solarized-light ;;solarized-light
;;solarized-dark ;;solarized-dark
;;sanityinc-solarized-light
;;spacemacs-dark ;;spacemacs-dark
suscolors
) )
;; If non nil the cursor color matches the state color in GUI Emacs. ;; If non nil the cursor color matches the state color in GUI Emacs.
dotspacemacs-colorize-cursor-according-to-state t dotspacemacs-colorize-cursor-according-to-state t
@ -159,10 +160,13 @@ values."
dotspacemacs-default-font '( dotspacemacs-default-font '(
;;"Source Code Pro" ;;"Source Code Pro"
;;"Fira Code Retina" ;;"Fira Code Retina"
"Fira Mono" "Fira Mono Medium"
;;"Inconsolata-g"
;;"Meslo LG M"
;;"Ubuntu Mono"
:size 24 :size 24
;;:weight semibold
:weight semibold :weight semibold
;;:weight normal
:style medium :style medium
:width normal :width normal
:powerline-scale 1.0) :powerline-scale 1.0)
@ -274,7 +278,8 @@ values."
;; If non nil smooth scrolling (native-scrolling) is enabled. Smooth ;; If non nil smooth scrolling (native-scrolling) is enabled. Smooth
;; scrolling overrides the default behavior of Emacs which recenters point ;; scrolling overrides the default behavior of Emacs which recenters point
;; when it reaches the top or bottom of the screen. (default t) ;; when it reaches the top or bottom of the screen. (default t)
dotspacemacs-smooth-scrolling t ;;dotspacemacs-smooth-scrolling t
dotspacemacs-smooth-scrolling nil
;; If non nil line numbers are turned on in all `prog-mode' and `text-mode' ;; If non nil line numbers are turned on in all `prog-mode' and `text-mode'
;; derivatives. If set to `relative', also turns on relative line numbers. ;; derivatives. If set to `relative', also turns on relative line numbers.
;; (default nil) ;; (default nil)
@ -334,9 +339,9 @@ you should place your code here."
(editorconfig-mode t) (editorconfig-mode t)
;; Smooth scrolling ;; Smooth scrolling
;;(use-package sublimity) (use-package sublimity)
;;(use-package sublimity-scroll) (use-package sublimity-scroll)
;;(sublimity-mode t) (sublimity-mode t)
;; Quickly resize text ;; Quickly resize text
(define-key global-map (kbd "C-+") 'text-scale-increase) (define-key global-map (kbd "C-+") 'text-scale-increase)
@ -351,14 +356,17 @@ you should place your code here."
;;; scroll one line at a time (less "jumpy" than defaults) ;;; scroll one line at a time (less "jumpy" than defaults)
;;(setq mouse-wheel-scroll-amount '(2 ((shift) . 1))) ;; two lines at a time ;;(setq mouse-wheel-scroll-amount '(2 ((shift) . 1))) ;; two lines at a time
(setq mouse-wheel-scroll-amount '(1 ((shift) . 1))) ;;(setq mouse-wheel-scroll-amount '(1 ((shift) . 1)))
;;(setq mouse-wheel-progressive-speed nil) ;; don't accelerate scrolling ;;(setq mouse-wheel-progressive-speed nil) ;; don't accelerate scrolling
(setq mouse-wheel-follow-mouse 't) ;; scroll window under mouse ;;(setq mouse-wheel-follow-mouse 't) ;; scroll window under mouse
;;(setq scroll-step 1)
(setq scroll-conservatively 10000)
(setq auto-window-vscroll nil)
;; Scrollbar ;; Scrollbar
(use-package yascroll) ;;(use-package yascroll)
(global-yascroll-bar-mode t) ;;(global-yascroll-bar-mode t)
(setq yascroll:delay-to-hide nil) ;;(setq yascroll:delay-to-hide nil)
) )
;; Do not write anything past this comment. This is where Emacs will ;; Do not write anything past this comment. This is where Emacs will
@ -374,7 +382,7 @@ you should place your code here."
'(evil-want-Y-yank-to-eol nil) '(evil-want-Y-yank-to-eol nil)
'(package-selected-packages '(package-selected-packages
(quote (quote
(tern request helm-core markdown-mode magit-popup git-commit yasnippet color-theme-solarized color-theme color-theme-sanityinc-solarized emacs-color-theme-solarized-theme bind-key all-the-icons highlight helm magit yaml-mode yascroll ws-butler window-numbering which-key web-mode web-beautify volatile-highlights vimrc-mode vi-tilde-fringe uuidgen use-package toc-org tagedit spacemacs-theme spaceline solarized-theme smeargle slim-mode scss-mode sass-mode restart-emacs rainbow-delimiters quelpa pug-mode popwin phpunit phpcbf php-extras php-auto-yasnippets persp-mode pcre2el paradox orgit org-projectile org-present org-pomodoro org-plus-contrib org-download org-bullets open-junk-file neotree move-text mmm-mode markdown-toc magit-gitflow macrostep lorem-ipsum livid-mode linum-relative link-hint less-css-mode json-mode js2-refactor js-doc info+ indent-guide ido-vertical-mode hungry-delete htmlize hl-todo highlight-parentheses highlight-numbers highlight-indentation hide-comnt help-fns+ helm-themes helm-swoop helm-projectile helm-mode-manager helm-make helm-gitignore helm-flx helm-descbinds helm-css-scss helm-company helm-c-yasnippet helm-ag google-translate golden-ratio gnuplot gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link gh-md flycheck-pos-tip flycheck-elm flx-ido 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-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-args evil-anzu eval-sexp-fu emmet-mode elm-mode elisp-slime-nav editorconfig dumb-jump drupal-mode define-word dactyl-mode company-web company-tern company-statistics column-enforce-mode coffee-mode clean-aindent-mode auto-yasnippet auto-highlight-symbol auto-compile all-the-icons-dired aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line ac-ispell)))) (mwim color-theme-solarized-theme color-theme-solarized-light-theme wgrep smex ivy-hydra counsel-projectile counsel swiper ivy sublimity tern request helm-core markdown-mode magit-popup git-commit yasnippet color-theme-solarized color-theme color-theme-sanityinc-solarized emacs-color-theme-solarized-theme bind-key all-the-icons highlight helm magit yaml-mode yascroll ws-butler window-numbering which-key web-mode web-beautify volatile-highlights vimrc-mode vi-tilde-fringe uuidgen use-package toc-org tagedit spacemacs-theme spaceline solarized-theme smeargle slim-mode scss-mode sass-mode restart-emacs rainbow-delimiters quelpa pug-mode popwin phpunit phpcbf php-extras php-auto-yasnippets persp-mode pcre2el paradox orgit org-projectile org-present org-pomodoro org-plus-contrib org-download org-bullets open-junk-file neotree move-text mmm-mode markdown-toc magit-gitflow macrostep lorem-ipsum livid-mode linum-relative link-hint less-css-mode json-mode js2-refactor js-doc info+ indent-guide ido-vertical-mode hungry-delete htmlize hl-todo highlight-parentheses highlight-numbers highlight-indentation hide-comnt help-fns+ helm-themes helm-swoop helm-projectile helm-mode-manager helm-make helm-gitignore helm-flx helm-descbinds helm-css-scss helm-company helm-c-yasnippet helm-ag google-translate golden-ratio gnuplot gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link gh-md flycheck-pos-tip flycheck-elm flx-ido 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-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-args evil-anzu eval-sexp-fu emmet-mode elm-mode elisp-slime-nav editorconfig dumb-jump drupal-mode define-word dactyl-mode company-web company-tern company-statistics column-enforce-mode coffee-mode clean-aindent-mode auto-yasnippet auto-highlight-symbol auto-compile all-the-icons-dired aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line ac-ispell))))
(custom-set-faces (custom-set-faces
;; custom-set-faces was added by Custom. ;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.

25
.zlogin 100644
View File

@ -0,0 +1,25 @@
# Solarized theme for tty, the light version.
# Based on:
# - Solarized (http://ethanschoonover.com/solarized)
# - Xresources from http://github.com/altercation/solarized
# Generated with pty2tty.awk by Joep van Delft
# http://github.com/joepvd/tty-solarized
if [ "$TERM" = "linux" ]; then
echo -en "\e]PB657b83" # S_base00
echo -en "\e]PA586e75" # S_base01
echo -en "\e]P0073642" # S_base02
echo -en "\e]P62aa198" # S_cyan
echo -en "\e]P8002b36" # S_base03
echo -en "\e]P2859900" # S_green
echo -en "\e]P5d33682" # S_magenta
echo -en "\e]P1dc322f" # S_red
echo -en "\e]PC839496" # S_base0
echo -en "\e]PE93a1a1" # S_base1
echo -en "\e]P9cb4b16" # S_orange
echo -en "\e]P7eee8d5" # S_base2
echo -en "\e]P4268bd2" # S_blue
echo -en "\e]P3b58900" # S_yellow
echo -en "\e]PFfdf6e3" # S_base3
echo -en "\e]PD6c71c4" # S_violet
clear # against bg artifacts
fi

9
.zshrc
View File

@ -86,7 +86,12 @@ export NVM_DIR="/home/g1smo/.nvm"
#[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" #[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
alias invm="source /usr/share/nvm/init-nvm.sh" alias invm="source /usr/share/nvm/init-nvm.sh"
alias sc="chromium --force-device-scale-factor=1" alias sc="chromium --force-device-scale-factor=1"
alias el="HOME=~/Sredstva emacs"
# GTK interface scale # GTK interface scale
export GDK_SCALE=1 #export GDK_SCALE=1
export GDK_DPI_SCALE=0.6 export GDK_DPI_SCALE=1
export GDK_SCALE=1.66
# PhantomJS binary location
export PHANTOMJS_BIN=/usr/bin/phantomjs