Minor i3, major i3blocks update, better layout switch

master
Jure Podgoršek 2018-09-23 16:22:22 +02:00
parent cc7d6b2d39
commit 9cd08aeef7
7 changed files with 44 additions and 25 deletions

View File

@ -1,5 +1,5 @@
!!! Scaling, fonts !!!
Xft.dpi: 210
Xft.dpi: 190
Xft.autohint: 1
Xft.lcdfilter: lcddefault
Xft.hintstyle: hintfull

View File

@ -12,7 +12,7 @@
set $mod Mod4
# DPI scaling
exec xrandr --dpi 210
exec xrandr --dpi 190
# Font for window titles. Will also be used by the bar unless a different font
# is used in the bar {} block below.
@ -189,6 +189,7 @@ bindsym $mod+r mode "resize"
# External monitor
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+o exec xrandr --output DP1 --scale 1.25x1.25 --panning 2400x1350+2560+0 --fb 4960x1440 --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
@ -252,11 +253,8 @@ exec --no-startup-id $set_bg &
# Network manager applet
exec nm-applet &
# Keyboard layout
exec_always "setxkbmap -layout us,si -option 'grp:win_space_toggle'"
# Caps lock as compose key!
exec_always "setxkbmap -option compose:caps"
# Keyboard layout, caps lock as compose key
exec_always --no-startup-id "setxkbmap -layout us,si -option grp:alt_shift_toggle -option compose:caps"
# gaps between windows
gaps inner 9
@ -322,3 +320,6 @@ bindsym Mod1+Shift+y exec playerctl play-pause
# Skrinšot
bindsym 0xff61 exec gnome-screenshot -i
# Keyring related
exec --no-startup-id /usr/share/gnome-settings-daemon

View File

@ -1,5 +1,5 @@
[options]
font = Fira Mono Medium 10
font = Fira Mono Medium 9
[colors]
#!!##############################################

View File

@ -34,28 +34,30 @@ separator_block_width=15
#interval=5
#signal=10
[monitors]
#[monitors]
#label=
interval=once
command="/home/g1smo/Sredstva/i3blocks-contrib/monitor_manager/monitor_manager"
#interval=once
#command="/home/g1smo/Sredstva/i3blocks-contrib/monitor_manager/monitor_manager"
[brightness]
label=
color=#F8FF05
command=xbacklight -get | sed -r 's/\..+$/%/'
command=echo -n "$label ";xbacklight -get | sed -r 's/\..+$/%/'
interval=once
signal=5
[volume]
command=/home/g1smo/Sredstva/i3blocks-contrib/volume-pulseaudio/volume-pulseaudio -S -F 3
[volume-pulseaudio]
command=/home/g1smo/Sredstva/i3blocks-contrib/volume-pulseaudio/volume-pulseaudio
#label=
SUBSCRIBE=1
LONG_FORMAT="$SYMB$VOL%"
interval=persist
[memory]
#label=MEM
label=
color=#A85FFF
command=/home/g1smo/Sredstva/i3blocks-contrib/memory/memory | sed -r 's/ \(.+//'
command=echo -n "$label ";/home/g1smo/Sredstva/i3blocks-contrib/memory/memory | sed -r 's/ \(.+//'
interval=10
#[memory]
@ -73,6 +75,7 @@ interval=10
#label=HOME
label=
color=#AAAAAA
command=echo -n "$label ";/home/g1smo/Sredstva/i3blocks-contrib/disk/disk
#instance=/mnt/data
interval=30
@ -83,12 +86,14 @@ interval=30
color=#33DD00
interval=10
separator=false
command=/home/g1smo/Sredstva/i3blocks-contrib/iface/iface
[wifi]
instance=wlp4s0
interval=10
label=
color=#11DD00
command=echo -n "$label ";/home/g1smo/Sredstva/i3blocks-contrib/wifi/wifi
#separator=false
#[bandwidth]
@ -102,23 +107,30 @@ color=#11DD00
[cpu_usage]
#label=CPU
#label=
label=
command=/home/g1smo/Sredstva/i3blocks-contrib/cpu_usage/cpu_usage | sed -r 's/^([0-9])\./\ \1\./'
#label=
label=
#command=/home/g1smo/Sredstva/i3blocks-contrib/cpu_usage/cpu_usage | sed -r 's/^([0-9])\./\ \1\./'
command=echo -n "$label ";/home/g1smo/Sredstva/i3blocks-contrib/cpu_usage/cpu_usage -d 1
color=#FA0009
interval=1
min_width= 99.00%
align=right
min_width= 99.0%
[load_average]
#label=
#label=☭
label=
color=#70E2FF
interval=3
command=echo -n "$label ";/home/g1smo/Sredstva/i3blocks-contrib/load_average/load_average
[key_layout]
label=
label=
interval=5
#command="/home/h1smo/Sredstva/i3blocks-contrib/key_layout/key_layout"
command="xkb-switch"
command=echo -n "$label ";xkb-switch
#interval=persist
#command="/home/h1smo/Sredstva/i3blocks-contrib/kbdd_layout/kbdd_layout"
[battery2]
#label=BAT
@ -132,7 +144,7 @@ markup=pango
[date]
label=
color=#ffffff
command=date '+%a %d %b'
command=echo -n "$label ";date '+%a %d %b'
#command=/home/g1smo/Sredstva/i3blocks-contrib/rofi-calendar/rofi-calendar
interval=5
separator=false
@ -141,7 +153,7 @@ separator=false
#command=date '+%Y-%m-%d %H:%M:%S'
label=
color=#ffffff
command=date '+%H:%M'
command=echo -n "$label ";date '+%H:%M'
interval=5
[shutdown]

View File

@ -452,7 +452,7 @@ It should only modify the values of Spacemacs settings."
;; List of search tool executable names. Spacemacs uses the first installed
;; tool of the list. Supported tools are `rg', `ag', `pt', `ack' and `grep'.
;; (default '("rg" "ag" "pt" "ack" "grep"))
dotspacemacs-search-tools '("ag" "rg" "pt" "ack" "grep")
dotspacemacs-search-tools '("rg" "ag" "pt" "ack" "grep")
;; Format specification for setting the frame title.
;; %a - the `abbreviated-file-name', or `buffer-name'
@ -599,7 +599,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
(counsel-projectile counsel json-mode smartparens magit cider ivy zenburn-theme yasnippet-snippets yapfify yaml-mode ws-butler winum which-key wgrep web-mode web-beautify vue-mode volatile-highlights vmd-mode vi-tilde-fringe uuidgen use-package toc-org tao-theme tagedit symon swiper suscolors-theme string-inflection sql-indent spaceline-all-the-icons solarized-theme smex smeargle slim-mode sesman 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 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 ob-restclient ob-http nginx-mode neotree nameless move-text minitest markdown-toc magit-svn magit-gitflow macrostep lorem-ipsum livid-mode live-py-mode link-hint json-snatcher json-reformat json-navigator js2-refactor js-doc ivy-yasnippet ivy-xref ivy-purpose ivy-hydra indent-guide importmagic impatient-mode hungry-delete hl-todo highlight-parentheses highlight-numbers highlight-indentation helm-make guix gruvbox-theme google-translate golden-ratio gnuplot gitignore-templates gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ ghub gh-md fuzzy font-lock+ flycheck-pos-tip flx-ido floobits fill-column-indicator fancy-battery eyebrowse extempore-mode expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround 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-goggles evil-exchange evil-escape evil-cleverparens evil-args evil-anzu emmet-mode elisp-slime-nav editorconfig dumb-jump drupal-mode dotenv-mode dockerfile-mode docker diminish diff-hl define-word dakrone-light-theme cython-mode counsel-css company-web company-tern company-statistics company-restclient 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 ace-window ace-link ac-ispell))))
(doom-modeline cider ac-php-core iedit htmlize magit ivy org-plus-contrib hydra zenburn-theme yasnippet-snippets yapfify yaml-mode xcscope ws-butler winum which-key wgrep web-mode web-beautify vue-mode volatile-highlights vmd-mode vi-tilde-fringe uuidgen use-package toc-org tao-theme tagedit symon suscolors-theme string-inflection sql-indent spaceline-all-the-icons solarized-theme smex smeargle slim-mode shrink-path sesman seeing-is-believing scss-mode 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 prettier-js 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 ob-restclient ob-http nginx-mode neotree nameless move-text minitest markdown-toc magit-svn magit-gitflow macrostep lorem-ipsum livid-mode live-py-mode link-hint json-navigator js2-refactor js-doc ivy-yasnippet ivy-xref ivy-purpose ivy-hydra indent-guide importmagic impatient-mode hungry-delete hl-todo highlight-parentheses highlight-numbers highlight-indentation helm-make guix gruvbox-theme google-translate golden-ratio gnuplot gitignore-templates gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ ghub gh-md fuzzy font-lock+ flycheck-pos-tip flx-ido floobits fill-column-indicator fancy-battery eyebrowse extempore-mode expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround 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-goggles evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu emmet-mode elisp-slime-nav eldoc-eval editorconfig dumb-jump drupal-mode dotenv-mode dockerfile-mode docker diminish diff-hl define-word dakrone-light-theme cython-mode counsel-projectile counsel-css company-web company-tern company-statistics company-restclient 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 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.

View File

@ -25,3 +25,6 @@ if [ "$TERM" = "linux" ]; then
fi
export XDG_CONFIG_HOME="$HOME/.config"
#export GDK_SCALE=2
export GDK_DPI_SCALE=0.8
export GUIX_GITHUB_TOKEN="22b00f8346ae4c2f4795cc6c6b346516bb43a619"

5
.zshrc
View File

@ -17,7 +17,7 @@ autoload colors zsh/terminfo
colors
# PATH additions
export GOPATH=~/Sredstva/go
export PATH="/home/g1smo/bin:$PATH:/home/g1smo/.gem/ruby/2.4.0/bin:$GOPATH/bin"
export PATH="/home/g1smo/bin:$PATH:/home/g1smo/.gem/ruby/2.5.0/bin:$GOPATH/bin"
# Default term (i3)
export TERMINAL="termite"
@ -93,6 +93,9 @@ alias mp3len="for i in \$(ls *.mp3); do echo \$i; soxi -d \$i; done"
# Hiter ping za net preverit
alias pg="ping 8.8.8.8"
# Najvecji fajli
alias najvecji="find . -printf '%s %p\n'| sort -nr | head -30"
# PhantomJS binary location
export PHANTOMJS_BIN=/usr/bin/phantomjs