Minor changes

Merge branch 'master' of github.com:balkian/dotfiles
Batch of changes
2020-04-15 17:27:00 +02:00 · 2020-04-15 17:24:42 +02:00 · 2020-04-15 17:19:21 +02:00 · 2020-04-13 15:35:39 +02:00 · 2020-04-13 15:35:15 +02:00 · 2019-06-21 11:55:36 +02:00
32 changed files with 252 additions and 314 deletions
--- a/Xsession/.Xresources
+++ b/Xsession/.Xresources
@@ -2,7 +2,7 @@
 ! Xft settings
 !-------------------------------------------------------------------------------
 
-Xft.dpi:                    140
+Xft.dpi:                    96
 Xft.antialias:              true
 Xft.rgba:                   none
 Xft.hinting:                true
@@ -305,4 +305,4 @@ rofi.color-window: #273238, #273238, #1e2529
 rofi.color-normal: #273238, #c1c1c1, #273238, #394249, #ffffff
 rofi.color-active: #273238, #80cbc4, #273238, #394249, #80cbc4
 rofi.color-urgent: #273238, #ff1844, #273238, #394249, #ff1844
-rofi.ssh-command:          {terminal} -e "{ssh-client} {host}"
+rofi.ssh-command:          {terminal} -e "{ssh-client} {host}"
--- a/Xsession/.profile
+++ b/Xsession/.profile
@@ -25,6 +25,4 @@ if [ -f $HOME/.Xmodmap ]; then
    /usr/bin/xmodmap $HOME/.Xmodmap 2>/dev/null &
 fi

-if [ -f $HOME/.xsession ]; then
-   . $HOME/.xsession
-fi
+export PATH="$HOME/.cargo/bin:$PATH"
--- a/Xsession/.xsessionrc
+++ b/Xsession/.xsessionrc
@@ -1,12 +1,9 @@
-#!/bin/sh
-touch /tmp/LOG
-echo "loaded(xprofile)" $(date) >> /tmp/LOG
+# echo "pasado(xprofile)" $(date) >> /tmp/LOG
 setxkbmap "us,es" "altgr-intl," -option "ctrl:nocaps,grp:shift_toggle,terminate:ctrl_alt_bksp"
 #xmodmap ~/.Xmodmap
 #source ~/.xinitrc
 export XTERMINAL=termite
 export TERMINAL=termite
 export TERMCMD=termite
-export BROWSER=chromium-browser
-export MOZ_USE_XINPUT2=1
-
+export BROWSER2=chromium
+export BROWSER="firefox --ProfileManager"
--- a/compton/.compton.conf
+++ b/compton/.compton.conf
@@ -24,12 +24,12 @@ shadow-exclude = [
 # Opacity
 #mark-override-focused = true;
 #menu-opacity = 0.9;
-inactive-opacity = 0.95;
+# inactive-opacity = 0.95;
 # active-opacity = 0.8;
 # frame-opacity = 0.7;
 inactive-opacity-override = false;
 alpha-step = 0.06;
-inactive-dim = 0.2;
+inactive-dim = 0.4;
 #inactive-dim-fixed = false;
 # blur-background = true;
 # blur-background-frame = true;
@@ -43,7 +43,13 @@ blur-background-exclude = [
 ];
 # opacity-rule = [ "80:class_g = 'URxvt'" ];
 #
-opacity-rule = [ "99:_NET_WM_STATE@:32a = '_NET_WM_STATE_FULLSCREEN'" ];
+opacity-rule = [
+  "99:_NET_WM_STATE@[0]:32a = '_NET_WM_STATE_FULLSCREEN'",
+  "99:_NET_WM_STATE@[1]:32a = '_NET_WM_STATE_FULLSCREEN'",
+  "99:_NET_WM_STATE@[2]:32a = '_NET_WM_STATE_FULLSCREEN'",
+  "99:_NET_WM_STATE@[3]:32a = '_NET_WM_STATE_FULLSCREEN'",
+  "99:_NET_WM_STATE@[4]:32a = '_NET_WM_STATE_FULLSCREEN'",
+];



@@ -68,11 +74,19 @@ vsync = "none";
 dbe = false;
 paint-on-overlay = true;
 # sw-opti = true;
-# unredir-if-possible = true;
+unredir-if-possible = true;
 # unredir-if-possible-delay = 5000;
 # unredir-if-possible-exclude = [ ];
 focus-exclude = [ "class_g = 'Cairo-clock'",
-    "class_g = 'Popcorn Time'" ];
+  "class_g = 'Popcorn Time'",
+    # "class_g = 'firefox'",
+    # prevents dimming fullscreen windows
+  "_NET_WM_STATE@[0]:32a = '_NET_WM_STATE_FULLSCREEN'",
+  "_NET_WM_STATE@[1]:32a = '_NET_WM_STATE_FULLSCREEN'",
+  "_NET_WM_STATE@[2]:32a = '_NET_WM_STATE_FULLSCREEN'",
+  "_NET_WM_STATE@[3]:32a = '_NET_WM_STATE_FULLSCREEN'",
+  "_NET_WM_STATE@[4]:32a = '_NET_WM_STATE_FULLSCREEN'",
+];
 detect-transient = true;
 detect-client-leader = false;
 invert-color-include = [ ];
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -13,15 +13,25 @@

 (setq quelpa-checkout-melpa-p nil)

-(unless (require 'quelpa nil t)
-  (with-temp-buffer
-    (url-insert-file-contents "https://raw.github.com/quelpa/quelpa/master/bootstrap.el")
-	    (eval-buffer)))
+(unless (package-installed-p 'quelpa)
+    (with-temp-buffer
+      (url-insert-file-contents "https://github.com/quelpa/quelpa/raw/master/quelpa.el")
+      (eval-buffer)
+      (quelpa-self-upgrade)))

-(quelpa 'use-package)
-                                        ;'(use-package
-                                        ;:fetcher github
-                                        ;:repo "quelpa/quelpa-use-package"))
+(require 'quelpa nil t)
+
+(unless (package-installed-p 'use-package)
+  (package-refresh-contents)
+  (package-install 'use-package))
+
+(eval-when-compile
+  (require 'use-package))
+
+;;(quelpa 'use-package)
+;;                                        ;'(use-package
+;;                                        ;:fetcher github
+;;                                        ;:repo "quelpa/quelpa-use-package"))
 (require 'use-package)
 (quelpa
 '(quelpa-use-package
--- a/emacs/.spacemacs
+++ b/emacs/.spacemacs
@@ -31,6 +31,7 @@ values."
   ;; List of configuration layers to load.
   dotspacemacs-configuration-layers
   '(
+     rust
     typescript
     (auto-completion :variables
                      auto-completion-return-key-behavior 'complete
@@ -158,6 +159,7 @@ values."
   ;; Press <SPC> T n to cycle to the next theme in the list (works great
   ;; with 2 themes variants, one dark and one light)
   dotspacemacs-themes '(
+                         monokai
                         leuven
                         spacemacs-dark
                         minimal-light
@@ -381,14 +383,20 @@ you should place your code here."
 '(beacon-color "#cc6666")
 '(custom-safe-themes
   (quote
-    ("c3d4af771cbe0501d5a865656802788a9a0ff9cf10a7df704ec8b8ef69017c68" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "190a9882bef28d7e944aa610aa68fe1ee34ecea6127239178c7ac848754992df" "3e335d794ed3030fefd0dbd7ff2d3555e29481fe4bbb0106ea11c660d6001767" "cc0dbb53a10215b696d391a90de635ba1699072745bf653b53774706999208e3" "ed317c0a3387be628a48c4bbdb316b4fa645a414838149069210b66dd521733f" "938d8c186c4cb9ec4a8d8bc159285e0d0f07bad46edf20aa469a89d0d2a586ea" "fa2b58bb98b62c3b8cf3b6f02f058ef7827a8e497125de0254f56e373abee088" "bffa9739ce0752a37d9b1eee78fc00ba159748f50dc328af4be661484848e476" default)))
+    ("cd4d1a0656fee24dc062b997f54d6f9b7da8f6dc8053ac858f15820f9a04a679" "a8245b7cc985a0610d71f9852e9f2767ad1b852c2bdea6f4aadc12cce9c4d6d0" "c3d4af771cbe0501d5a865656802788a9a0ff9cf10a7df704ec8b8ef69017c68" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "190a9882bef28d7e944aa610aa68fe1ee34ecea6127239178c7ac848754992df" "3e335d794ed3030fefd0dbd7ff2d3555e29481fe4bbb0106ea11c660d6001767" "cc0dbb53a10215b696d391a90de635ba1699072745bf653b53774706999208e3" "ed317c0a3387be628a48c4bbdb316b4fa645a414838149069210b66dd521733f" "938d8c186c4cb9ec4a8d8bc159285e0d0f07bad46edf20aa469a89d0d2a586ea" "fa2b58bb98b62c3b8cf3b6f02f058ef7827a8e497125de0254f56e373abee088" "bffa9739ce0752a37d9b1eee78fc00ba159748f50dc328af4be661484848e476" default)))
 '(evil-want-Y-yank-to-eol nil)
 '(fci-rule-color "#373b41" t)
 '(flycheck-color-mode-line-face-to-color (quote mode-line-buffer-id))
 '(frame-background-mode (quote dark))
+ '(org-file-apps
+   (quote
+    ((auto-mode . emacs)
+     ("\\.mm\\'" . default)
+     ("\\.x?html?\\'" . default)
+     ("\\.pdf\\'" . "/usr/bin/evince %s"))))
 '(package-selected-packages
   (quote
-    (tide typescript-mode org-projectile-helm dracula-theme darktooth-theme cyberpunk-theme color-theme-sanityinc-tomorrow sesman apropospriate-theme anti-zenburn-theme ghub helm-gitlab gitlab company-quickhelp ag white-sand-theme rebecca-theme org-mime exotica-theme inkpot-theme heroku-theme hemisu-theme hc-zenburn-theme gruvbox-theme gruber-darker-theme grandshell-theme gotham-theme gandalf-theme flatui-theme flatland-theme farmhouse-theme zenburn-theme zen-and-art-theme underwater-theme ujelly-theme twilight-theme twilight-bright-theme twilight-anti-bright-theme toxi-theme tao-theme tangotango-theme tango-plus-theme tango-2-theme sunny-day-theme sublime-themes subatomic256-theme subatomic-theme spacegray-theme soothe-theme solarized-theme soft-stone-theme soft-morning-theme soft-charcoal-theme smyx-theme seti-theme reverse-theme railscasts-theme purple-haze-theme professional-theme planet-theme phoenix-dark-pink-theme phoenix-dark-mono-theme organic-green-theme omtose-phellack-theme oldlace-theme occidental-theme obsidian-theme noctilux-theme naquadah-theme mustang-theme monokai-theme monochrome-theme molokai-theme moe-theme minimal-theme material-theme majapahit-theme madhat2r-theme lush-theme light-soap-theme jbeans-theme jazz-theme ir-black-theme clojure-snippets clj-refactor inflections edn paredit peg cider-eval-sexp-fu cider seq queue clojure-mode nginx-mode auctex-latexmk company-auctex auctex csv-mode web-beautify livid-mode skewer-mode simple-httpd json-mode json-snatcher json-reformat js2-refactor multiple-cursors js2-mode js-doc company-tern dash-functional tern coffee-mode yaml-mode helm-company helm-c-yasnippet fuzzy company-web web-completion-data company-statistics company-go company-anaconda company auto-yasnippet yasnippet ac-ispell auto-complete web-mode tagedit slim-mode scss-mode sass-mode pug-mode less-css-mode helm-css-scss haml-mode emmet-mode smeargle orgit magit-gitflow helm-gitignore gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link evil-magit magit magit-popup xterm-color shell-pop org-projectile org-category-capture org-present org-pomodoro alert log4e gntp org-download multi-term mmm-mode markdown-toc markdown-mode htmlize gnuplot git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-commit with-editor git-gutter gh-md flyspell-correct-helm flyspell-correct flycheck-pos-tip pos-tip flycheck eshell-z eshell-prompt-extras esh-help diff-hl auto-dictionary yapfify pyvenv pytest pyenv-mode py-isort pip-requirements live-py-mode hy-mode helm-pydoc cython-mode anaconda-mode pythonic go-guru go-eldoc go-mode ws-butler winum which-key volatile-highlights vi-tilde-fringe uuidgen use-package toc-org spaceline powerline restart-emacs request rainbow-delimiters popwin persp-mode pcre2el paradox spinner org-plus-contrib org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint info+ indent-guide hydra hungry-delete hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation hide-comnt help-fns+ helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile pkg-info epl helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido flx 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-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-ediff evil-args evil-anzu anzu evil goto-chg undo-tree eval-sexp-fu highlight elisp-slime-nav dumb-jump f s diminish define-word column-enforce-mode clean-aindent-mode bind-map bind-key auto-highlight-symbol auto-compile packed dash aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core popup async)))
+    (transient espresso-theme django-theme autothemer darkokai-theme darkmine-theme darkburn-theme dakrone-theme color-theme-sanityinc-solarized clues-theme lv parseedn parseclj a cherry-blossom-theme busybee-theme bubbleberry-theme birds-of-paradise-plus-theme badwolf-theme ample-zen-theme ample-theme alect-themes afternoon-theme toml-mode racer flycheck-rust cargo rust-mode tide typescript-mode org-projectile-helm dracula-theme darktooth-theme cyberpunk-theme color-theme-sanityinc-tomorrow sesman apropospriate-theme anti-zenburn-theme ghub helm-gitlab gitlab company-quickhelp ag white-sand-theme rebecca-theme org-mime exotica-theme inkpot-theme heroku-theme hemisu-theme hc-zenburn-theme gruvbox-theme gruber-darker-theme grandshell-theme gotham-theme gandalf-theme flatui-theme flatland-theme farmhouse-theme zenburn-theme zen-and-art-theme underwater-theme ujelly-theme twilight-theme twilight-bright-theme twilight-anti-bright-theme toxi-theme tao-theme tangotango-theme tango-plus-theme tango-2-theme sunny-day-theme sublime-themes subatomic256-theme subatomic-theme spacegray-theme soothe-theme solarized-theme soft-stone-theme soft-morning-theme soft-charcoal-theme smyx-theme seti-theme reverse-theme railscasts-theme purple-haze-theme professional-theme planet-theme phoenix-dark-pink-theme phoenix-dark-mono-theme organic-green-theme omtose-phellack-theme oldlace-theme occidental-theme obsidian-theme noctilux-theme naquadah-theme mustang-theme monokai-theme monochrome-theme molokai-theme moe-theme minimal-theme material-theme majapahit-theme madhat2r-theme lush-theme light-soap-theme jbeans-theme jazz-theme ir-black-theme clojure-snippets clj-refactor inflections edn paredit peg cider-eval-sexp-fu cider seq queue clojure-mode nginx-mode auctex-latexmk company-auctex auctex csv-mode web-beautify livid-mode skewer-mode simple-httpd json-mode json-snatcher json-reformat js2-refactor multiple-cursors js2-mode js-doc company-tern dash-functional tern coffee-mode yaml-mode helm-company helm-c-yasnippet fuzzy company-web web-completion-data company-statistics company-go company-anaconda company auto-yasnippet yasnippet ac-ispell auto-complete web-mode tagedit slim-mode scss-mode sass-mode pug-mode less-css-mode helm-css-scss haml-mode emmet-mode smeargle orgit magit-gitflow helm-gitignore gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link evil-magit magit magit-popup xterm-color shell-pop org-projectile org-category-capture org-present org-pomodoro alert log4e gntp org-download multi-term mmm-mode markdown-toc markdown-mode htmlize gnuplot git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-commit with-editor git-gutter gh-md flyspell-correct-helm flyspell-correct flycheck-pos-tip pos-tip flycheck eshell-z eshell-prompt-extras esh-help diff-hl auto-dictionary yapfify pyvenv pytest pyenv-mode py-isort pip-requirements live-py-mode hy-mode helm-pydoc cython-mode anaconda-mode pythonic go-guru go-eldoc go-mode ws-butler winum which-key volatile-highlights vi-tilde-fringe uuidgen use-package toc-org spaceline powerline restart-emacs request rainbow-delimiters popwin persp-mode pcre2el paradox spinner org-plus-contrib org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint info+ indent-guide hydra hungry-delete hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation hide-comnt help-fns+ helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile pkg-info epl helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido flx 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-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-ediff evil-args evil-anzu anzu evil goto-chg undo-tree eval-sexp-fu highlight elisp-slime-nav dumb-jump f s diminish define-word column-enforce-mode clean-aindent-mode bind-map bind-key auto-highlight-symbol auto-compile packed dash aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core popup async)))
 '(vc-annotate-background nil)
 '(vc-annotate-color-map
   (quote
@@ -416,4 +424,4 @@ you should place your code here."
 ;; 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.
- '(default ((t (:background nil)))))
+ )
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -23,7 +23,7 @@ floating_modifier $mod
 #bindsym $mod+Return exec --no-startup-id i3-one-tmux
 bindsym $mod+Return [title="^scratch"] scratchpad show
 bindsym Control+Mod1+t exec --no-startup-id i3-sensible-terminal
-bindsym Control+Mod1+Shift+t exec --no-startup-id i3-sensible-terminal --title=scratch -e 'tmux attach'
+bindsym Control+Mod1+Shift+t exec --no-startup-id i3-sensible-terminal --title=scratch -e 'tmux new-session -A -s scratch'

 # File manager
 bindsym Control+Mod1+f exec --no-startup-id i3-sensible-terminal --title=filemanager -e 'zsh -c ranger'
@@ -31,7 +31,7 @@ bindsym Control+Mod1+f exec --no-startup-id i3-sensible-terminal --title=fileman
 # start lock
 bindsym Control+Mod1+l exec --no-startup-id i3-exit.sh lock

-bindsym Control+Mod1+Shift+w exec --no-startup-id chromium || chromium-browser
+bindsym Control+Mod1+Shift+w exec --no-startup-id $BROWSER2
 bindsym Control+Mod1+w exec --no-startup-id $BROWSER
 bindsym Control+Mod1+v exec --no-startup-id pavucontrol
 bindsym Control+Mod1+g exec --no-startup-id gvim
@@ -43,6 +43,7 @@ bindsym $mod+period [instance="emacs" title="^(?!myagenda$)"] scratchpad show
 bindsym $mod+shift+comma exec --no-startup-id myemacs -nc --eval '(progn (find-file "~/Dropbox/Todo/org/rules.org") (org-agenda-list) (set-frame-name "myagenda"))'
 bindsym $mod+c exec myemacs -n -e '(make-capture-frame)' 
 bindsym $mod+comma [title="^myagenda"] scratchpad show
+bindsym $mod+Control+s exec --no-startup-id flameshot gui

 # Spotify
 bindsym XF86AudioPlay exec --no-startup-id playerctl play-pause
@@ -55,8 +56,8 @@ bindsym XF86AudioLowerVolume exec --no-startup-id volume-down.sh
 bindsym XF86AudioMute exec --no-startup-id volume-toggle-mute.sh

 # Brightness
-bindsym XF86MonBrightnessUp exec --no-startup-id brightnessctl set "5%+"
-bindsym XF86MonBrightnessDown exec --no-startup-id brightnessctl set "5%-"
+#bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight +5
+#bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -5

 # kill focused window
 bindsym $mod+q kill
@@ -145,6 +146,7 @@ bindsym $mod+d focus child

 # switch to workspace

+bindsym $mod+grave workspace 0: Personal
 bindsym $mod+1 workspace 1: Term
 bindsym $mod+2 workspace 2: Web
 bindsym $mod+3 workspace 3: Edit
@@ -159,6 +161,7 @@ bindsym $mod+Control+h workspace prev
 bindsym $mod+Control+l workspace next 

 # move focused container to workspace
+bindsym $mod+Shift+grave move container to workspace             0: Personal
 bindsym $mod+Shift+exclam move container to workspace            1: Term
 bindsym $mod+Shift+at move container to workspace                2: Web
 bindsym $mod+Shift+numbersign move container to workspace        3: Edit
@@ -230,29 +233,29 @@ bindsym $mod+n exec i3-input -F 'rename workspace to %s' -P 'New name: '
 #status_command i3status
 #}

-bar {
-    mode dock #hide
-    position bottom
-    font pango:DejaVu Sans 10
-    workspace_buttons yes
-    # status_command ~/.config/i3/status.sh
-    status_command i3blocks #i3status -c ~/.config/i3status/conf
-    colors {
-        background #101010
-        statusline #ffffff
-        focused_workspace #101010 #586e75 #fdf6e3
-        active_workspace #101010 #101010 #cb4b16
-        inactive_workspace #101010 #101010 #93a1a1
-        urgent_workspace #fdf6e3 #dc322f
-    }
-}
+# bar {
+#     mode dock
+#     position top
+#     font pango:DejaVu Sans 10
+#     workspace_buttons yes
+#     # status_command ~/.config/i3/status.sh
+#     status_command i3status -c ~/.config/i3status/conf
+#     colors {
+#         background #101010
+#         statusline #ffffff
+#         focused_workspace #101010 #586e75 #fdf6e3
+#         active_workspace #101010 #101010 #cb4b16
+#         inactive_workspace #101010 #101010 #93a1a1
+#         urgent_workspace #fdf6e3 #dc322f
+#     }
+# }
 # class                 border  backgr. text    indicator
-client.focused          #4c7899 #4c7899 fefef #93a1a1 #2e9ef4
+client.focused          #4c7899 #4c7899 #fefef #93a1a1 #2e9ef4
 client.focused_inactive #4c7899 #101010 #93a1a1 #484e50
 client.unfocused        #ffffff #101010 #93a1a1 #292d2e
 client.urgent           #2f343a #101010 #93a1a1 #900000

-default_border pixel 1
+default_border pixel 3
 # smart_borders on
 workspace_layout tabbed

@@ -287,18 +290,19 @@ assign [class="^Audacious$"] 6: Music
 assign [class="^Xchat$"] 7: Chat
 #for_window [class="Pcmanfm"] floating enable

-workspace "1: Term" output DP1
-workspace "2: Web" output DP1
-workspace "3: Edit" output DP1
-workspace "4: Viewer" output eDP1
-workspace "5: Files" output eDP1
-workspace "6: Music" output eDP1
-workspace "7: Chat" output eDP1
-workspace "8: Misc Big" output DP1
-workspace "9: Misc Small" output eDP1
+workspace "0: Personal" output DP-2
+workspace "1: Term" output DP-1
+workspace "2: Web" output DP-1
+workspace "3: Edit" output DP-1
+workspace "4: Viewer" output eDP-1
+workspace "5: Files" output eDP-1
+workspace "6: Music" output eDP-1
+workspace "7: Chat" output eDP-1
+workspace "8: Misc Big" output DP-1
+workspace "9: Misc Small" output eDP-1

-#gaps inner 8
-#gaps outer 5
+gaps inner 8
+gaps outer 5

 set $mode_system System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown
 mode "$mode_system" {
@@ -317,19 +321,18 @@ bindsym $mod+Delete mode "$mode_system"
 bindsym $mod+Escape exec xfce4-session-logout
 #exec --no-startup-id xautolock -corners '----' -time 10 -locker 'dm-tool lock' # lightdm
 #exec xautolock -time 10 -corners "----" -locker 'i3lock -t -c 000000 -i ~/Pictures/Wallpapers/Game\ Over\ Hacker.png' &
+exec --no-startup-id compton -b --config ~/.compton.conf 
+exec --no-startup-id dropbox start
 exec --no-startup-id i3-sensible-terminal --title=filemanager -e 'ranger'
 exec --no-startup-id nitrogen --restore
 exec --no-startup-id nm-applet
 exec --no-startup-id pasystray 
 exec --no-startup-id syndaemon -i 0.5 -d
-exec --no-startup-id i3-sensible-terminal --title=scratch -e 'tmux attach'
+exec --no-startup-id i3-sensible-terminal --title=scratch -e 'tmux new-session -A -s scratch'
 exec --no-startup-id i3-exit.sh autolock
+exec --no-startup-id xfce4-power-manager
 #exec --no-startup-id xfsettingsd --sm-client-disable &
-#exec --no-startup-id polybar.sh
-exec --no-startup-id autorotate.py
-exec --no-startup-id touchegg
-exec --no-startup-id parcellite 
+exec --no-startup-id clipit -n
 exec --no-startup-id owncloud
 exec --no-startup-id udiskie --no-notify --tray --use-udisks2  
-exec --no-startup-id xfce4-power-manager
-exec --no-startup-id compton -b --config ~/.compton.conf 
+exec --no-startup-id polybar.sh
--- a/i3/.config/i3/status.conf
+++ b/i3/.config/i3/status.conf
@@ -12,7 +12,6 @@ order += "path_exists VPN"
 order += "wireless wlan0"
 order += "ethernet eth0"
 order += "battery 0"
-order += "battery 1"
 # order += "cpu_temperature 0"
 order += "load"
 order += "tztime local"
@@ -40,17 +39,6 @@ battery 0 {
        low_threshold = 10
 }

-battery 1 {
-        format = "%status %percentage %remaining %emptytime"
-        format_down = "No battery"
-        status_chr = "⚡ CHR"
-        status_bat = "🔋 BAT"
-        status_unk = "? UNK"
-        status_full = "☻ FULL"
-        path = "/sys/class/power_supply/BAT1/uevent"
-        low_threshold = 10
-}
-
 run_watch DHCP {
        pidfile = "/var/run/dhclient*.pid"
 }
--- a/i3/.config/i3status/conf
+++ b/i3/.config/i3status/conf
@@ -6,20 +6,19 @@ general {
 order += "disk /"
 order += "disk /home"
 order += "path_exists VPN"
-order += "wireless _first_"
-order += "ethernet _first_"
+order += "wireless wlp2s0"
+order += "ethernet eth0"
 order += "battery 0"
-order += "battery 1"
 order += "cpu_temperature 0"
 order += "load"
 order += "tztime local"

-wireless _first_ {
+wireless wlp2s0 {
        format_up = "%essid %ip %quality %bitrate"
        format_down = "Wireless down"
 }

-ethernet _first_ {
+ethernet eth0 {
        # if you use %speed, i3status requires the cap_net_admin capability
        format_up = "E: %ip (%speed)           "
        format_down = "E: down"
@@ -27,18 +26,7 @@ ethernet _first_ {

 battery 0 {
        format = "%status %percentage %remaining %emptytime"
-        format_down = ""
-        status_chr = "⚡ CHR"
-        status_bat = "🔋 BAT"
-        status_unk = "? UNK"
-        status_chr = "⚡ FULL"
-        path = "/sys/class/power_supply/BAT%d/uevent"
-        low_threshold = 10
-}
-
-battery 1 {
-        format = "%status %percentage %remaining"
-        format_down = ""
+        format_down = "No battery"
        status_chr = "⚡ CHR"
        status_bat = "🔋 BAT"
        status_unk = "? UNK"
@@ -60,10 +48,10 @@ load {
        format = "%5min"
 }

-#cpu_temperature 0 {
-#        format = "T: %degrees °C"
-#        path = "/sys/devices/platform/coretemp.0/temp1_input"
-#}
+# cpu_temperature 0 {
+#         format = "T: %degrees °C"
+#         path = "/sys/devices/platform/coretemp.0/temp1_input"
+# }

 disk "/" {
        format = "%free / "
--- a/keep/.keep/commands.json
+++ b/keep/.keep/commands.json
@@ -0,0 +1 @@
+{"pandoc --filter pandoc-include-code -i index.md --metadata pagetitle=yourtitle -s --highlight-style=pygments -o index.docx": {"desc": "generate docx (Word, Office) from a markdown file with code highlighting", "alias": "md2doc"}}
--- a/keep/.keep/update_check.txt
+++ b/keep/.keep/update_check.txt
@@ -0,0 +1 @@
+06/21/2019
--- a/not_dots/52-tablet.conf
+++ b/not_dots/52-tablet.conf
@@ -0,0 +1,15 @@
+# Config for the HUION tablet
+#
+## Install:
+# yay linux-headers
+# yay digimend
+## To also control the buttons, install wacom and use xsetwacom
+# 	yay wacom 
+
+Section "InputClass"
+	Identifier "Huion on wacom"
+	# MatchIsTablet "on"
+	MatchProduct "HUION"
+	MatchDevicePath "/dev/input/event*"
+	Driver "wacom"
+EndSection
--- a/ranger/.config/ranger/bookmarks
+++ b/ranger/.config/ranger/bookmarks
@@ -1,12 +1,11 @@
-j:/home/j/Downloads
-d:/home/j/Downloads
-g:/home/j/git/balkian
 F:/home/j
 f:/home/j
 m:/home/j/Downloads
-o:/home/j/Downloads
-':/home/j/Clases/CORE/2019
-G:/home/j/GSI
 p:/home/j/Doctorado/Papers
 s:/home/j/Doctorado/Papers/SocialContext
+d:/home/j/Downloads
 D:/home/j/Doctorado
+o:/home/j/Downloads
+g:/home/j/git/balkian
+G:/home/j/GSI
+j:/home/j/Downloads
--- a/screenlayouts/.screenlayout/auto.sh
+++ b/screenlayouts/.screenlayout/auto.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+xrandr --auto
--- a/screenlayouts/.screenlayout/dual-wide.sh
+++ b/screenlayouts/.screenlayout/dual-wide.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-xrandr --output VIRTUAL1 --off --output eDP-1 --mode 1920x1080 --pos 328x1080 --rotate normal --output DP-1 --primary --mode 2560x1080 --pos 0x0 --rotate normal --output HDMI-2 --off --output HDMI-1 --off --output DP-2 --off
+xrandr --output eDP1 --mode 1920x1080 --pos 320x1080 --rotate normal --output DP1 --mode 2560x1080 --pos 0x0 --rotate normal --output DP2 --off --output HDMI1 --off --output HDMI2 --off --output VIRTUAL1 --off
--- a/screenlayouts/.screenlayout/select.sh
+++ b/screenlayouts/.screenlayout/select.sh
@@ -1,2 +0,0 @@
-#!/bin/sh
-arandr
--- a/screenlayouts/.screenlayout/single.sh
+++ b/screenlayouts/.screenlayout/single.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-xrandr --output HDMI1 --off --output DVI-1 --off --output DP-1 --off --output eDP-1 --mode 1920x1080 --pos 0x0 --rotate normal --output VGA1 --off
+xrandr --output HDMI1 --off --output DVI-1 --off --output DP-1 --off --output eDP-1 --mode 1920x1080 --pos 0x0 --rotate normal --output VGA1 --off --auto
--- a/screenlayouts/.screenlayout/triple-screen.sh
+++ b/screenlayouts/.screenlayout/triple-screen.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+xrandr --output eDP-1 --primary --mode 1920x1080 --pos 2240x1080 --rotate normal --output DP-1 --off --output HDMI-1 --mode 1920x1080 --pos 0x0 --rotate normal --output DP-2 --mode 2560x1080 --pos 1920x0 --rotate normal --output HDMI-2 --off
--- a/scripts/.bin/autorotate.py
+++ b/scripts/.bin/autorotate.py
@@ -1,93 +0,0 @@
-#!/usr/bin/env python
-
-from time import sleep
-from os import path as op
-import sys
-from subprocess import check_call, check_output
-from glob import glob
-
-
-def bdopen(fname):
-    return open(op.join(basedir, fname))
-
-
-def read(fname):
-    return bdopen(fname).read()
-
-
-for basedir in glob('/sys/bus/iio/devices/iio:device*'):
-    if 'accel' in read('name'):
-        break
-else:
-    sys.stderr.write("Can't find an accellerator device!\n")
-    sys.exit(1)
-
-
-def update_devices():
-    devices = check_output(['xinput', '--list', '--name-only']).splitlines()
-
-    touchscreen_names = ['touchscreen', 'wacom', 'pen']
-    touchscreens = [i for i in devices if any(j in i.lower() for j in touchscreen_names)]
-
-    touchpad_names = ['touchpad', 'trackpoint']
-    touchpads = [i for i in devices if any(j in i.lower() for j in touchpad_names)]
-
-    return touchscreens, touchpads
-
-disable_touchpads = False
-scale = float(read('in_accel_scale'))
-g = 7.0  # (m^2 / s) sensibility, gravity trigger
-
-STATES = [
-    {'rot': 'normal', 'coord': '1 0 0 0 1 0 0 0 1', 'touchpad': 'enable',
-     'check': lambda x, y: y <= -g},
-    {'rot': 'inverted', 'coord': '-1 0 1 0 -1 1 0 0 1', 'touchpad': 'disable',
-     'check': lambda x, y: y >= g},
-    {'rot': 'left', 'coord': '0 -1 1 1 0 0 0 0 1', 'touchpad': 'disable',
-     'check': lambda x, y: x >= g},
-    {'rot': 'right', 'coord': '0 1 0 -1 0 1 0 0 1', 'touchpad': 'disable',
-     'check': lambda x, y: x <= -g},
-]
-
-
-def rotate(state):
-    s = STATES[state]
-    check_call(['xrandr', '-o', s['rot']])
-    touchscreens, touchpads = update_devices()
-    for dev in touchscreens if disable_touchpads else (touchscreens + touchpads):
-        check_call([
-            'xinput', 'set-prop', dev,
-            'Coordinate Transformation Matrix',
-        ] + s['coord'].split())
-    if disable_touchpads:
-        for dev in touchpads:
-            check_call(['xinput', s['touchpad'], dev])
-
-
-def read_accel(fp):
-    fp.seek(0)
-    return float(fp.read()) * scale
-
-
-if __name__ == '__main__':
-
-    accel_x = bdopen('in_accel_x_raw')
-    accel_y = bdopen('in_accel_y_raw')
-
-    current_state = None
-
-    while True:
-        x = read_accel(accel_x)
-        y = read_accel(accel_y)
-        for i in range(4):
-            if i == current_state:
-                continue
-            if STATES[i]['check'](x, y):
-                current_state = i
-                try:
-                    rotate(i)
-                except Exception as ex:
-                    print('Error rotating: {}'.format(ex))
-                break
-        sleep(1)
-
--- a/scripts/.bin/colors.sh
+++ b/scripts/.bin/colors.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+for i in {0..255} ; do
+    printf "\x1b[38;5;${i}mcolour${i}\n"
+done
--- a/scripts/.bin/mapinputs.sh
+++ b/scripts/.bin/mapinputs.sh
@@ -1,4 +0,0 @@
-#!/bin/sh
-xinput map-to-output "ELAN9038:00 04F3:261A Pen eraser" eDP-1 # Eraser
-xinput map-to-output "ELAN9038:00 04F3:261A Pen stylus" eDP-1 # Stylus
-xinput map-to-output "ELAN9038:00 04F3:261A Touchscreen" eDP-1 # Touch
--- a/scripts/.bin/onboard.sh
+++ b/scripts/.bin/onboard.sh
@@ -1,3 +0,0 @@
-#!/bin/sh
-dbus-send --type=method_call --print-reply --dest=org.onboard.Onboard /org/onboard/Onboard/Keyboard org.onboard.Onboard.Keyboard.ToggleVisible || onboard
-
--- a/scripts/.bin/terminator
+++ b/scripts/.bin/terminator
@@ -1,2 +0,0 @@
-#!/bin/bash
-one-window "terminator" "xdotool windowfocus \$WID & xdotool key ctrl+shift+t;" "/usr/bin/terminator $*"
--- a/termite/.config/termite/config
+++ b/termite/.config/termite/config
@@ -1,6 +1,8 @@
 [colors]
 # hard contrast:
-background = #1d2021
+#background = #1d2021
+background = rgba(29, 32, 33, 0.9)
+#background = rgba(63, 63, 63, 0.8)
 #background = #282828
 # soft contrast:
 #background = #32302f
@@ -45,7 +47,7 @@ allow_bold = true
 mouse_autohide = false
 dynamic_title = true
 urgent_on_bell = true
-browser = chromium
+browser = firefox
 clickable_url = true
 cursor_blink = system
 cursor_shape = block
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -19,6 +19,9 @@ bind j select-pane -D
 bind k select-pane -U
 bind l select-pane -R

+
+bind C break-pane
+
 # use vim motion keys while in copy mode
 setw -g mode-keys vi
 # use the vim resize keys.
@@ -33,17 +36,23 @@ bind > resize-pane -R 1
 bind b set-window-option synchronize-panes

 # Set status bar
-set -g status-bg black
-set -g status-fg white
-set -g status-left '#[fg=green]#H'
+set -g status-style bg=black,fg=white
+set -g status-left '#[fg=yellow]#H #{?window_zoomed_flag,🔍, }'
 set -g status-right '#[fg=yellow]#(uptime | sed -e "s/load average/load/g" -e "s/  / /g")' # | cut -d "," -f 2-)'
 set -g status-right-length 50

-set -g pane-border-status bottom
-set -g pane-border-format '#(ps --no-headers -t #{pane_tty} -o args -O-c)'
-
 # Highlight active window
-set-window-option -g window-status-current-bg red
+set-window-option -g window-status-current-style bg=yellow,fg=black
+#set -g window-status-format "#I:#{pane_current_path}"
+#set -g window-status-current-format "#I:#{pane_current_path}"
+
+
+set -g pane-border-status top
+set -g pane-border-format '#(ps --no-headers -t #{pane_tty} -o args -O-c)    @#{pane_current_path}'
+
+# Dividing pane colors
+set -g pane-border-style fg=magenta
+set -g pane-active-border-style fg=yellow,bg=default

 # Set window notifications
 setw -g monitor-activity on
@@ -52,7 +61,11 @@ set -g visual-activity on
 # Automatically set window title
 set-option -g status-interval 5
 set-option -g automatic-rename on
-set-option -g automatic-rename-format '#(basename "#{pane_current_path}")'
+set-option -g automatic-rename-format '#(dirname "#{pane_current_path}"| xargs -0 basename)/#(basename "#{pane_current_path}")'
+
+# WM windows
+set-option -g set-titles on
+set-option -g set-titles-string "#S | #W"

 # Mouse and panes
 #set -g mouse-utf8 on
@@ -98,9 +111,11 @@ set-option -g default-shell ${SHELL}
 unbind m
 bind m run "tmux-zoom.sh"

+# reload config file (change file location to your the tmux.conf you want to use)
+bind r source-file ~/.tmux.conf
+
 # Fix for emacs and the like
 set -s escape-time 0

 # Start new-session as default
-new-session
-
+#new-session
--- a/touchegg/.config/touchegg/touchegg.conf
+++ b/touchegg/.config/touchegg/touchegg.conf
@@ -1,83 +0,0 @@
-<touchégg>
-    
-    <settings>
-        <property name="composed_gestures_time">0</property>
-    </settings>
-    
-
-    <application name="All">
-        
-        <gesture type="TAP" fingers="2" direction="">
-            <action type="MOUSE_CLICK">BUTTON=3</action>
-        </gesture>
-    
-        <gesture type="TAP" fingers="3" direction="">
-            <action type="MOUSE_CLICK">BUTTON=2</action>
-        </gesture>
-        <gesture type="DRAG" fingers="3" direction="DOWN">
-            <action type="RUN_COMMAND">onboard.sh</action>
-        </gesture>
-
-        <gesture type="TAP" fingers="5" direction="">
-            <action type="CLOSE_WINDOW"></action>
-        </gesture>
-
-        <gesture type="DRAG" fingers="2" direction="ALL">
-            <action type="SCROLL">SPEED=7:INVERTED=false</action>
-        </gesture>
-
-        <gesture type="DRAG" fingers="4" direction="UP">
-            <action type="MAXIMIZE_RESTORE_WINDOW"></action>
-        </gesture>
-
-
-        <gesture type="DRAG" fingers="4" direction="RIGHT">
-            <action type="SEND_KEYS">Super+Control+l</action>
-        </gesture>
-
-        <gesture type="DRAG" fingers="4" direction="LEFT">
-            <action type="SEND_KEYS">Super+Control+h</action>
-        </gesture>
-        
-        <gesture type="PINCH" fingers="5" direction="ALL">
-            <action type="SEND_KEYS">Alt+F1</action>
-        </gesture>
-
-    </application>
-
-
-    <application name="Okular, Gwenview">
-
-        <gesture type="PINCH" fingers="2" direction="IN">
-            <action type="SEND_KEYS">Control+KP_Add</action>
-        </gesture>
-
-        <gesture type="PINCH" fingers="2" direction="OUT">
-            <action type="SEND_KEYS">Control+KP_Subtract</action>
-        </gesture>
-
-        <gesture type="ROTATE" fingers="2" direction="LEFT">
-            <action type="SEND_KEYS">Control+L</action>
-        </gesture>
-
-        <gesture type="ROTATE" fingers="2" direction="RIGHT">
-            <action type="SEND_KEYS">Control+R</action>
-        </gesture>
-
-    </application>
-
-
-    <application name="Chromium-browser, Dolphin">
-
-        <gesture type="DRAG" fingers="2" direction="LEFT">
-            <action type="SEND_KEYS">Alt+Left</action>
-        </gesture>
-
-        <gesture type="DRAG" fingers="2" direction="RIGHT">
-            <action type="SEND_KEYS">Alt+Right</action>
-        </gesture>
-        
-    </application>
-
-
-</touchégg>
--- a/udiskie/.config/udiskie/config.yml
+++ b/udiskie/.config/udiskie/config.yml
@@ -1,4 +0,0 @@
---
-ignore_device:
-        - device_file: "/dev/loop*"
-          ignore: true
--- a/vim/.vim/bundle/vundle
+++ b/vim/.vim/bundle/vundle
--- a/OSS/User/keybindings.json
+++ b/OSS/User/keybindings.json
@@ -0,0 +1,36 @@
+// Place your key bindings in this file to overwrite the defaults
+[
+    // {
+    //     "key": "] q",
+    //     "command": "editor.action.marker.nextInFiles",
+    //     "when": "editorFocus && !editorReadonly"
+    // },
+    // {
+    //     "key": "f8",
+    //     "command": "-editor.action.marker.nextInFiles",
+    //     "when": "editorFocus && !editorReadonly"
+    // },
+    // {
+    //     "key": "[ q",
+    //     "command": "editor.action.marker.prevInFiles",
+    //     "when": "editorFocus && !editorReadonly"
+    // },
+    // {
+    //     "key": "shift+f8",
+    //     "command": "-editor.action.marker.prevInFiles",
+    //     "when": "editorFocus && !editorReadonly"
+    // },
+    {
+        "key": "ctrl+`",
+        "command": "workbench.action.terminal.focus"
+    },
+    {
+        "key": "ctrl+`",
+        "command": "-workbench.action.terminal.toggleTerminal"
+    },
+    {
+        "key": "ctrl+shift+1",
+        "command": "workbench.action.editorLayoutSingle",
+        "when": "editorFocus"
+    }
+]
--- a/OSS/User/settings.json
+++ b/OSS/User/settings.json
@@ -0,0 +1,32 @@
+{
+    "diffEditor.ignoreTrimWhitespace": true,
+    "gitlens.advanced.messages": {
+        "suppressShowKeyBindingsNotice": true,
+        "suppressResultsExplorerNotice": true
+    },
+    "vim.handleKeys": {
+        "<C-K>": false,
+        "[q": false,
+        "]q": false
+    },
+    "workbench.statusBar.visible": true,
+    "files.watcherExclude": {
+        "**/.git/objects/**": true,
+        "**/.git/subtree-cache/**": true,
+        "**/node_modules/**": true,
+        "**/vendor/**": true,
+    },
+    "window.titleBarStyle": "custom",
+    "vim.hlsearch": true,
+    "vim.statusBarColorControl": true,
+    "workbench.colorCustomizations": {
+        "statusBar.background": "#5f0000",
+        "statusBar.noFolderBackground": "#5f0000",
+        "statusBar.debuggingBackground": "#5f0000"
+    },
+    "gitlab.instanceUrl": "https://lab.gsi.upm.es",
+    "editor.wordWrap": "on",
+    "window.zoomLevel": 1,
+    "explorer.confirmDragAndDrop": false,
+    "workbench.colorTheme": "Default Light+"
+}
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -49,5 +49,4 @@ path=(

 export PATH
 export GOPATH=$HOME/go
-export PATH=$PATH:$GOPATH/bin/
-export PATH=$PATH:/snap/bin/
+export PATH=$PATH:$GOPATH/bin/:$HOME/.npm/bin
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -123,6 +123,8 @@ alias drm="docker rm"
 alias drmi="docker rmi"
 alias drun="docker run"

+alias t="tmux new-session -A -s "
+

 # GSI
 alias gsicluster='ssh balkian@shannon.gsi.dit.upm.es -p 1337'      
@@ -147,6 +149,15 @@ function kube (){
    kubectl --context="$context" "$@"
 }

+function ds () {
+    du -xsh "$@" | sort -h
+
+}
+
+function sag () {
+    ag -0 -l $1 | xargs -0 sed -ri.bak -e "s/$1/$2/g"
+}
+
 # Dircolors for termite

 if [[ -s "$HOME/.dircolors" ]]; then
@@ -154,3 +165,7 @@ if [[ -s "$HOME/.dircolors" ]]; then
 fi

 setopt interactivecomments
+
+export WASMTIME_HOME="$HOME/.wasmtime"
+
+export PATH="$WASMTIME_HOME/bin:$PATH"
Author	SHA1	Message	Date
J. Fernando Sánchez	c3064a3d76	Minor changes	2020-04-15 17:27:00 +02:00
J. Fernando Sánchez	10dc194dc6	Merge branch 'master' of github.com:balkian/dotfiles	2020-04-15 17:24:42 +02:00
J. Fernando Sánchez	2574a62403	Batch of changes	2020-04-15 17:19:21 +02:00
J. Fernando Sánchez	97566eccc6	Add npm binaries to zsh	2020-04-13 15:35:39 +02:00
J. Fernando Sánchez	d63f2adf19	Update emacs use-package for newer versions	2020-04-13 15:35:15 +02:00
J. Fernando Sánchez	fd2ca33e0d	Add keep	2019-06-21 11:55:36 +02:00
				`@@ -0,0 +1 @@`
				`{"pandoc --filter pandoc-include-code -i index.md --metadata pagetitle=yourtitle -s --highlight-style=pygments -o index.docx": {"desc": "generate docx (Word, Office) from a markdown file with code highlighting", "alias": "md2doc"}}`