Merge branch 'master' of https://git.frogeye.fr/geoffrey/dotfiles
This commit is contained in:
		
						commit
						a4d68db739
					
				
					 9 changed files with 424 additions and 19 deletions
				
			
		|  | @ -10,3 +10,6 @@ xterm*rightScrollBar:     false | |||
| xterm*jumpScroll:         true | ||||
| xterm*multiScroll:        true | ||||
| xterm*toolBar:            false | ||||
| XTerm.vt100.translations: #override \n\ | ||||
|     Ctrl Shift <Key>C: copy-selection(CLIPBOARD) \n\ | ||||
|     Ctrl Shift <Key>V: insert-selection(CLIPBOARD) | ||||
|  |  | |||
|  | @ -22,6 +22,7 @@ hide_edge_borders both | |||
| # Font for window titles. Will also be used by the bar unless a different font | ||||
| # is used in the bar {} block below. | ||||
| 
 | ||||
| font pango:Source Code Pro 8 | ||||
| font pango:DejaVu Sans Mono 8 | ||||
| font pango:Sans 8 | ||||
| 
 | ||||
|  | @ -133,16 +134,16 @@ bindsym $mod+a focus parent | |||
| bindsym $mod+q focus child | ||||
| 
 | ||||
| # Workspace names | ||||
| set $WS1  1 Édition | ||||
| set $WS2  2 Éxecution | ||||
| set $WS3  3 Organisation | ||||
| set $WS4  4 Référence | ||||
| set $WS5  5 Divers 1 | ||||
| set $WS6  6 Divers 2 | ||||
| set $WS7  7 Contact | ||||
| set $WS8  8 Social | ||||
| set $WS9  9 Veille | ||||
| set $WS10 10 Musique | ||||
| set $WS1 1 | ||||
| set $WS2 2 | ||||
| set $WS3 3 | ||||
| set $WS4 4 | ||||
| set $WS5 5 | ||||
| set $WS6 6 | ||||
| set $WS7 7 | ||||
| set $WS8 8 | ||||
| set $WS9 9 | ||||
| set $WS10 10 | ||||
| 
 | ||||
| # Workspace output | ||||
| workspace "$WS1"  output DP-5 | ||||
|  | @ -381,9 +382,9 @@ set $15 #cfd0c2 | |||
| 
 | ||||
| # Start i3bar to display a workspace bar (plus the system information i3status if available) | ||||
| bar { | ||||
|     #i3bar_command ~/.config/lemonbar/i3_lemonbar.sh | ||||
| 	mode hide | ||||
|     status_command i3status | ||||
|     i3bar_command ~/.config/polybar/launch.sh | ||||
| 	#mode hide | ||||
|     #status_command ~/c.sh | ||||
| #	wheel_up_cmd nop | ||||
| #	wheel_down_cmd nop | ||||
| 	font pango:DejaVu Sans Mono 9 | ||||
|  | @ -417,6 +418,7 @@ exec --no-startup-id numlockx on # Activate Num lock | |||
| exec --no-startup-id unclutter # Hide mouse cursor after some time | ||||
| exec --no-startup-id dunst # Notifications | ||||
| exec --no-startup-id $HOME/.config/i3/clipmenud # Clipboard manager | ||||
| exec --no-startup-id mpd # Music Player Daemon | ||||
| 
 | ||||
| # Autostart programs | ||||
| #exec --no-startup-id i3-msg 'workspace $WS8; exec firefox --new-window tweetdeck.twitter.com' | ||||
|  |  | |||
							
								
								
									
										23
									
								
								config/polybar/:
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								config/polybar/:
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,23 @@ | |||
| #!/usr/bin/env bash | ||||
| 
 | ||||
| # Terminate already running bar instances | ||||
| killall -q polybar | ||||
| 
 | ||||
| # Wait until the processes have been shut down | ||||
| while pgrep -x polybar >/dev/null; do sleep 1; done | ||||
| 
 | ||||
| function sth() { | ||||
|     echo sth | ||||
| } | ||||
| 
 | ||||
| trap SIGCONT sth | ||||
| 
 | ||||
| # Launch bar for each display | ||||
| polybar -m | cut -d':' -f1 | while read display | ||||
| do | ||||
|     MONITOR=$display polybar example & | ||||
| done | ||||
| 
 | ||||
| echo "Bars launched..." | ||||
| 
 | ||||
| wait | ||||
							
								
								
									
										334
									
								
								config/polybar/config
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										334
									
								
								config/polybar/config
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,334 @@ | |||
| ;===================================================== | ||||
| ; | ||||
| ;   To learn more about how to configure Polybar | ||||
| ;   go to https://github.com/jaagr/polybar | ||||
| ; | ||||
| ;   The README contains alot of information | ||||
| ; | ||||
| ;===================================================== | ||||
| 
 | ||||
| [theme] | ||||
| foreground = #f1ebeb | ||||
| background = #272822 | ||||
| blackB = #48483e | ||||
| blackF = #76715e | ||||
| redB = #dc2566 | ||||
| redF = #fa2772 | ||||
| greenB = #8fc029 | ||||
| greenF = #a7e22e | ||||
| yellowB = #d4c96e | ||||
| yellowF = #e7db75 | ||||
| blueB = #55bcce | ||||
| blueF = #66d9ee | ||||
| magentaB = #9358fe | ||||
| magentaF = #ae82ff | ||||
| cyanB = #56b7a5 | ||||
| cyanF = #66efd5 | ||||
| whiteB = #acada1 | ||||
| whiteF = #cfd0c2 | ||||
| 
 | ||||
| [colors] | ||||
| background = ${theme.blackB} | ||||
| foreground = ${theme.foreground} | ||||
| 
 | ||||
| [bar/example] | ||||
| ;separator = | | ||||
| monitor = ${env:MONITOR:LVDS1} | ||||
| width = 100% | ||||
| height = 20 | ||||
| ;offset-x = 1% | ||||
| ;offset-y = 1% | ||||
| ;radius = 6.0 | ||||
| fixed-center = false | ||||
| 
 | ||||
| background = ${colors.background} | ||||
| foreground = ${colors.foreground} | ||||
| 
 | ||||
| line-size = 0 | ||||
| 
 | ||||
| border-size = 0 | ||||
| border-color = ${colors.background} | ||||
| 
 | ||||
| padding-left = 2 | ||||
| padding-right = 2 | ||||
| 
 | ||||
| module-margin-left = 1 | ||||
| module-margin-right = 1 | ||||
| 
 | ||||
| font-0 = "Font Awesome:size=10;0" | ||||
| font-1 = "DejaVu Sans:size=10;0" | ||||
| font-2 = "DejaVu Sans Mono for Powerline:pixelsize=10;0" | ||||
| 
 | ||||
| modules-left = i3 | ||||
| modules-center = mpd | ||||
| modules-right = cpu memory temperature eth wlan filesystem xbacklight volume battery date | ||||
| 
 | ||||
| tray-position = right | ||||
| tray-padding = 2 | ||||
| tray-transparent = false | ||||
| 
 | ||||
| ;wm-restack = bspwm | ||||
| wm-restack = i3 | ||||
| 
 | ||||
| ;override-redirect = true | ||||
| 
 | ||||
| ;scroll-up = bspwm-desknext | ||||
| ;scroll-down = bspwm-deskprev | ||||
| 
 | ||||
| ;scroll-up = i3wm-wsnext | ||||
| ;scroll-down = i3wm-wsprev | ||||
| 
 | ||||
| bottom = true | ||||
| 
 | ||||
| enable-ipc = true | ||||
| 
 | ||||
| [module/filesystem] | ||||
| type = internal/fs | ||||
| interval = 25 | ||||
| 
 | ||||
| mount-0 = / | ||||
| mount-1 = /home | ||||
| 
 | ||||
| label-mounted-foreground = ${theme.magentaB} | ||||
| label-mounted = %{F#ae81ff}%mountpoint%%{F-} %free% | ||||
| label-unmounted = | ||||
| 
 | ||||
| [module/i3] | ||||
| type = internal/i3 | ||||
| pin-workspaces = true | ||||
| strip-wsnumbers = false | ||||
| index-sort = true | ||||
| enable-click = true | ||||
| enable-scroll = true | ||||
| wrapping-scroll = false | ||||
| reverse-scroll = true | ||||
| fuzzy-match = false | ||||
| 
 | ||||
| ws-icon-0 = "1;" | ||||
| ws-icon-1 = "2;" | ||||
| ws-icon-2 = "3;" | ||||
| ws-icon-3 = "4;" | ||||
| ws-icon-4 = "5;▲" | ||||
| ws-icon-5 = "6;▲" | ||||
| ws-icon-6 = "7;" | ||||
| ws-icon-7 = "8;" | ||||
| ws-icon-8 = "9;" | ||||
| ws-icon-9 = "10;" | ||||
| ws-icon-default = ? | ||||
| 
 | ||||
| format = <label-state> <label-mode> | ||||
| 
 | ||||
| label-mode = %mode% | ||||
| label-mode-padding = 2 | ||||
| label-mode-background = ${theme.redB} | ||||
| 
 | ||||
| label-focused = %index% %icon% | ||||
| label-focused-foreground = ${theme.background} | ||||
| label-focused-background = ${theme.greenB} | ||||
| label-focused-padding = 2 | ||||
| 
 | ||||
| label-unfocused = ${self.label-focused} | ||||
| label-unfocused-padding = ${self.label-focused-padding} | ||||
| 
 | ||||
| label-visible = ${self.label-focused} | ||||
| label-visible-padding = ${self.label-focused-padding} | ||||
| label-visible-foreground = ${theme.greenF} | ||||
| 
 | ||||
| label-urgent = ${self.label-focused} | ||||
| label-urgent-padding = ${self.label-focused-padding} | ||||
| label-urgent-foreground = ${theme.foreground} | ||||
| label-urgent-background = ${theme.redB} | ||||
| 
 | ||||
| [module/mpd] | ||||
| type = internal/mpd | ||||
| ; format-online = <icon-prev> <icon-seekb> <icon-stop> <toggle> <icon-seekf> <icon-next>  <icon-repeat> <icon-random>  <bar-progress> <label-time>  <label-song> | ||||
| format-online = <icon-prev> <icon-seekb> <icon-stop> <toggle> <icon-seekf> <icon-next>  <icon-repeat> <icon-random> <label-time> <label-song> | ||||
| format-playing = ${self.format-online} | ||||
| format-paused = ${self.format-online} | ||||
| format-stopped = <toggle> | ||||
| 
 | ||||
| label-song =  %title% - %artist% | ||||
| label-song-maxlen = 25 | ||||
| label-song-ellipsis = true | ||||
| 
 | ||||
| label-time = %elapsed%/%total% | ||||
| 
 | ||||
| label-offline =  | ||||
| 
 | ||||
| icon-play =  | ||||
| icon-pause =  | ||||
| icon-stop =  | ||||
| icon-prev =  | ||||
| icon-next =  | ||||
| icon-seekb =  | ||||
| icon-seekf =  | ||||
| icon-random =  | ||||
| icon-repeat =  | ||||
| icon-repeatone = 1 | ||||
| 
 | ||||
| toggle-on-foreground = ${theme.foreground} | ||||
| toggle-off-foreground = #55 | ||||
| 
 | ||||
| 
 | ||||
| [module/xbacklight] | ||||
| type = internal/xbacklight | ||||
| output = LVDS1 | ||||
| enable-scroll = true | ||||
| format = <ramp> | ||||
| ramp-0 = 🌕 | ||||
| ramp-1 = 🌔 | ||||
| ramp-2 = 🌓 | ||||
| ramp-3 = 🌒 | ||||
| ramp-4 = 🌑 | ||||
| format-foreground = ${theme.redF} | ||||
| 
 | ||||
| [module/backlight-acpi] | ||||
| inherit = module/xbacklight | ||||
| type = internal/backlight | ||||
| card = intel_backlight | ||||
| 
 | ||||
| [module/cpu] | ||||
| type = internal/cpu | ||||
| interval = 0.5 | ||||
| format = <ramp-coreload> | ||||
| format-foreground = ${theme.redF} | ||||
| ramp-coreload-0 = ▁ | ||||
| ramp-coreload-1 = ▂ | ||||
| ramp-coreload-2 = ▃ | ||||
| ramp-coreload-3 = ▄ | ||||
| ramp-coreload-4 = ▅ | ||||
| ramp-coreload-5 = ▆ | ||||
| ramp-coreload-6 = ▇ | ||||
| ramp-coreload-7 = █ | ||||
| 
 | ||||
| [module/memory] | ||||
| type = internal/memory | ||||
| interval = 2 | ||||
| format-foreground = ${theme.greenF} | ||||
| label =  %gb_free% | ||||
| 
 | ||||
| [module/eth] | ||||
| type = internal/network | ||||
| interface = eth0 | ||||
| interval = 1 | ||||
| 
 | ||||
| format-connected =  <label-connected> | ||||
| ;label-connected = %local_ip% (↑%upspeed% ↓%downspeed%) | ||||
| label-connected = %local_ip% | ||||
| format-connected-foreground = ${theme.blueF} | ||||
| 
 | ||||
| format-disconnected = | ||||
| 
 | ||||
| [module/wlan] | ||||
| type = internal/network | ||||
| interface = wlan0 | ||||
| interval = 1 | ||||
| 
 | ||||
| format-connected = <ramp-signal> <label-connected> | ||||
| ;label-connected = %local_ip% %essid% (↑%upspeed% ↓%downspeed%) | ||||
| label-connected = %local_ip% %essid% | ||||
| format-connected-foreground = ${theme.cyanF} | ||||
| 
 | ||||
| format-disconnected = | ||||
| 
 | ||||
| ramp-signal-0 = ▁ | ||||
| ramp-signal-1 = ▂ | ||||
| ramp-signal-2 = ▃ | ||||
| ramp-signal-3 = ▄ | ||||
| ramp-signal-4 = ▅ | ||||
| ramp-signal-5 = ▆ | ||||
| ramp-signal-6 = ▇ | ||||
| ramp-signal-7 = █ | ||||
| 
 | ||||
| animation-packetloss-0 =  | ||||
| animation-packetloss-1 =  | ||||
| animation-packetloss-framerate = 500 | ||||
| 
 | ||||
| [module/date] | ||||
| type = internal/date | ||||
| interval = 1 | ||||
| 
 | ||||
| date = | ||||
| date-alt = " %d/%m/%Y" | ||||
| 
 | ||||
| time =  %H:%M | ||||
| time-alt =  %H:%M:%S | ||||
| 
 | ||||
| format = <label> | ||||
| format-foreground = ${theme.cyanF} | ||||
| 
 | ||||
| label = %date% %time% | ||||
| 
 | ||||
| [module/volume] | ||||
| type = internal/volume | ||||
| 
 | ||||
| master-soundcard = default | ||||
| format-volume = <ramp-volume> <label-volume> | ||||
| format-volume-foreground = ${theme.greenF} | ||||
| 
 | ||||
| label-muted =  | ||||
| label-muted-foreground = #66 | ||||
| format-muted-foreground = ${self.format-volume-foreground} | ||||
| 
 | ||||
| ramp-volume-0 =  | ||||
| ramp-volume-1 =  | ||||
| ramp-volume-2 =  | ||||
| 
 | ||||
| [module/battery] | ||||
| type = internal/battery | ||||
| battery = BAT0 | ||||
| adapter = ADP0 | ||||
| full-at = 100 | ||||
| time-format = %H:%M | ||||
| 
 | ||||
| label-full =  | ||||
| 
 | ||||
| format-charging = <ramp-capacity> <label-charging> | ||||
| format-charging-foreground = ${theme.yellowF} | ||||
| label-charging = %percentage%% (%time%) | ||||
| 
 | ||||
| format-discharging = <ramp-capacity> <label-discharging> | ||||
| format-discharging-foreground = ${self.format-charging-foreground} | ||||
| format-discharging-background = ${theme.redB} | ||||
| label-discharging = %percentage%% (%time%) | ||||
| 
 | ||||
| format-full-prefix = " " | ||||
| format-full-foreground = ${self.format-charging-foreground} | ||||
| 
 | ||||
| ramp-capacity-0 =  | ||||
| ramp-capacity-1 =  | ||||
| ramp-capacity-2 =  | ||||
| ramp-capacity-3 =  | ||||
| ramp-capacity-4 =  | ||||
| 
 | ||||
| [module/temperature] | ||||
| type = internal/temperature | ||||
| thermal-zone = 2 | ||||
| warn-temperature = 60 | ||||
| 
 | ||||
| format = <ramp> <label> | ||||
| format-foreground = ${theme.yellowB} | ||||
| label = %temperature% | ||||
| 
 | ||||
| format-warn = <ramp> <label-warn> | ||||
| format-warn-foreground = ${self.format-foreground} | ||||
| format-warn-background = ${theme.redB} | ||||
| label-warn = %temperature% | ||||
| 
 | ||||
| ramp-0 =  | ||||
| ramp-1 =  | ||||
| ramp-2 =  | ||||
| ramp-3 =  | ||||
| 
 | ||||
| [settings] | ||||
| screenchange-reload = true | ||||
| ;compositing-background = xor | ||||
| ;compositing-background = screen | ||||
| ;compositing-foreground = source | ||||
| ;compositing-border = over | ||||
| 
 | ||||
| [global/wm] | ||||
| margin-top = 5 | ||||
| margin-bottom = 5 | ||||
| 
 | ||||
| ; vim:ft=dosini | ||||
							
								
								
									
										16
									
								
								config/polybar/launch.sh
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										16
									
								
								config/polybar/launch.sh
									
										
									
									
									
										Executable file
									
								
							|  | @ -0,0 +1,16 @@ | |||
| #!/usr/bin/env sh | ||||
| 
 | ||||
| # Terminate already running bar instances | ||||
| killall -q polybar | ||||
| 
 | ||||
| # Wait until the processes have been shut down | ||||
| while pgrep -x polybar >/dev/null; do sleep 1; done | ||||
| 
 | ||||
| # Launch bar for each display | ||||
| polybar -m | cut -d':' -f1 | while read display | ||||
| do | ||||
|     MONITOR=$display polybar example & | ||||
| done | ||||
| 
 | ||||
| echo "Bars launched..." | ||||
| 
 | ||||
|  | @ -230,6 +230,11 @@ python $HOME/.vim/bundle/YouCompleteMe/install.py $YCM_ARGS | |||
| if [ $GUI == 1 ]; then | ||||
|     # Desktop manager | ||||
|     inst i3 i3lock i3status dunst unclutter xautolock feh numlockx scrot xterm xclip | ||||
|     if [ $ARCH == 1 ]; then | ||||
|         altInst polybar-git ttf-font-awesome | ||||
|     else | ||||
|         echo "TODO compile polybar-git" | ||||
|     fi | ||||
|     if [ $DEBIAN == 1 ]; then | ||||
|         inst suckless-tools | ||||
|         if [ $ADMIN == 0 ]; then | ||||
|  | @ -282,7 +287,7 @@ if [ $EXTRA == 1 ]; then | |||
|     inst sl ffmpeg youtube-dl | ||||
| 
 | ||||
|     if [ $ARCH == 1 ]; then | ||||
|         altInst pdftk translate-shell git-lfs js-beautify insect | ||||
|         altInst pdftk translate-shell git-lfs js-beautify insect visidata-git | ||||
|     fi | ||||
| 
 | ||||
|     # Extra GUI | ||||
|  |  | |||
|  | @ -69,13 +69,14 @@ function replaceImg { # candidate original | |||
|     else | ||||
|         echo "→ Candidate don't have the same bit map as original, skipping!" | ||||
|     fi | ||||
|     rm "$ppmc" "$ppmo" "$c" | ||||
|     rm -f "$ppmc" "$ppmo" "$c" | ||||
| 
 | ||||
| } | ||||
| 
 | ||||
| # JPEG (requires jpegtran) | ||||
| while read image | ||||
| do | ||||
|     if [ -z "$image" ]; then continue; fi | ||||
|     echo Processing $image | ||||
| 
 | ||||
|     prog=$(mktemp --suffix .jpg) | ||||
|  | @ -103,6 +104,7 @@ done <<< "$(find "$dir" -type f -iregex ".+.jpe?g$")" | |||
| # PNG (requires optipng) | ||||
| while read image | ||||
| do | ||||
|     if [ -z "$image" ]; then continue; fi | ||||
|     echo Processing $image | ||||
| 
 | ||||
|     temp=$(mktemp --suffix .png) | ||||
|  | @ -117,6 +119,7 @@ done <<< "$(find "$dir" -type f -iname "*.png")" | |||
| # SVG (requires svgo) | ||||
| while read image | ||||
| do | ||||
|     if [ -z "$image" ]; then continue; fi | ||||
|     echo Processing $image | ||||
| 
 | ||||
|     temp=$(mktemp --suffix .svg) | ||||
|  | @ -128,9 +131,6 @@ do | |||
| 
 | ||||
| done <<< "$(find "$dir" -type f -iname "*.svg")" | ||||
| 
 | ||||
| # GIT (requires git) | ||||
| find "$dir" -type d -name .git -print0 | while IFS= read -r -d '' dir; do | ||||
|     (cd "$dir"; git gc) | ||||
| done | ||||
| cleandev | ||||
| 
 | ||||
| showtotal | ||||
|  |  | |||
							
								
								
									
										21
									
								
								scripts/rep
									
										
									
									
									
								
							
							
						
						
									
										21
									
								
								scripts/rep
									
										
									
									
									
								
							|  | @ -1,4 +1,25 @@ | |||
| #!/usr/bin/env bash | ||||
| 
 | ||||
| # Moves a file to another place and put a symbolic link in place | ||||
| 
 | ||||
| function proxy_help { | ||||
|     echo "Usage: $0 SOURCE DEST" | ||||
|     echo | ||||
|     echo "Arguments:" | ||||
|     echo "    SOURCE File to be moved" | ||||
|     echo "    DEST   Where to be moved" | ||||
|     return 0 | ||||
| } | ||||
| 
 | ||||
| mv "$1" "$2" | ||||
| ln -s "$2" "$1" | ||||
| 
 | ||||
| # MAIN | ||||
| command="$1" | ||||
| shift | ||||
| if type "proxy_$command" &> /dev/null; then | ||||
|     "proxy_$command" "$@" | ||||
| else | ||||
|     proxy_help | ||||
| fi | ||||
| 
 | ||||
|  |  | |||
							
								
								
									
										1
									
								
								vimrc
									
										
									
									
									
								
							
							
						
						
									
										1
									
								
								vimrc
									
										
									
									
									
								
							|  | @ -110,6 +110,7 @@ syntax enable | |||
| 
 | ||||
| set background=dark | ||||
| colorscheme molokai | ||||
| let g:molokai_original = 1 | ||||
| 
 | ||||
| " From http://stackoverflow.com/a/5004785/2766106 | ||||
| set list | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue