Merge pull request #36 from TheFatDemon/master

Updated default conky config to monitor Mac Networking
brndnmtthws · Aug 6, 2018 · 147499f · 147499f
2 parents 9b2adc5 + 4b562bb
commit 147499f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/cmake/ConkyBuildOptions.cmake b/cmake/ConkyBuildOptions.cmake
@@ -63,6 +63,12 @@ if (NOT LIB_INSTALL_DIR)
 endif (NOT LIB_INSTALL_DIR)
 set(PACKAGE_LIBRARY_DIR "${LIB_INSTALL_DIR}/conky" CACHE STRING "Package library path (where Lua bindings are installed" FORCE)
 set(DEFAULTNETDEV "eth0" CACHE STRING "Default networkdevice")
+
+# Mac only override
+if(OS_DARWIN)
+	set(DEFAULTNETDEV "en0" CACHE STRING "Default networkdevice" FORCE)
+endif(OS_DARWIN)
+
 set(XDG_CONFIG_FILE "$HOME/.config/conky/conky.conf" CACHE STRING "Configfile of the user (XDG)")
 set(CONFIG_FILE "$HOME/.conkyrc" CACHE STRING "Configfile of the user")
 set(MAX_USER_TEXT_DEFAULT "16384" CACHE STRING "Default maximum size of config TEXT buffer, i.e. below TEXT line.")
@@ -115,7 +121,14 @@ endif(BUILD_NCURSES)
 option(BUILD_X11 "Build X11 support" true)
 if(BUILD_X11)
 	option(OWN_WINDOW "Enable own_window support" true)
-	option(BUILD_XDAMAGE "Build Xdamage support" true)
+
+	# Mac Fix
+	if(OS_DARWIN)
+		option(BUILD_XDAMAGE "Build Xdamage support" false)
+	else(OS_DARWIN)
+		option(BUILD_XDAMAGE "Build Xdamage support" true)
+	endif(OS_DARWIN)
+
 	option(BUILD_XINERAMA "Build Xinerama support" true)
 	option(BUILD_XDBE "Build Xdbe (double-buffer) support" true)
 	option(BUILD_XFT "Build Xft (freetype fonts) support" true)

diff --git a/data/conky.conf b/data/conky.conf
@@ -72,7 +72,7 @@ $hr
 ${color grey}File systems:
  / $color${fs_used /}/${fs_size /} ${fs_bar 6 /}
 ${color grey}Networking:
-Up:$color ${upspeed eth0} ${color grey} - Down:$color ${downspeed eth0}
+Up:$color ${upspeed} ${color grey} - Down:$color ${downspeed}
 $hr
 ${color grey}Name              PID   CPU%   MEM%
 ${color lightgrey} ${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1}

diff --git a/data/conky_no_x11.conf b/data/conky_no_x11.conf
@@ -46,7 +46,7 @@ Processes: $processes  Running: $running_processes
 File systems:
  / ${fs_used /}/${fs_size /} ${fs_bar 6 /}
 Networking:
-Up: ${upspeed eth0}  - Down: ${downspeed eth0}
+Up: ${upspeed}  - Down: ${downspeed}
 Name              PID   CPU%   MEM%
  ${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1}
  ${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2}