6d9ba8a1d82655f21bb1054f5120c87fc56b2c0a

Message

Fix formatting

Diff

This diff is truncated to protect this page.

  1diff --git a/dot_local/bin/executable_flac2mp3 b/dot_local/bin/executable_flac2mp3
  2index 0c55d59be4bf09b6e29919624a394bc098e40365..1dbafe45bf93a2e9cc058300dfd6d239d9a82e5b 100644
  3--- a/dot_local/bin/executable_flac2mp3
  4+++ b/dot_local/bin/executable_flac2mp3
  5@@ -1,4 +1,3 @@
  6 #!/bin/zsh
  7 
  8 ffmpeg -n -i "$1" -acodec libmp3lame -ab 320k -map_metadata 0 -id3v2_version 3 "$2" &> /dev/null
  9-
 10diff --git a/dot_local/bin/executable_genpass b/dot_local/bin/executable_genpass
 11index c63f5c442f15617f2c437bacfae7a5bf7ec3d915..52cc23c84488d567e6bdb2aadd419a97af719ec5 100644
 12--- a/dot_local/bin/executable_genpass
 13+++ b/dot_local/bin/executable_genpass
 14@@ -2,46 +2,46 @@
 15 
 16 function usage()
 17 {
 18-  local just_help=$1
 19-  local missing_required=$2
 20-  local invalid_argument=$3
 21-  local invalid_option=$4
 22+	local just_help=$1
 23+	local missing_required=$2
 24+	local invalid_argument=$3
 25+	local invalid_option=$4
 26 
 27-  local help="Usage: genpass -c COUNT [OPTION] [SET]
 28+	local help="Usage: genpass -c COUNT [OPTION] [SET]
 29 
 30 Generate random password from /dev/urandom using the character set chosen
 31 
 32 Option (pick one character set):"
 33-  local help_options="    \-a ,\--all\ all printable characters, not including space
 34-    \-lt ,\--limited\ all except special characters [A-Za-z0-9%+,-./:=@^_]
 35-    \-an ,\--alphanumeric\ letters and digits
 36-    \-al ,\--alpha\ letters
 37-    \-u ,\--upper\ upper case letters
 38-    \-l ,\--lower\ lower case letters
 39-    \-n ,\--numeric\ digits
 40-    \-h ,\--hex\ hexadecimal digits
 41-    \-c ,\--count <length>\ Length of password to generate
 42-    \[SET]\ \ Other character SET compatible with tr
 43+local help_options="\t\-a ,\--all\ all printable characters, not including space
 44+	\t\-lt ,\--limited\ all except special characters [A-Za-z0-9%+,-./:=@^_]
 45+	\t\-an ,\--alphanumeric\ letters and digits
 46+	\t\-al ,\--alpha\ letters
 47+	\t\-u ,\--upper\ upper case letters
 48+	\t\-l ,\--lower\ lower case letters
 49+	\t\-n ,\--numeric\ digits
 50+	\t\-h ,\--hex\ hexadecimal digits
 51+	\t\-c ,\--count <length>\ Length of password to generate
 52+	\t\[SET]\ \ Other character SET compatible with tr
 53 "
 54 
 55-  if [ "$missing_required" != "" ]
 56-  then
 57-    echo "Missing required argument: $missing_required"
 58-  fi
 59+	if [ "$missing_required" != "" ]
 60+	then
 61+		echo "Missing required argument: $missing_required"
 62+	fi
 63 
 64-  if [ "$invalid_option" != "" ] && [ "$invalid_value" = "" ]
 65-  then
 66-    echo "Invalid option: $invalid_option"
 67-  elif [ "$invalid_value" != "" ]
 68-  then
 69-    echo "Invalid value: $invalid_value for option: --$invalid_option"
 70-  fi
 71+	if [ "$invalid_option" != "" ] && [ "$invalid_value" = "" ]
 72+	then
 73+		echo "Invalid option: $invalid_option"
 74+	elif [ "$invalid_value" != "" ]
 75+	then
 76+		echo "Invalid value: $invalid_value for option: --$invalid_option"
 77+	fi
 78 
 79-  echo -e "
 80+	echo -e "
 81 "
 82-  echo "$help"
 83-  echo "$help_options" | column -t -s'\'
 84-  return
 85+	echo "$help"
 86+	echo "$help_options" | column -t -s'\'
 87+	return
 88 }
 89 function init_args()
 90 {
 91@@ -54,80 +54,79 @@ do
 92 key="$1"
 93 
 94 case $key in
 95-  -a|--all)
 96-    all="true"
 97-    characters="[:graph:]"
 98-    shift
 99-    ;;
100-  -lt|--limited)
101-    special="true"
102-    characters="A-Za-z0-9%+,-./:=@^_"
103-    shift
104-    ;;
105-  -an|--alphanumeric)
106-    alphanumeric="true"
107-    characters="[:alnum:]"
108-    shift
109-    ;;
110-  -al|--alpha)
111-    alpha="true"
112-    characters="[:alpha:]"
113-    shift
114diff --git a/dot_local/bin/executable_smart-resize b/dot_local/bin/executable_smart-resize
115index 8ab4460c6693a5a485c7cb2bd46d203eb8ef7f63..d5db454c045abf52fc3a0dd088e8895639144485 100644
116--- a/dot_local/bin/executable_smart-resize
117+++ b/dot_local/bin/executable_smart-resize
118@@ -18,4 +18,3 @@ if (( XRES > YRES )); then
119 else
120 	convert $1 -resize x$2 $1
121 fi
122-
123diff --git a/dot_local/bin/executable_start-ssh-agent b/dot_local/bin/executable_start-ssh-agent
124index 9b9c56daf546d266182e8bf6c12b5a45a297afd7..cb1d0d01101d6e55b9f922e543891444a695a593 100644
125--- a/dot_local/bin/executable_start-ssh-agent
126+++ b/dot_local/bin/executable_start-ssh-agent
127@@ -2,21 +2,21 @@
128 SSH_ENV="$HOME/.ssh/environment"
129 
130 function start_agent {
131-     echo "Initialising new SSH agent..."
132-     /usr/bin/ssh-agent | sed 's/^echo/#echo/' > "${SSH_ENV}"
133-     echo succeeded
134-     chmod 600 "${SSH_ENV}"
135-     . "${SSH_ENV}" > /dev/null
136+	echo "Initialising new SSH agent..."
137+	/usr/bin/ssh-agent | sed 's/^echo/#echo/' > "${SSH_ENV}"
138+	echo succeeded
139+	chmod 600 "${SSH_ENV}"
140+	. "${SSH_ENV}" > /dev/null
141 }
142 
143 # Source SSH settings, if applicable
144 
145 if [ -f "${SSH_ENV}" ]; then
146-     . "${SSH_ENV}" > /dev/null
147-     #ps ${SSH_AGENT_PID} doesn't work under cywgin
148-     ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
149-         start_agent;
150-     }
151+	. "${SSH_ENV}" > /dev/null
152+	#ps ${SSH_AGENT_PID} doesn't work under cywgin
153+	ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
154+		start_agent;
155+	}
156 else
157-     start_agent;
158+	start_agent;
159 fi
160diff --git a/dot_local/bin/executable_testcolor b/dot_local/bin/executable_testcolor
161index a1381187997a0e758ebaf2f18088873f9fe831fa..19e7ab0d402eee65ea4d52c3ff086f5bc65032e6 100644
162--- a/dot_local/bin/executable_testcolor
163+++ b/dot_local/bin/executable_testcolor
164@@ -13,31 +13,30 @@
165 # first the system ones:
166 print "ANSI colors:\n";
167 for ($color = 0; $color < 8; $color++) {
168-    print "\x1b[48;5;${color}m       ";
169+	print "\x1b[48;5;${color}m       ";
170 }
171 print "\x1b[0m\n";
172 for ($color = 8; $color < 16; $color++) {
173-    print "\x1b[48;5;${color}m       ";
174+	print "\x1b[48;5;${color}m       ";
175 }
176 print "\x1b[0m\n\n";
177 
178 # now the color cube
179 print "Color cube, 6x6x6:\n";
180 for ($green = 0; $green < 6; $green++) {
181-    for ($red = 0; $red < 6; $red++) {
182-	for ($blue = 0; $blue < 6; $blue++) {
183-	    $color = 16 + ($red * 36) + ($green * 6) + $blue;
184-	    print "\x1b[48;5;${color}m  ";
185+	for ($red = 0; $red < 6; $red++) {
186+		for ($blue = 0; $blue < 6; $blue++) {
187+			$color = 16 + ($red * 36) + ($green * 6) + $blue;
188+			print "\x1b[48;5;${color}m  ";
189+		}
190+		print "\x1b[0m ";
191 	}
192-	print "\x1b[0m ";
193-    }
194-    print "\n";
195+	print "\n";
196 }
197 
198 # now the grayscale ramp
199 print "Grayscale ramp:\n";
200 for ($color = 232; $color < 256; $color++) {
201-    print "\x1b[48;5;${color}m  ";
202+	print "\x1b[48;5;${color}m  ";
203 }
204 print "\x1b[0m\n";
205-
206diff --git a/dot_local/bin/executable_testtruecolor b/dot_local/bin/executable_testtruecolor
207index 19349cbe17ac65eebab5f07eeae3c8f712108550..7201544bc6ba98c97eb7d5577738e13f20bced42 100644
208--- a/dot_local/bin/executable_testtruecolor
209+++ b/dot_local/bin/executable_testtruecolor
210@@ -14,4 +14,3 @@ awk -v term_cols="${width:-$(tput cols || echo 80)}" 'BEGIN{
211     }
212     printf "\n";
213 }'
214-
215diff --git a/dot_spacevim b/dot_spacevim
216index 7654be061096097f8b6efb0d3732b2883eb3237f..d1796c3e57a6b317ebb422db83e00edd6359080e 100644
217--- a/dot_spacevim
218+++ b/dot_spacevim
219@@ -231,7 +231,6 @@ function! UserConfig()
220 		autocmd Filetype php setl et ts=4 sw=4 sts=4 tw=0
221 		autocmd Filetype c,cpp setl noet ts=4 sts=4 sw=4
222 		autocmd Filetype rst setl autoindent& cindent& smartindent& indentexpr& et ts=4 sts=4 sw=4
223-		autocmd Filetype markdown setl et ts=2 sts=2 sw=2
224 		autocmd Filetype tex setl et ts=4 sts=4 sw=4
225 		autocmd Filetype nginx setl noet ts=4 sts=4 sw=4
226 	augroup END
227@@ -284,9 +283,10 @@ function! UserConfig()
228 				\ 'cpp': ['gcc'],
229 				\ 'vue': ['eslint'],
230 				\ 'javascript': ['eslint'],
231+				\ 'cloudformation': ['cloudformation'],
232 				\ }
233 	let g:ale_lint_on_insert_leave = 1
234-	let g:ale_fix_on_save = 0
235+	let g:ale_fix_on_save = 1
236 
237 	" fzf config
238 	let g:fzf_colors = {
239@@ -323,4 +323,3 @@ function! UserConfig()
240 	let g:Hexokinase_ftAutoload = ['css', 'scss', 'sass', 'stylus']
241 
242 endfunction
243-
244diff --git a/dot_xinitrc b/dot_xinitrc
245index 3963759dcc7c673d11ec2ff0f6647526a2f9d051..7d69c2d0c87f54a29224a6c01c7f628beba67e27 100644
246--- a/dot_xinitrc
247+++ b/dot_xinitrc
248@@ -20,7 +20,7 @@ xhost +localhost
249 xhost +calcium
250 xhost +neon
251 xbindkeys
252-feh --bg-fill /home/pavle/pictures/wallpapers/arboreal_serenity.jpg
253+feh --bg-fill /home/pavle/pictures/wallpapers/ltt.png
254 dunst &
255 
256 exec i3
257diff --git a/dot_zshrc b/dot_zshrc
258index 736c87c8edf080a05af94b9c7ada43d62bfdf92c..1f7e49bea3a1de7c6170246d14878b5a151251fc 100644
259--- a/dot_zshrc
260+++ b/dot_zshrc
261@@ -152,4 +152,3 @@ export FZF_DEFAULT_OPTS='
262 '
263 
264 source ~/.local/bin/start-ssh-agent
265-