Merge branch 'master' of ssh://neodarz.net:19977/home/git/pub_repo/neodarz/conf/dotfiles_ascii

4 files changed, 99 insertions, 140 deletions

diff --git a/Xresources/.Xresources b/Xresources/.Xresources
index 3f3a9e6..1eef16e 100644
--- a/Xresources/.Xresources
+++ b/Xresources/.Xresources
@@ -1,3 +1,8 @@
+
+! ------------------------------------------------------------------------------
+! 
+! ------------------------------------------------------------------------------
+
 *background:            #272827
 *foreground:            #657b83
 *fading:                15
@@ -34,6 +39,10 @@
 *color7:                #fdf6e3
 *color15:               #fdf6e3
 
+! ------------------------------------------------------------------------------
+! Xft conf
+! ------------------------------------------------------------------------------
+
 Xft.dpi: 96
 Xft.antialias: true
 Xft.hinting: true
@@ -44,14 +53,21 @@ Xft.lcdfilter: lcddefault
 Xcursor.theme: Chameleon-Pearl-Regular-0.5
 Xcursor.size:  0
 
+! ------------------------------------------------------------------------------
+! XTerm conf
+! ------------------------------------------------------------------------------
+
 XTerm*background: #272827
 XTerm*foreground: #fdf6e3
 XTerm*reverseVideo: on
 XTerm*faceName: Terminus:size=11:antialias=true
 XTerm*selectToClipboard: true
 
-! URxvt.font: 9x15
-URxvt.font: xft:fira code:size=8
+! ------------------------------------------------------------------------------
+! URxvt conf
+! ------------------------------------------------------------------------------
+
+URxvt.font: fira-code 8
 URxvt.depth: 32
 URxvt.background: [80]#000000
 URxvt*scrollBar:                      false
@@ -61,140 +77,6 @@ URxvt*background:                     black
 URxvt*foreground:                     grey
 URxvt*saveLines:                      5000
 
-! for 'fake' transparency (without Compton) uncomment the following three lines
-! URxvt*inheritPixmap:                  true
-! URxvt*transparent:                    true
-! URxvt*shading:                        138
-
-! other possible settings:
-! Rxvt.perl-ext-common: ...,clipboard
-! URxvt.keysym.M-C-c:   perl:clipboard:copy
-! URxvt.keysym.M-v:   perl:clipboard:paste
-! URxvt.keysym.M-C-v: perl:clipboard:paste_escaped
-! URxvt*termName:                       string
-! URxvt*geometry:                       geometry
-! URxvt*chdir:                          string
-! URxvt*reverseVideo:                   boolean
-! URxvt*loginShell:                     boolean
-! URxvt*multiClickTime:                 number
-! URxvt*jumpScroll:                     boolean
-! URxvt*skipScroll:                     boolean
-! URxvt*pastableTabs:                   boolean
-! URxvt*scrollstyle:                    plain
-! URxvt*scrollBar_right:                boolean
-! URxvt*scrollBar_floating:             true
-! URxvt*scrollBar_align:                mode
-! URxvt*thickness:                      number
-! URxvt*scrollTtyOutput:                boolean
-! URxvt*scrollTtyKeypress:              boolean
-! URxvt*scrollWithBuffer:               boolean
-! URxvt*tintColor:                      !7DA55
-! URxvt*blurRadius:                     HxV
-! URxvt*fading:                         number
-! URxvt*fadeColor:                      color
-! URxvt*utmpInhibit:                    boolean
-! URxvt*urgentOnBell:                   boolean
-! URxvt*visualBell:                     boolean
-! URxvt*mapAlert:                       boolean
-! URxvt*meta8:                          boolean
-! URxvt*tripleclickwords:               boolean
-! URxvt*insecure:                       boolean
-! URxvt*cursorUnderline:                boolean
-! URxvt*pointerBlank:                   boolean
-! URxvt*color0:                         color
-! URxvt*color1:                         color
-! URxvt*color2:                         color
-! URxvt*color3:                         color
-! URxvt*color4:                         color
-! URxvt*color5:                         color
-! URxvt*color6:                         color
-! URxvt*color7:                         color
-! URxvt*color8:                         color
-! URxvt*color9:                         color
-! URxvt*color10:                        color
-! URxvt*color11:                        color
-! URxvt*color12:                        color
-! URxvt*color13:                        color
-! URxvt*color14:                        color
-! URxvt*color15:                        color
-! URxvt*colorBD:                        color
-! URxvt*colorIT:                        color
-! URxvt*colorUL:                        color
-! URxvt*colorRV:                        color
-! URxvt*underlineColor:                 color
-! URxvt*scrollColor:                    color
-! URxvt*troughColor:                    color
-! URxvt*highlightColor:                 color
-! URxvt*highlightTextColor:             color
-! URxvt*cursorColor:                    color
-! URxvt*cursorColor2:                   color
-! URxvt*pointerColor:                   color
-! URxvt*pointerColor2:                  color
-! URxvt*borderColor:                    color
-! URxvt*iconFile:                       file
-! URxvt*font:                           fontname
-! URxvt*boldFont:                       fontname
-! URxvt*italicFont:                     fontname
-! URxvt*boldItalicFont:                 fontname
-! URxvt*intensityStyles:                boolean
-! URxvt*inputMethod:                    name
-! URxvt*preeditType:                    style
-! URxvt*imLocale:                       string
-! URxvt*imFont:                         fontname
-! URxvt*title:                          string
-! URxvt*iconName:                       string
-! URxvt*buffered:                       boolean
-! URxvt*depth:                          number
-! URxvt*visual:                         number
-! URxvt*transient-for:                  windowid
-! URxvt*override-redirect:              boolean
-! URxvt*hold:                           boolean
-! URxvt*externalBorder:                 number
-! URxvt*internalBorder:                 number
-! URxvt*borderLess:                     true
-! URxvt*lineSpace:                      number
-! URxvt*letterSpace:                    number
-! URxvt*skipBuiltinGlyphs:              boolean
-! URxvt*pointerBlankDelay:              number
-! URxvt*backspacekey:                   string
-! URxvt*deletekey:                      string
-! URxvt*print-pipe:                     string
-! URxvt*modifier:                       modifier
-! URxvt*cutchars:                       string
-! URxvt*answerbackString:               string
-! URxvt*secondaryScreen:                boolean
-! URxvt*secondaryScroll:                boolean
-! URxvt*perl-lib:                       string
-! URxvt*perl-eval:                      perl-eval
-! URxvt*perl-ext-common:                string
-! URxvt*perl-ext:                       string
-! URxvt*iso14755:                       boolean
-! URxvt*iso14755_52:                    boolean
-! URxvt*xrm:                            string
-! URxvt*keysym.sym:                     keysym
-! URxvt*background.border:              boolean
-! URxvt*background.expr:                string
-! URxvt*background.interval:            seconds
-! URxvt*bell-command:                   string
-! URxvt*kuake.hotkey:                   string
-! URxvt*matcher.button:                 string
-! URxvt*matcher.launcher:               string
-! URxvt*matcher.launcher.*:             string
-! URxvt*matcher.pattern.*:              string
-! URxvt*matcher.rend.*:                 string
-! URxvt*remote-clipboard.fetch:         string
-! URxvt*remote-clipboard.store:         string
-! URxvt*searchable-scrollback:          string
-! URxvt*selection-autotransform.*:      string
-! URxvt*selection-pastebin.cmd:         string
-! URxvt*selection-pastebin.url:         string
-! URxvt*selection.pattern-0:            string
-! URxvt*tab-bg:                         colour
-! URxvt*tab-fg:                         colour
-! URxvt*tabbar-bg:                      colour
-! URxvt*tabbar-fg:                      colour
-! URxvt*url-launcher:                   string
-
 ! ------------------------------------------------------------------------------
 ! ROFI Color theme
 ! ------------------------------------------------------------------------------
@@ -203,3 +85,4 @@ rofi.color-window: #000000, #000000, #ffffff
 rofi.color-normal: #000000, #ffffff, #000000, #ffffff, #000000
 rofi.color-active: #000000, #0061ff, #000000, #ffffff, #0061ff
 rofi.color-urgent: #000000, #ff0096, #000000, #ffffff, #ff0096
+rofi.font: fira-code regular 8
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index bc4e4e7..9f2575a 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -112,7 +112,7 @@ bindsym $WinKey+Shift+F8 exec terminator -e qutebrowser
 #bindsym $AltKey+a exec urxvt -name floatme --background "#000" -cursorColor "#31363B" -font 7x13 -geometry 88x33 -e "pygmentize ~/.zsh/aliases.zsh | less"
 #bindsym $WinKey+Shift+v move morkspace to output right
 bindsym $WinKey+control+l exec i3lock-fancy
-bindsym $WinKey+p exec passmenu
+bindsym $WinKey+p exec rofi-pass
 #bindsym $WinKey+Shift+$AltKey+0 exec ~/.config/i3/switch-workspace.py 6
 bindsym XF86AudioPlay exec ~/.config/i3/switch_audio.sh 8
 
@@ -123,7 +123,7 @@ bindsym $WinKey+Return exec qterminal
 bindsym $WinKey+Shift+A kill
 
 # start dmenu (a program launcher)
-bindsym $WinKey+d exec dmenu_run
+bindsym $WinKey+d exec rofi -show run
 # There also is the (new) i3-dmenu-desktop which only displays applications
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
 # installed.
@@ -335,3 +335,4 @@ bar {
 exec /home/neodarz/.screenlayout/default.sh
 exec feh --bg-scale /home/neodarz/wallpaper_animated/black.png
 #exec /home/neodarz/wallpaper_animated/wall.sh /home/neodarz/wallpaper_animated/8bit_battle_preparation.gif
+exec setxkbmap fr
diff --git a/rofi-pass/.config/rofi-pass/rofi-pass.conf b/rofi-pass/.config/rofi-pass/rofi-pass.conf
new file mode 100644
index 0000000..0c22cf5
--- /dev/null
+++ b/rofi-pass/.config/rofi-pass/rofi-pass.conf
@@ -0,0 +1,72 @@
+# permanently set alternative root dir
+# root=/path/to/root
+
+# rofi command. Make sure to have "$@" as last argument
+_rofi () {
+    rofi -no-auto-select -kb-row-tab '' -kb-accept-entry "!Return" "$@"
+}
+
+# xdotool needs the keyboard layout to be set using setxkbmap
+# You can do this in your autostart scripts (e.g. xinitrc)
+
+# If for some reason, you cannot do this, you can set the command here.
+# and set fix_layout to true
+fix_layout=false
+
+layout_cmd () {
+  setxkbmap fr
+}
+
+# fields to be used
+URL_field='url'
+USERNAME_field='user'
+AUTOTYPE_field='autotype'
+
+# delay to be used for :delay keyword
+delay=2
+
+## Programs to be used
+# Editor
+EDITOR='vim'
+
+# Browser
+BROWSER='firefox-developer'
+
+## Misc settings
+
+default_do='menu' # menu, autotype, copyPass, typeUser, typePass, copyUser, copyUrl, viewEntry, typeMenu, actionMenu, copyMenu, openUrl
+auto_enter='false'
+notify='false'
+default_autotype='user :tab pass'
+
+# color of the help messages
+# leave empty for autodetection
+help_color="#4872FF"
+
+# Clipboard settings
+# Possible options: primary, clipboard, both
+clip=primary
+
+# Options for generating new password entries
+# default_user is also used for password files that have no user field.
+#default_user=john_doe
+#default_user2=mary_ann
+#password_length=12
+
+# Custom Keybindings
+autotype="Alt+1"
+type_user="Alt+2"
+type_pass="Alt+3"
+open_url="Alt+4"
+copy_name="Alt+u"
+copy_url="Alt+l"
+copy_pass="Alt+p"
+show="Alt+o"
+copy_entry="Alt+2"
+type_entry="Alt+1"
+copy_menu="Alt+c"
+action_menu="Alt+a"
+type_menu="Alt+t"
+help="Alt+h"
+switch="Alt+x"
+insert_pass="Alt+n"
diff --git a/zsh/.zsh/aliases.zsh b/zsh/.zsh/aliases.zsh
index c0660b7..3bfe02f 100755
--- a/zsh/.zsh/aliases.zsh
+++ b/zsh/.zsh/aliases.zsh
@@ -104,6 +104,8 @@ alias tdone="sh ~/.scripts/tdone"
 alias tactive="task active"
 alias tlistprojects="task projects"
 alias tlistallprojects="task rc.list.all.projects=1 projects"
+alias tsetnext="task modify $@ +next"
+alias tproject="task project:$1"
 alias rl='source ~/.zsh/aliases.zsh'
 alias rssyoutube="newsbeuter -c /home/neodarz/.newsbeuter/youtube.db -u /home/neodarz/.newsbeuter/urls_youtube -C /home/neodarz/.newsbeuter/youtube_conf"
 alias rssliberte="newsbeuter -c /home/neodarz/.newsbeuter/liberte.db -u /home/neodarz/.newsbeuter/urls_liberte -C /home/neodarz/.newsbeuter/liberte_conf"
@@ -111,12 +113,13 @@ alias rssblog="newsbeuter -c /home/neodarz/.newsbeuter/blog.db -u /home/neodarz/
 alias rsscode="newsbeuter -c /home/neodarz/.newsbeuter/code.db -u /home/neodarz/.newsbeuter/urls_code -C /home/neodarz/.newsbeuter/code_conf"
 alias rsshardware="newsbeuter -c /home/neodarz/.newsbeuter/hardware.db -u /home/neodarz/.newsbeuter/urls_hardware -C /home/neodarz/.newsbeuter/hardware_conf"
 alias rssactu="newsbeuter -c /home/neodarz/.newsbeuter/actu.db -u /home/neodarz/.newsbeuter/urls_actu -C /home/neodarz/.newsbeuter/actu_conf"
-alias i3lock="i3lock-fancy"
+#alias i3lock="i3lock-fancy"
 alias weatherMans="weather -k 0aebbf2d72f2b78f797b650a76c88401 -c -z 47.9955,0.1939"
 alias weatherChap="weather -k 0aebbf2d72f2b78f797b650a76c88401 -c -z 47.1778,-1.3416"
 alias vpn="sh /home/neodarz/Apps/ipsec-vpn/vpn"
 alias cal="ikhal"
-alias cals="vdirsyncer sync"
+alias cals="vdirsyncer sync linuxmaine && vdirsyncer sync haum && ikhal"
+alias calsync="vdirsyncer sync perso && vdirsyncer sync pro"
 alias mm="offlineimap &&  mutt"
 
 alias stowroot="sudo stow -t /"