From 11e269539516cfbf72a9ed759a91974a722024d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jure=20Podgor=C5=A1ek?= Date: Tue, 22 May 2018 17:26:20 +0200 Subject: [PATCH] Config updates (hidpi adjustments, tweaks) --- .Xresources | 2 +- .config/i3/config | 10 ++++---- .config/redshift.conf | 4 ++-- .config/termite/config | 2 +- .i3blocks.conf | 10 ++++++++ .spacemacs | 53 +++++++++++++++++++++++++++++++++++++----- .zshrc | 2 +- 7 files changed, 67 insertions(+), 16 deletions(-) diff --git a/.Xresources b/.Xresources index b1f4169..9960eee 100644 --- a/.Xresources +++ b/.Xresources @@ -1,5 +1,5 @@ !!! Scaling, fonts !!! -Xft.dpi: 166 +Xft.dpi: 210 Xft.autohint: 1 Xft.lcdfilter: lcddefault Xft.hintstyle: hintfull diff --git a/.config/i3/config b/.config/i3/config index cdc8b3b..03d0ac4 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -12,7 +12,7 @@ set $mod Mod4 # DPI scaling -exec xrandr --dpi 166 +exec xrandr --dpi 210 # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. @@ -20,7 +20,7 @@ exec xrandr --dpi 166 #font pango:Fira Code 10 #font pango:Cantarell 10 #font pango:Fira Mono, Icons 9 -font pango:Iosevka Medium 10 +font pango:Iosevka Medium 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). @@ -210,10 +210,10 @@ bar { inactive_workspace #232323 #232323 #888888 } #font pango:Fira Mono, Icons 10 - font pango:FontAwesome Regular 11, Iosevka Medium 11 + font pango:FontAwesome Regular 9, Iosevka Medium 9 strip_workspace_numbers yes height 44 - tray_padding 2 + tray_padding 1 } # Colors @@ -258,7 +258,7 @@ exec_always "setxkbmap -layout us,si -option 'grp:win_space_toggle'" exec_always "setxkbmap -option compose:caps" # gaps between windows -gaps inner 13 +gaps inner 9 gaps outer 0 smart_gaps on #smart_borders on diff --git a/.config/redshift.conf b/.config/redshift.conf index 5415b4b..632393d 100644 --- a/.config/redshift.conf +++ b/.config/redshift.conf @@ -21,8 +21,8 @@ transition=1 ;gamma=0.8:0.7:0.8 ; This can also be set individually for day and night since ; version 1.10. -gamma-day=0.8:0.7:0.8 -gamma-night=0.6 +gamma-day=0.9:0.8:0.9 +gamma-night=0.7 ; Set the location-provider: 'geoclue2' or 'manual' ; type 'redshift -l list' to see possible values. diff --git a/.config/termite/config b/.config/termite/config index a8f5030..72f41be 100644 --- a/.config/termite/config +++ b/.config/termite/config @@ -1,5 +1,5 @@ [options] -font = Fira Mono Medium 10 +font = Fira Mono Medium 9 [colors] #!!############################################## diff --git a/.i3blocks.conf b/.i3blocks.conf index ad4ff02..427d337 100644 --- a/.i3blocks.conf +++ b/.i3blocks.conf @@ -34,6 +34,11 @@ separator_block_width=15 #interval=5 #signal=10 +[monitors] +#label= +interval=once +command="/home/g1smo/Sredstva/i3blocks-contrib/monitor_manager/monitor_manager" + [brightness] label= color=#F8FF05 @@ -109,6 +114,11 @@ label= color=#70E2FF interval=3 +[key_layout] +label= +interval=30 +command="/home/h1smo/Sredstva/i3blocks-contrib/key_layout/key_layout" + [battery2] #label=BAT #label=⚡ diff --git a/.spacemacs b/.spacemacs index 2b98002..2658d59 100644 --- a/.spacemacs +++ b/.spacemacs @@ -65,7 +65,13 @@ This function should only modify configuration layer settings." ;; Disable flychecker (syntax-checking :variables syntax-checking-enable-by-default nil) - ) + + ;; Markdown preview + (markdown :variables markdown-live-preview-engine 'vmd) + + ;; Disable tern port files + (javascript :variables javascript-disable-tern-port-files t) + ) ;; List of additional packages that will be installed without being ;; wrapped in a layer. If you need some configuration for these @@ -109,6 +115,25 @@ It should only modify the values of Spacemacs settings." ;; This setq-default sexp is an exhaustive list of all the supported ;; spacemacs settings. (setq-default + ;; If non-nil then enable support for the portable dumper. You'll need + ;; to compile Emacs 27 from source following the instructions in file + ;; EXPERIMENTAL.org at to root of the git repository. + ;; (default nil) + dotspacemacs-enable-emacs-pdumper nil + + ;; File path pointing to emacs 27.1 executable compiled with support + ;; for the portable dumper (this is currently the branch pdumper). + ;; (default "emacs") + dotspacemacs-emacs-pdumper-executable-file "emacs" + + ;; Name of the Spacemacs dump file. This is the file will be created by the + ;; portable dumper in the cache directory under dumps sub-directory. + ;; To load it when starting Emacs add the parameter `--dump-file' + ;; when invoking Emacs 27.1 executable on the command line, for instance: + ;; ./emacs --dump-file=~/.emacs.d/.cache/dumps/spacemacs.pdmp + ;; (default spacemacs.pdmp) + dotspacemacs-emacs-dumper-dump-file "spacemacs.pdmp" + ;; If non-nil ELPA repositories are contacted via HTTPS whenever it's ;; possible. Set it to nil if you have no way to use HTTPS in your ;; environment, otherwise it is strongly recommended to let it set to t. @@ -129,7 +154,7 @@ It should only modify the values of Spacemacs settings." ;; If non-nil then Spacelpa repository is the primary source to install ;; a locked version of packages. If nil then Spacemacs will install the - ;; lastest version of packages from MELPA. (default nil) + ;; latest version of packages from MELPA. (default nil) dotspacemacs-use-spacelpa nil ;; If non-nil then verify the signature for downloaded Spacelpa archives. @@ -164,7 +189,7 @@ It should only modify the values of Spacemacs settings." ;; directory. A string value must be a path to an image format supported ;; by your Emacs build. ;; If the value is nil then no banner is displayed. (default 'official) - dotspacemacs-startup-banner 'official + dotspacemacs-startup-banner 'random ;; List of items to show in startup buffer or an association list of ;; the form `(list-type . list-size)`. If nil then it is disabled. @@ -409,6 +434,10 @@ It should only modify the values of Spacemacs settings." ;; emphasis the current one). (default 'all) dotspacemacs-highlight-delimiters 'all + ;; If non-nil, start an Emacs server if one is not already running. + ;; (default nil) + dotspacemacs-enable-server nil + ;; If non-nil, advise quit functions to keep server open when quitting. ;; (default nil) dotspacemacs-persistent-server nil @@ -450,7 +479,8 @@ It should only modify the values of Spacemacs settings." ;; Either nil or a number of seconds. If non-nil zone out after the specified ;; number of seconds. (default nil) - dotspacemacs-zone-out-when-idle 210 + ;;dotspacemacs-zone-out-when-idle 210 + dotspacemacs-zone-out-when-idle nil ;; Run `spacemacs/prettify-org-buffer' when ;; visiting README.org files of Spacemacs. @@ -465,6 +495,13 @@ It is mostly for variables that should be set before packages are loaded. If you are unsure, try setting them in `dotspacemacs/user-config' first." ) +(defun dotspacemacs/user-load () + "Library to load while dumping. +This function is called while dumping Spacemacs configuration. You can +`require' or `load' the libraries of your choice that will be included +in the dump." + ) + (defun dotspacemacs/user-config () "Configuration for user code: This function is called at the very end of Spacemacs startup, after layer @@ -512,7 +549,7 @@ before packages are loaded." `((".*" ,temporary-file-directory t))) ;; Orgmode line wrap - (setq org-startup-truncated t) + ;;(setq org-startup-truncated t) ;; Use react mode instead of js2 mode ;;(add-to-list 'auto-mode-alist '("\\.js$" . react-mode)) @@ -534,6 +571,10 @@ before packages are loaded." ;; Web mode indent level (setq web-mode-markup-indent-offset 4) (setq sgml-basic-offset 4) + + ;; Word wrap orgmode + (add-hook 'org-mode-hook #'(lambda () + (visual-line-mode))) ) (defun dotspacemacs/emacs-custom-settings () @@ -548,7 +589,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 - (auctex smartparens helm helm-core multiple-cursors ghub spaceline ivy evil zenburn-theme yasnippet-snippets yapfify ws-butler winum which-key wgrep web-mode web-beautify volatile-highlights vi-tilde-fringe uuidgen use-package undo-tree toc-org tao-theme tagedit symon suscolors-theme string-inflection spaceline-all-the-icons solarized-theme smex smeargle slim-mode scss-mode sayid sass-mode rvm rudel ruby-tools ruby-test-mode ruby-refactor ruby-hash-syntax rubocop rspec-mode robe rjsx-mode restart-emacs request rbenv rake rainbow-delimiters pyvenv pytest pyenv-mode py-isort pug-mode powerline popwin pippel pipenv pip-requirements phpunit phpcbf php-extras php-auto-yasnippets persp-mode password-generator paradox overseer orgit org-projectile org-present org-pomodoro org-mime org-download org-bullets org-brain open-junk-file neotree nameless move-text mmm-mode minitest markdown-toc magit-gitflow macrostep lorem-ipsum livid-mode live-py-mode linum-relative link-hint less-css-mode json-mode js2-refactor js-doc ivy-xref ivy-purpose ivy-hydra indent-guide importmagic impatient-mode hy-mode hungry-delete hl-todo highlight-parentheses highlight-numbers highlight-indentation helm-make gruvbox-theme goto-chg google-translate golden-ratio gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md geiser fuzzy font-lock+ 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 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 centered-cursor-mode bundler browse-at-remote auto-yasnippet auto-highlight-symbol auto-compile auctex-latexmk all-the-icons-dired aggressive-indent adaptive-wrap ace-window ace-link ac-ispell)))) + (string-inflection phpcbf link-hint importmagic hl-todo anaconda-mode helm magit cider zenburn-theme yasnippet-snippets yapfify ws-butler winum which-key wgrep web-mode web-beautify volatile-highlights vmd-mode vi-tilde-fringe uuidgen use-package toc-org tao-theme tagedit symon suscolors-theme spaceline-all-the-icons solarized-theme smex smeargle slim-mode scss-mode sayid sass-mode rvm rudel ruby-tools ruby-test-mode ruby-refactor ruby-hash-syntax rubocop rspec-mode robe rjsx-mode restart-emacs request rbenv rake rainbow-delimiters queue pyvenv pytest pyenv-mode py-isort pug-mode popwin pippel pipenv pip-requirements phpunit php-extras php-auto-yasnippets persp-mode password-generator paradox overseer orgit org-projectile org-present org-pomodoro org-mime org-download org-bullets org-brain open-junk-file neotree nameless move-text mmm-mode minitest markdown-toc magit-gitflow macrostep lorem-ipsum livid-mode live-py-mode linum-relative less-css-mode json-navigator json-mode js2-refactor js-doc ivy-xref ivy-purpose ivy-hydra indent-guide impatient-mode hungry-delete highlight-parentheses highlight-numbers highlight-indentation helm-make helm-core 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 font-lock+ 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 epc emmet-mode elisp-slime-nav editorconfig dumb-jump drupal-mode diminish diff-hl define-word dakrone-light-theme cython-mode counsel-projectile counsel-css company-web company-tern company-statistics company-php company-auctex company-anaconda column-enforce-mode clojure-snippets clojure-cheatsheet clj-refactor clean-aindent-mode cider-eval-sexp-fu chruby centered-cursor-mode bundler browse-at-remote auto-yasnippet auto-highlight-symbol auto-compile auctex-latexmk all-the-icons-dired aggressive-indent adaptive-wrap ace-window ace-link 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 538d4f3..4ae13dd 100644 --- a/.zshrc +++ b/.zshrc @@ -55,7 +55,7 @@ alias ffon="sudo cp /etc/resolv.conf.ff /etc/resolv.conf" alias gitclean="git fetch -p && for branch in \$(git branch -vv | grep ': gone]' | gawk '{print \$1}'); do git branch -D \$branch; echo 'deleted \$branch'; done" #alias llc="sshfs 10.0.0.203:/Users/g1smo/Projects/LickList ~/ll -oauto_cache,reconnect,no_readahead -o Ciphers=arcfour -o Compression=no" alias llc="sudo mount -t nfs -o noacl,nocto,rsize=32768,wsize=32768,noatime,nodiratime 10.0.0.203:/Users/g1smo/Projects/LickList ~/ll" -alias llcc="sudo mount -t nfs -o noacl,nocto,rsize=32768,wsize=32768,noatime,nodiratime 192.168.8.103:/Users/g1smo/Projects/LickList ~/ll" +alias llcc="sudo mount -t nfs -o noacl,nocto,rsize=32768,wsize=32768,noatime,nodiratime 192.168.8.106:/Users/g1smo/Projects/LickList ~/ll" alias lld="sudo umount -l ~/ll" alias sctl="systemctl"