diff --git a/i3wm/config b/i3wm/config index e2b06b0..ef0e357 100644 --- a/i3wm/config +++ b/i3wm/config @@ -13,7 +13,8 @@ ############################################# # font -set $font "pango:Droid Sans Mono for Powerline 10" +set $font "pango:Droid Sans Mono 10" +#set $font "pagno:Droid Sans Mono for Powerline 10" font $font # floating modifier @@ -23,15 +24,11 @@ set $mod mod4 floating_modifier $mod # remove window decorations -#new_window pixel +new_window pixel # focus follows mouse focus_follows_mouse yes -#gaps -gaps inner 13 -gaps outer 5 -# ##border new_window pixel 3 @@ -45,9 +42,12 @@ new_window pixel 3 # # sound softkeys management -bindsym XF86AudioRaiseVolume exec ~/.i3/util/volnotid.sh up -bindsym XF86AudioLowerVolume exec ~/.i3/util/volnotid.sh down -bindsym XF86AudioMute exec ~/.i3/util/volnotid.sh mute +#bindsym XF86AudioRaiseVolume exec ~/.i3/util/volnotid.sh up +#bindsym XF86AudioLowerVolume exec ~/.i3/util/volnotid.sh down +#bindsym XF86AudioMute exec ~/.i3/util/volnotid.sh mute +bindsym XF86AudioRaiseVolume exec amixer -q sset Master 5%+ unmute && killall -SIGUSR1 i3status +bindsym XF86AudioLowerVolume exec amixer -q sset Master 5%- unmute && killall -SIGUSR1 i3status +bindsym XF86AudioMute exec amixer -q sset Master toggle && killall -SIGUSR1 i3status # display brightness management bindsym XF86MonBrightnessUp exec "xbacklight +10" @@ -68,14 +68,17 @@ bindsym $mod+F3 exec /opt/JAuth/authenticator.sh dropbox bindsym $mod+d exec ~/.i3/util/i3dmenu-wrapper.sh # lock i3 with i3lock -bindsym $mod+Shift+x exec ~/.i3/util/i3blur.py && systemctl suspend +#bindsym $mod+Shift+x exec i3lock -c 000000 +bindsym $mod+Shift+x exec ~/.i3/util/i3blur.py ############################################# # Keymaps # ############################################# # start terminal -bindsym $mod+Return exec --no-startup-id i3-sensible-terminal +#bindsym $mod+Return exec --no-startup-id gnome-terminal +#bindsym $mod+Return exec --no-startup-id urxvt +bindsym $mod+Return exec --no-startup-id urxvtc # kill focused window bindsym $mod+Shift+q kill @@ -198,10 +201,11 @@ set $DARKGREY #1f1f1f set $DARKRED #9b0e0e # Solarized colorscheme -set $BACKGROUND #002b36 +#set $BACKGROUND #002b36 +set $BACKGROUND #1c5b98 set $FOREGROUND #93a1a1 set $LIGHTGREY #dc322f -set $GREEN #859900 +set $GREEN #b0cc54 set $BROWN #b58900 set $BLUE #268bd2 set $VIOLET #6c71c4 @@ -219,7 +223,7 @@ client.background #ffffff # Solarized colorscheme # name #border #background #text #indicator #child_border -client.focused $MAGENTA $BACKGROUND $GREEN $GREEN $MAGENTA +client.focused $FOREGROUND $MAGENTA $GREEN $GREEN $MAGENTA client.unfocused $BACKGROUND $BACKGROUND $GREEN $GREEN $BACKGROUND client.focused_inactive $BACKGROUND $BACKGROUND $GREEN $GREEN $BACKGROUND client.urgent $BACKGROUND $BACKGROUND $BACKGROUND $GREEN $BACKGROUND @@ -233,7 +237,7 @@ bar { font $font i3bar_command /usr/bin/i3bar status_command i3status -c ~/.i3/i3status.conf - separator_symbol ".::" + separator_symbol "" # Darkbrown colorscheme # colors { @@ -280,22 +284,25 @@ for_window [class="JAuth"] floating enable for_window [class="plecs"] floating enable # 0px Border -for_window [class="chrome"] border none -for_window [class="Firefox"] border none +#for_window [class="chrome"] border none +#for_window [class="Firefox"] border none # 1px Border -for_window [class="URxvt" ] border 1pixel +#for_window [class="URxvt" ] border 1pixel ############################################# # auto start with i3 # ############################################# # terminal daemon -exec --no-startup-id urxvtd -f +exec --no-startup-id urxvtd --quiet --opendisplay --fork + +# pidgin chat cliente +exec --no-startup-id pidgin # less eye pain exec --no-startup-id redshift-gtk -exec --no-startup-id compton -cCGb +exec --no-startup-id compton -cCGbD 10 # no beep! exec --no-startup-id xset b off @@ -304,22 +311,14 @@ exec --no-startup-id xset b off #exec --no-startup-id xrandr --dpi 81 # set mouse accel -#exec --no-startup-id xset m 1/4 1 - -# volnoti volume changer -exec --no-startup-id volnoti +exec --no-startup-id xset m 1/4 1 # numlock on by default #exec --no-startup-id numlockx on +# nm-applet (yehhh vpn ...) +exec --no-startup-id nm-applet + # wallpapers -exec --no-startup-id ~/.i3/util/wallpapers.sh - -# archlinux update notifier -exec --no-startup-id aarchup - -# telegram -exec telegram-desktop - -# dropbox daemon -exec dropbox start +#exec --no-startup-id ~/.i3/util/wallpapers.sh +exec --no-startup-id feh --bg-scale ~/.wallpapers/puzzle1.png diff --git a/i3wm/i3status.conf b/i3wm/i3status.conf index e41a7bd..fb1425b 100644 --- a/i3wm/i3status.conf +++ b/i3wm/i3status.conf @@ -23,18 +23,18 @@ general { order += "battery 0" order += "disk /home" order += "disk /" -order += "run_watch VPN" -order += "wireless wlp3s0" +order += "wireless wlp1s0" +order += "ethernet enp0s31f6" order += "cpu_temperature 0" order += "volume master" order += "tztime local" -wireless wlp3s0 { +wireless wlp1s0 { format_up = "📡 (%quality @ %essid, %bitrate) %ip" format_down = "📡 down" } -ethernet enp0s25 { +ethernet enp0s31f6 { format_up = "🔌 %ip (%speed)" format_down = "🔌 down" } @@ -51,18 +51,14 @@ battery 0 { low_threshold = 10 } -run_watch VPN { - pidfile = "/var/run/vpn/pid" -} - tztime local { - format = " 📅 %d-%m-%Y 🕑 %H:%M:%S" + format = " 📅 %d-%m-%Y 🕑 %H:%M:%S" } cpu_temperature 0 { format = "🌡 %degrees °C" max_threshold = 70 - path = "/sys/devices/platform/coretemp.0/hwmon/hwmon2/temp1_input" + path = "/sys/devices/platform/coretemp.0/hwmon/hwmon1/temp1_input" } disk "/home" { diff --git a/i3wm/util/i3blur.py b/i3wm/util/i3blur.py index b04c883..71d3685 100755 --- a/i3wm/util/i3blur.py +++ b/i3wm/util/i3blur.py @@ -27,21 +27,10 @@ sz = w.get_size() print "[DEBUG]: The size of the window is %d x %d" % sz # Get a drawable with the size of the desktop -scr = gtk.gdk.Pixbuf( gtk.gdk.COLORSPACE_RGB, - False, - 8, - sz[0], - sz[1]) +scr = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, False, 8, sz[0], sz[1]) # Fill it with the screenshot -scr = scr.get_from_drawable(w, - w.get_colormap(), - 0, - 0, - 0, - 0, - sz[0], - sz[1]) +scr = scr.get_from_drawable(w, w.get_colormap(), 0, 0, 0, 0, sz[0], sz[1]) # Save the screenshot as png if(scr != None): @@ -52,7 +41,7 @@ else: # Load the screenshot as image and blur it iml = Image.open("/tmp/i3screen.png") -iml = iml.filter(ImageFilter.BLUR) +iml = iml.filter(ImageFilter.GaussianBlur(8)) # Save the blured screenshot and call i3lock if(iml != None): diff --git a/i3wm/util/volnotid.sh b/i3wm/util/volnotid.sh index 54425a6..9e7e32e 100755 --- a/i3wm/util/volnotid.sh +++ b/i3wm/util/volnotid.sh @@ -17,7 +17,6 @@ # yaourt -S volnoti # - VOLUME=$(amixer get Master | grep Mono: | sed 's|[^[]*\[\([0-9]*\).*|\1|') VALUE=3dB MUTE=0 diff --git a/urxvt/Xdefaults b/urxvt/Xdefaults index 8e32aa8..721cbda 100644 --- a/urxvt/Xdefaults +++ b/urxvt/Xdefaults @@ -10,10 +10,7 @@ # Real transparency -> needs composite manager URxvt.depth: 32 -URxvt.background: rgba:0000/0000/0200/cfff - -# Fake transparency -#URxvt.transparent: true +URxvt.background: rgba:0000/0000/0200/1fff #URxvt.shading: 30 URxvt.tintColor: White @@ -21,12 +18,9 @@ URxvt.saveLines: 9000000 URxvt.foreground: Grey # Fonts For Powerlinefonts: https://github.com/powerline/fonts (Arch linux -> AUR) -#URxvt.font: xft:Droid Sans Mono:pixelsize=18:antialias=true:hinting=true -#URxvt.boldFont: xft:Droid Sans Mono:bold:pixelsize=18:antialias=true:hinting=true -#URxvt.tabbed.font: xft:Droid Sans Mono:pixelsize=18:antialias=true:hinting=true -URxvt.font: xft:Roboto Mono for Powerline:pixelsize=15:antialias=true:hinting=false -URxvt.boldFont: xft:RobotoMono for Powerline :bold:pixelsize=14:antialias=true:hinting=true -URxvt.tabbed.font: xft:RobotoMono for Powerline :pixelsize=14:antialias=true:hinting=true +URxvt.font: xft:Ubuntu mono:medium:size=12,xft:Ubuntu Mono derivative Powerline:pixelsize=12 +xterm.faceName: xft:Ubuntu mono:medium:size=12,xft:Ubuntu Mono derivative Powerline:pixelsize=12 +#URxvt.font: xft:DejaVu Sans Mono:medium:size=12,xft:DejaVu Sans Mono for Powerline:pixelsize=12 # Misc configurations URxvt.colorUL: #4682B4 @@ -42,7 +36,7 @@ URxvt.inheritPixmap: true # Scroll behavior, don't scroll with output URxvt.scrollBar: false URxvt.secondaryScroll: true -URxvt.scrollTtyOutput: false +URxvt.scrollTtyOutput: false URxvt.scrollWithBuffer: true URxvt.scrollTtyKeypress: true diff --git a/vim/vimrc b/vim/vimrc index 7a77428..962a558 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -34,21 +34,29 @@ endif " Start Vundle stuff " call vundle#begin() Plugin 'VundleVim/Vundle.vim' + " A pretty statusline, bufferline integration " Plugin 'itchyny/lightline.vim' Plugin 'bling/vim-bufferline' + " everything! " - Plugin 'ervandew/supertab' + "Plugin 'ervandew/supertab' + " Glorious colorscheme " Plugin 'nanotech/jellybeans.vim' + " Super easy commenting, toggle comments etc " Plugin 'scrooloose/nerdcommenter' + " Autoclose (, " etc " - Plugin 'Townk/vim-autoclose' + "Plugin 'Townk/vim-autoclose' + " Git wrapper inside Vim " Plugin 'tpope/vim-fugitive' - " Handle surround chars like " - Plugin 'tpope/vim-surround' + + "Handle surround chars like " + "Plugin 'tpope/vim-surround' + " Vim signs (:h signs) for modified lines based off VCS (e.g. Git) " Plugin 'mhinz/vim-signify' " Finish Vundle stuff " @@ -65,16 +73,15 @@ filetype plugin indent on """"""""""""""""""""""""""""""""""""""""" " Lightline (statusline) configuration " """"""""""""""""""""""""""""""""""""""""" - -let g:lightline = { - \ 'colorscheme': 'default', - \ 'component': { - \ 'readonly': '%{&readonly?"":""}', - \ }, - \ 'separator': { 'left': '', 'right': '' }, - \ 'subseparator': { 'left': '', 'right': '' } - \ } - +"let g:lightline = { +" \ 'colorscheme': 'default', +" \ 'component': { +" \ 'readonly': '%{&readonly?"":""}', +" \ }, +" \ 'separator': { 'left': '', 'right': '' }, +" \ 'subseparator': { 'left': '', 'right': '' } +" \ } +" """"""""""""""""""""""""""""""""""""""""" " Misc configurations " """"""""""""""""""""""""""""""""""""""""" diff --git a/wallpapers/puzzle1.png b/wallpapers/puzzle1.png new file mode 100644 index 0000000..7d96f73 Binary files /dev/null and b/wallpapers/puzzle1.png differ diff --git a/wallpapers/puzzle2.png b/wallpapers/puzzle2.png new file mode 100644 index 0000000..8699774 Binary files /dev/null and b/wallpapers/puzzle2.png differ diff --git a/wallpapers/puzzle3.png b/wallpapers/puzzle3.png new file mode 100644 index 0000000..35e0820 Binary files /dev/null and b/wallpapers/puzzle3.png differ diff --git a/wallpapers/solarized.png b/wallpapers/solarized.png new file mode 100644 index 0000000..f5f340c Binary files /dev/null and b/wallpapers/solarized.png differ diff --git a/zsh/zshrc b/zsh/zshrc index b08b511..42f896c 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -86,7 +86,7 @@ if [[ -f $DIRSTACKFILE ]] && [[ $#dirstack -eq 0 ]]; then fi chpwd() { - print -l $PWD ${(u)dirstack} >$DIRSTACKFILE + print -l $PWD ${(u)dirstack} > $DIRSTACKFILE } DIRSTACKSIZE=20 @@ -118,5 +118,8 @@ setopt autopushd pushdsilent pushdtohome setopt pushdignoredups setopt pushdminus setopt nohashdirs -source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +#source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh rehash + +source <(oc completion zsh) +export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting