Tweak network and add cpu freq

config.h

@@ -65,13 +65,14 @@ static const struct arg args[] = {
 	/* function format          argument */
 	{ kernel_release,	" %s |",		NULL		},
 	{ keymap,		" %s |",		NULL		},
-	{ load_avg,		" %s |",		NULL		},
+//	{ battery_perc,		" %s% |",		"CMB1"		},
+//	{ temp,			" %s°C |",		"/sys/class/thermal/thermal_zone0/temp"},
+	{ load_avg,		" %s @",		NULL		},
+	{ cpu_freq,		" %sHz |",		NULL		},
 	{ ram_used,		" %sB /",		NULL		},
 	{ ram_free,		" %sB |",		NULL		},
-	{ swap_used,		" %sB /",		NULL		},
-	{ swap_free,		" %sB |",		NULL		},
-	{ netspeed_rx,		" %7.7sB/s",		"twg0"		},
-	{ netspeed_tx,		" %7.7sB/s |",		"twg0"		},
+	{ netspeed_rx,		" %7.7sB/s",		"wg0"		},
+	{ netspeed_tx,		" %7.7sB/s |",		"wg0"		},
 	{ uptime,		" %s |",		NULL		},
 	{ datetime,		" %s ",			"%a %d/%m %T"	},
 };

slstatus.1

@@ -1,8 +1,13 @@
+<<<<<<< HEAD
 .Dd 2023-04-23
+=======
+.Dd 2017-08-10
+>>>>>>> 4cc3a15 (Tweak network and add cpu freq)
 .Dt SLSTATUS 1
 .Os
 .Sh NAME
 .Nm slstatus
+<<<<<<< HEAD
 .Nd suckless status
 .Sh SYNOPSIS
 .Nm
@@ -17,22 +22,38 @@ property of the root window (used by
 .Xr dwm 1 ) or standard input/output. It is designed to be as efficient as possible by
 only issuing the minimum of system calls required.
 .P
+=======
+.Nd suckless status monitor
+.Sh SYNOPSIS
+.Nm
+.Op Fl s
+.Sh DESCRIPTION
+.Nm
+is a suckless status monitor for window managers that use WM_NAME (e.g. dwm) or
+stdin to fill the status bar.
+>>>>>>> 4cc3a15 (Tweak network and add cpu freq)
 By default,
 .Nm
 outputs to WM_NAME.
 .Sh OPTIONS
 .Bl -tag -width Ds
+<<<<<<< HEAD
 .It Fl v
 Print version information to stderr, then exit.
 .It Fl s
 Write to stdout instead of WM_NAME.
 .It Fl 1
 Write once to stdout and quit.
+=======
+.It Fl s
+Write to stdout instead of WM_NAME.
+>>>>>>> 4cc3a15 (Tweak network and add cpu freq)
 .El
 .Sh CUSTOMIZATION
 .Nm
 can be customized by creating a custom config.h and (re)compiling the source
 code. This keeps it fast, secure and simple.
+<<<<<<< HEAD
 .Sh SIGNALS
 .Nm
 responds to the following signals:
@@ -45,3 +66,5 @@ Triggers an instant redraw.
 See the LICENSE file for the authors.
 .Sh SEE ALSO
 .Xr dwm 1
+=======
+>>>>>>> 4cc3a15 (Tweak network and add cpu freq)