diff --git a/.Xresources b/.Xresources new file mode 100644 index 0000000..ea036a5 --- /dev/null +++ b/.Xresources @@ -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 diff --git a/.config/i3/config b/.config/i3/config index b9d8e9c..9a19a59 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -9,13 +9,16 @@ # # 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 # is used in the bar {} block below. #font pango:monospace 8 #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 # 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 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 # ######################### @@ -196,3 +181,27 @@ bindsym $mod+r mode "resize" bar { 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 diff --git a/.spacemacs b/.spacemacs index fdd3308..9eb4af0 100644 --- a/.spacemacs +++ b/.spacemacs @@ -31,19 +31,20 @@ values." ;; List of configuration layers to load. dotspacemacs-configuration-layers '( - yaml ;; ---------------------------------------------------------------- ;; Example of useful layers you may want to use right away. ;; Uncomment some layer names and press (Vim style) or ;; (Emacs style) to install them. ;; ---------------------------------------------------------------- - helm + ;;helm + ivy auto-completion - ;;better-defaults + better-defaults emacs-lisp git markdown org + yaml ;; (shell :variables ;; shell-default-height 30 ;; shell-default-position 'bottom) @@ -65,14 +66,13 @@ values." ;; configuration in `dotspacemacs/user-config'. dotspacemacs-additional-packages '( editorconfig - ;;sublimity + sublimity all-the-icons all-the-icons-dired - yascroll + ;;yascroll solarized-theme - color-theme-solarized - color-theme-sanityinc-solarized zenburn-theme + suscolors-theme ) ;; A list of packages that cannot be updated. dotspacemacs-frozen-packages '() @@ -147,10 +147,10 @@ values." ;; with 2 themes variants, one dark and one light) dotspacemacs-themes '( ;;zenburn - solarized-light + ;;solarized-light ;;solarized-dark - ;;sanityinc-solarized-light ;;spacemacs-dark + suscolors ) ;; If non nil the cursor color matches the state color in GUI Emacs. dotspacemacs-colorize-cursor-according-to-state t @@ -159,10 +159,13 @@ values." dotspacemacs-default-font '( ;;"Source Code Pro" ;;"Fira Code Retina" - "Fira Mono" + "Fira Mono Medium" + ;;"Inconsolata-g" + ;;"Meslo LG M" + ;;"Ubuntu Mono" :size 24 - ;;:weight semibold :weight semibold + ;;:weight normal :style medium :width normal :powerline-scale 1.0) @@ -274,7 +277,8 @@ values." ;; If non nil smooth scrolling (native-scrolling) is enabled. Smooth ;; scrolling overrides the default behavior of Emacs which recenters point ;; 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' ;; derivatives. If set to `relative', also turns on relative line numbers. ;; (default nil) @@ -334,9 +338,9 @@ you should place your code here." (editorconfig-mode t) ;; Smooth scrolling - ;;(use-package sublimity) - ;;(use-package sublimity-scroll) - ;;(sublimity-mode t) + (use-package sublimity) + (use-package sublimity-scroll) + (sublimity-mode t) ;; Quickly resize text (define-key global-map (kbd "C-+") 'text-scale-increase) @@ -351,14 +355,17 @@ you should place your code here." ;;; 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 '(1 ((shift) . 1))) + ;;(setq mouse-wheel-scroll-amount '(1 ((shift) . 1))) ;;(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 - (use-package yascroll) - (global-yascroll-bar-mode t) - (setq yascroll:delay-to-hide nil) + ;;(use-package yascroll) + ;;(global-yascroll-bar-mode t) + ;;(setq yascroll:delay-to-hide nil) ) ;; Do not write anything past this comment. This is where Emacs will @@ -374,7 +381,7 @@ you should place your code here." '(evil-want-Y-yank-to-eol nil) '(package-selected-packages (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 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 968107b..f3338ae 100644 --- a/.zshrc +++ b/.zshrc @@ -86,10 +86,12 @@ export NVM_DIR="/home/g1smo/.nvm" #[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" alias invm="source /usr/share/nvm/init-nvm.sh" alias sc="chromium --force-device-scale-factor=1" +alias el="HOME=~/Sredstva emacs" # GTK interface scale -export GDK_SCALE=1 -export GDK_DPI_SCALE=0.6 +#export GDK_SCALE=1 +export GDK_DPI_SCALE=1 +export GDK_SCALE=1.66 # PhantomJS binary location export PHANTOMJS_BIN=/usr/bin/phantomjs