From 976289661ef219f01b540b1f4cde8f8daebdb51f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jure=20Podgor=C5=A1ek?= Date: Wed, 24 Jan 2018 16:03:09 +0100 Subject: [PATCH] Various updates --- .Xresources | 77 +++++++++++++++++++++++++++++++++++++++++--- .config/compton.conf | 3 ++ .config/i3/config | 34 ++++++++++++------- .spacemacs | 43 ++++++++----------------- .zshrc | 1 + 5 files changed, 114 insertions(+), 44 deletions(-) diff --git a/.Xresources b/.Xresources index 03031d9..b24ccbf 100644 --- a/.Xresources +++ b/.Xresources @@ -1,10 +1,79 @@ +!!! Scaling, fonts !!! Xft.dpi: 166 -#Xft.dpi: 210 +!Xft.dpi: 210 Xft.autohint: 1 Xft.lcdfilter: lcddefault -#Xft.hintstyle: hintfull -Xft.hintstyle: hintslight +Xft.hintstyle: hintfull +!Xft.hintstyle: hintslight Xft.hinting: 1 Xft.antialias: 1 Xft.rgba: rgb -Xft.embolden: true +!Xft.embolden: true + +!!! Solarized color theme !!! +#define S_yellow #b58900 +#define S_orange #cb4b16 +#define S_red #dc322f +#define S_magenta #d33682 +#define S_violet #6c71c4 +#define S_blue #268bd2 +#define S_cyan #2aa198 +#define S_green #859900 + +#define S_base03 #002b36 +#define S_base02 #073642 +#define S_base01 #586e75 +#define S_base00 #657b83 +#define S_base0 #839496 +#define S_base1 #93a1a1 +#define S_base2 #eee8d5 +#define S_base3 #fdf6e3 + +*background: S_base03 +*foreground: S_base0 +!*fading: 40 +!*fadeColor: S_base03 +*cursorColor: S_base1 +*pointerColorBackground: S_base01 +*pointerColorForeground: S_base1 + +*color0: S_base02 +*color1: S_red +*color2: S_green +*color3: S_yellow +*color4: S_blue +*color5: S_magenta +*color6: S_cyan +*color7: S_base2 +*color9: S_orange +*color8: S_base03 +*color10: S_base01 +*color11: S_base00 +*color12: S_base0 +*color13: S_violet +*color14: S_base1 +*color15: S_base3 + +!!! Urxvt options !!! +! font +URxvt*font: xft:Fira Mono Medium:size=10 +URxvt*letterSpace: -1 +! hide scrollbar +URxvt*scrollBar: false +! do not scroll with output +URxvt*scrollTtyOutput: false +! scroll in relation to buffer (with mouse scroll or Shift+Page Up) +URxvt*scrollWithBuffer: true +! scroll back to the bottom on keypress +URxvt*scrollTtyKeypress: true +! secondary screen scrolling +URxvt*secondaryScreen: 1 +URxvt*secondaryScroll: 0 +URxvt*secondaryWheel: 1 +! open URLs +URxvt*perl-ext-common: default,matcher +URxvt*url-launcher: /usr/bin/xdg-open +URxvt*matcher.button: 1 +! transparency +URxvt*depth: 32 +URxvt*background: [85]S_base03 diff --git a/.config/compton.conf b/.config/compton.conf index 8cc1db4..7b7643f 100644 --- a/.config/compton.conf +++ b/.config/compton.conf @@ -22,3 +22,6 @@ shadow-offset-x = -3; shadow-offset-y = -3; shadow-opacity = 0.4; no-dock-shadow = true; + +# Flicker fix +unredir-if-possible = false; diff --git a/.config/i3/config b/.config/i3/config index 95baa0d..bae60ed 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -186,10 +186,11 @@ mode "resize" { bindsym $mod+r mode "resize" # External monitor -bindsym $mod+o exec "killall compton && xrandr --output DP1 --auto --right-of eDP1 && $set_bg && compton -b" -bindsym $mod+shift+o exec "xrandr --output DP1 off" -bindsym $mod+p exec "killall compton && xrandr --output HDMI2 --auto --right-of eDP1 && $set_bg && compton -b" -bindsym $mod+shift+p exec "xrandr --output HDMI2 --off" +set $restart_compton (killall compton && compton -b) || compton -b +bindsym $mod+o exec xrandr --output DP1 --auto --right-of eDP1 && $set_bg && $restart_compton +bindsym $mod+Shift+o exec xrandr --output DP1 --off && $restart_compton +bindsym $mod+p exec xrandr --output HDMI2 --auto --right-of eDP1 && $set_bg && $restart_compton +bindsym $mod+Shift+p exec xrandr --output HDMI2 --off && $restart_compton # Lock screen bindsym $mod+shift+b exec i3lock-wrapper @@ -226,11 +227,13 @@ client.focused #222222 #222222 #AAAAAA #B6B6B6 #555555 # Touchpad tap to click #exec --no-startup-id xinput set-prop 14 292 1 #exec --no-startup-id xinput set-prop 13 280 1 -exec --no-startup-id xinput set-prop 12 296 1 +exec --no-startup-id xinput set-prop 11 278 1 +#exec --no-startup-id xinput set-prop 12 296 1 # Touchpad natural scrolling #exec --no-startup-id xinput set-prop 14 280 1 #exec --no-startup-id xinput set-prop 13 290 1 -exec --no-startup-id xinput set-prop 12 278 1 +exec --no-startup-id xinput set-prop 11 286 1 +#exec --no-startup-id xinput set-prop 12 278 1 # Autolock exec --no-startup-id xautolock -time 10 -locker 'i3lock-wrapper' & @@ -249,7 +252,7 @@ exec --no-startup-id $set_bg & exec nm-applet & # Keyboard layout -#exec_always "setxkbmap -layout us,si -option 'grp:alt_shift_toggle'" +exec_always "setxkbmap -layout us,si -option 'grp:win_space_toggle'" # gaps between windows gaps inner 13 @@ -262,8 +265,9 @@ for_window [class="^.*"] border pixel 1 # No titles # Various app shortcuts # ######################### -# Small (non-scaled) chrome -bindsym $mod+shift+w exec chromium --force-device-scale-factor=1 +# Firefox +bindsym $mod+shift+w exec firefox +bindsym Mod1+shift+w exec chromium --force-device-scale-factor=1 # Increase volume set $vol_sig_cmd pkill -RTMIN+10 i3blocks @@ -279,8 +283,7 @@ bindsym XF86AudioLowerVolume exec "$vol_down_cmd && $vol_sig_cmd" bindsym XF86AudioMute exec "pamixer -t && $vol_sig_cmd" # start a terminal -#bindsym $mod+Return exec i3-sensible-terminal -bindsym $mod+Return exec gnome-terminal +bindsym $mod+Return exec i3-sensible-terminal # kill focused window bindsym $mod+Shift+q kill @@ -295,3 +298,12 @@ bindsym $mod+d exec --no-startup-id "rofi -combi-modi window,drun -show combi -m set $brt_sig_cmd pkill -RTMIN+5 i3blocks bindsym XF86MonBrightnessUp exec "xbacklight -inc 10 && $brt_sig_cmd" bindsym XF86MonBrightnessDown exec "xbacklight -dec 10 && $brt_sig_cmd" + +# File manager +bindsym Mod1+Shift+q exec nautilus + +# Emacs! +bindsym $mod+Shift+a exec emacs + +# Radio študent +bindsym Mod1+Shift+r exec lollypop /home/g1smo/Music/radiostudent.m3u diff --git a/.spacemacs b/.spacemacs index b4a4f29..9ffc6fa 100644 --- a/.spacemacs +++ b/.spacemacs @@ -55,7 +55,7 @@ This function should only modify configuration layer settings." php ;;vimscript clojure - sql + ;;sql ;;rust python ;;ruby @@ -63,7 +63,7 @@ This function should only modify configuration layer settings." scheme latex ;;games - react + ;;react ;;(treemacs ;; :variables @@ -90,7 +90,7 @@ This function should only modify configuration layer settings." dakrone-light-theme tao-theme gruvbox-theme - ) + rjsx-mode) ;; A list of packages that cannot be updated. dotspacemacs-frozen-packages '() ;; A list of packages that will not be installed and loaded. @@ -195,7 +195,7 @@ It should only modify the values of Spacemacs settings." ;;"Fira Mono Medium" "Iosevka Medium" ;;:size 18 - :size 24 + :size 25 :weight semibold ;;:weight normal :style medium @@ -460,31 +460,16 @@ you should place your code here." (setq org-startup-truncated t) ;; Use react mode instead of js2 mode - (add-to-list 'auto-mode-alist '("\\.js$" . react-mode)) + ;;(add-to-list 'auto-mode-alist '("\\.js$" . react-mode)) + (add-to-list 'auto-mode-alist '("\\.js$" . rjsx-mode)) - ;; All the icons modeline separator - ;;(setq spaceline-all-the-icons-separator-type 'arrow) + ;; Auto completion settings + (setq auto-completion-return-key-behavior nil) + + ;; js2: make ; optional (react) + (setq js2-strict-missing-semi-warning nil) + + ;; js2 default indent level + (setq js2-indent-level 4) ) -;; Do not write anything past this comment. This is where Emacs will -;; auto-generate custom variable definitions. -(defun dotspacemacs/emacs-custom-settings () - "Emacs custom settings. -This is an auto-generated function, do not modify its content directly, use -Emacs customize menu instead. -This function is called at the very end of Spacemacs initialization." -(custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(package-selected-packages - (quote - (live-py-mode helm cider zenburn-theme yasnippet-snippets yapfify yaml-mode 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 suscolors-theme sudoku sublimity string-inflection sql-indent spaceline-all-the-icons 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 org-brain 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-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 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+ 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 auto-compile 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. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - ) -) diff --git a/.zshrc b/.zshrc index 6b6d84d..42be6f0 100644 --- a/.zshrc +++ b/.zshrc @@ -51,6 +51,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.102:/Users/g1smo/Projects/LickList ~/ll" alias lld="sudo umount -l ~/ll" # Firefox scaling!