Fix merging error

.config/conky/conky_smallScreen.conf

@@ -1,49 +1,50 @@
-# For ideas about how to modify the conky conf, please see:
-# https://github.com/Toory/Conky-config
-#
-##############################################
-#  Settings
-##############################################
-alignment top_right
-background yes
-border_width 1
-color0 0077FF 
-color1 991F00 
-color2 0000FF 
-color3 eb91df 
-color4 f2c55a 
-color5 a7f0e3
-cpu_avg_samples 2
-default_color white
-default_outline_color green
-default_shade_color red
-double_buffer yes
-draw_borders no
-draw_graph_borders yes
-draw_outline no
-draw_shades no
-gap_x 0
-gap_y 15
-maximum_width 200
-minimum_size 0 0
-no_buffers yes
-override_utf8_locale yes
-own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager
-own_window_transparent no
-own_window_type normal
-own_window yes
-total_run_times 0
-update_interval 1
-uppercase no
-use_spacer right
-use_xft yes
-xftalpha 0.8
-xftfont  Bitstream Vera Sans Mono:size=8
-own_window_argb_value 100
-own_window_argb_visual yes
-own_window_colour 000000
 
-TEXT
+--##############################################
+--#  Settings
+--##############################################
+conky.config = {
+	alignment = top_right,
+	--background = true,
+	border_width = 1,
+	color0 = '0077FF',
+	color1 = '991F00',
+	color2 = '0000FF',
+	color3 = 'eb91df',
+	color4 = 'f2c55a',
+	color5 = 'a7f0e3',
+	cpu_avg_samples = 2,
+	default_color = white,
+	default_outline_color = green,
+	default_shade_color = red,
+	double_buffer = true,
+	draw_borders = false,
+	draw_graph_borders = true,
+	draw_outline = false,
+	draw_shades = false,
+	gap_x = 1166,
+	gap_y = 15,
+	minimum_width = 200,
+	maximum_width = 200,
+	minimum_height = 768,
+	no_buffers = true,
+	override_utf8_locale = true,
+	own_window = true,
+	own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager',
+	--own_window_transparent = true,
+	own_window_argb_visual = true,
+	own_window_argb_value = 100,
+	own_window_type = 'normal',
+	--own_window_color = 000000
+	total_run_times = 0,
+	update_interval = 1,
+	uppercase = false,
+	use_spacer = right,
+	use_xft = true,
+	xftalpha = 0.8,
+	font = 'Bitstream Vera Sans Mono:size=8',
+}
+
+conky.text = [[
 ##############################################
 #DATE
 ##############################################
@@ -108,5 +109,5 @@ ${downspeedgraph wlp1s0 99cc33 006600}
 Down: $alignc ${downspeed wlp1s0}/s $alignr tot: ${totaldown wlp1s0}
 ${upspeedgraph wlp1s0 ffcc00 ff0000}
 Up: $alignc ${upspeed wlp1s0}/s $alignr tot: ${totalup wlp1s0}
-
+]]
 

.config/qutebrowser/quickmarks

@@ -33,3 +33,6 @@ password generator https://passwordsgenerator.net/
 leftvalues quiz values left politic https://leftvalues.github.io/
 canard réfractaire peertube https://canard.tube/accounts/yohan/video-channels
 8values quiz political https://8values.github.io/index.html
+lorem picsum picture https://picsum.photos/
+webmail cmnet acg https://webmail.acg-geneve.ch/lm_auth_proxy?DoLMLogin?curl=L2f&curlid=3772153266-622203423
+infokiosques bibliothèque livres anarchisme féminisme https://infokiosques.net/