diff --git a/.bin/cbar.c b/.bin/cbar.c deleted file mode 100644 index 31932b4..0000000 --- a/.bin/cbar.c +++ /dev/null @@ -1,223 +0,0 @@ -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include -#include -#include - -#include - -#include - -#include - - -static char battery_percent[24]; -static char cpu_temp[24]; -static char fan_speed[24]; -static char cpu_base_speed[24]; -static char cpu_avg_speed[24]; -static char volume[24]; - -void volume_changed(void *addr, unsigned int vol) { - const wchar_t ico_vol = 0xF028; //  - printf("onvol invoked\n"); - snprintf(volume,sizeof(volume), "%lc %2d%%", ico_vol, vol); -} - -void update_volume() { - struct sio_hdl *hdl; - - hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0); - - sio_onvol(hdl, volume_changed, NULL); - - sio_close(hdl); -} - -void update_cpu_base_speed() { - const wchar_t ico_freq = 0xE234; //  - int temp; - size_t templen = sizeof(temp); - - int mib[5] = { CTL_HW, HW_CPUSPEED }; // Lenovo x1g10 - if (sysctl(mib, 2, &temp, &templen, NULL, 0) == -1) - snprintf(cpu_base_speed,sizeof(cpu_base_speed), "%lc N/A", ico_freq); - else - snprintf(cpu_base_speed,sizeof(cpu_base_speed), "%lc %4dMhz", ico_freq, temp); -} - -void update_cpu_avg_speed() { - struct sensor sensor; - size_t templen = sizeof(sensor); - uint temp = 0; - - int i; - for (i = 0; i < 12; i++) { - int mib[5] = { CTL_HW, HW_SENSORS, 0, SENSOR_FREQ, 0 }; // Lenovo x1g10 - if (sysctl(mib, 5, &sensor, &templen, NULL, 0) != -1) { - temp += ( sensor.value / 1000000 / 1000000 ); - } - } - snprintf(cpu_avg_speed,sizeof(cpu_avg_speed), "%4dMhz", temp / i); -} - -void update_fan_speed() { - struct sensor sensor; - size_t templen = sizeof(sensor); - const wchar_t ico_fan = 0xF70F; //  - int temp = -1; - - // int mib[5] = { CTL_HW, HW_SENSORS, 5, SENSOR_FANRPM, 0 }; // Lenovo x230 - int mib[5] = { CTL_HW, HW_SENSORS, 12, SENSOR_FANRPM, 0 }; // Lenovo x1g10 - - if (sysctl(mib, 5, &sensor, &templen, NULL, 0) != -1) - temp = sensor.value; - snprintf(fan_speed,sizeof(fan_speed), "%lc %dRPM", ico_fan, temp); -} - -void update_cpu_temp() { - struct sensor sensor; - size_t templen = sizeof(sensor); - int temp = -1; - - const wchar_t ico_low = 0xF2CB; //  - const wchar_t ico_25 = 0xF2CA; //  - const wchar_t ico_50 = 0xF2C9; //  - const wchar_t ico_75 = 0xF2C8; //  - const wchar_t ico_high = 0xF2C7; //  - wchar_t ico_temp = 0xF2C9; - - - //int mib[5] = { CTL_HW, HW_SENSORS, 0, SENSOR_TEMP, 0 }; // cpu0.temp0 (x230) - int mib[5] = { CTL_HW, HW_SENSORS, 12, SENSOR_TEMP, 0 }; // acpitz0.temp0 (x1) - - if (sysctl(mib, 5, &sensor, &templen, NULL, 0) != -1) { - temp = (sensor.value - 273150000) / 1000000.0; - } - if(temp > 80) - ico_temp = ico_high; - else if (temp > 72) - ico_temp = ico_75; - else if (temp > 62) - ico_temp = ico_50; - else if (temp > 42) - ico_temp = ico_25; - else - ico_temp = ico_low; - snprintf(cpu_temp,sizeof(battery_percent), - "%lc %dC", ico_temp, temp); -} - -void update_battery() { - int fd; - struct apm_power_info pi; - - const wchar_t ico_empty = 0xF58D; //  - const wchar_t ico_10 = 0xF579; //  - const wchar_t ico_20 = 0xF57A; //  - const wchar_t ico_30 = 0xF57B; //  - const wchar_t ico_40 = 0xF57C; //  - const wchar_t ico_50 = 0xF57D; //  - const wchar_t ico_60 = 0xF57E; //  - const wchar_t ico_70 = 0xF57F; //  - const wchar_t ico_80 = 0xF580; //  - const wchar_t ico_90 = 0xF581; //  - const wchar_t ico_full = 0xF578; //  - - const wchar_t ico_chr = 0xE00A; //  - - const wchar_t ico_unknown = 0xF590; //  - - wchar_t ico_buf = ico_unknown; - wchar_t ico_chr_buf = 0x20; - - if ((fd = open("/dev/apm", O_RDONLY)) == -1 || - ioctl(fd, APM_IOC_GETPOWER, &pi) == -1 || - close(fd) == -1) { - strlcpy(battery_percent, "N/A", sizeof(battery_percent)); - return; - } - - if (pi.battery_state == APM_BATT_UNKNOWN || - pi.battery_state == APM_BATTERY_ABSENT) { - strlcpy(battery_percent, "N/A", sizeof(battery_percent)); - return; - } - if(pi.ac_state == APM_AC_ON) - ico_chr_buf = ico_chr; - else - ico_chr_buf = 0x20; - - if(pi.battery_life > 94) - ico_buf = ico_full; - else if(pi.battery_life > 90) - ico_buf = ico_90; - else if(pi.battery_life > 80) - ico_buf = ico_80; - else if(pi.battery_life > 70) - ico_buf = ico_70; - else if(pi.battery_life > 60) - ico_buf = ico_60; - else if(pi.battery_life > 50) - ico_buf = ico_50; - else if(pi.battery_life > 40) - ico_buf = ico_40; - else if(pi.battery_life > 30) - ico_buf = ico_30; - else if(pi.battery_life > 20) - ico_buf = ico_20; - else if(pi.battery_life > 10) - ico_buf = ico_10; - else - ico_buf = ico_empty; - - snprintf(battery_percent,sizeof(battery_percent), - "%lc%lc %d%%", ico_chr_buf, ico_buf, pi.battery_life); -} - -int main(int argc, const char *argv[]) -{ - setlocale(LC_CTYPE, "C"); - setlocale(LC_ALL, "en_US.UTF-8"); - - const wchar_t sep = 0xE621; //  - const wchar_t time = 0xE383; //  - - // registers a callback and updates the volume on change - update_volume(); - - while(1) { - - update_battery(); - update_cpu_temp(); - update_cpu_avg_speed(); - update_cpu_base_speed(); - update_fan_speed(); - - printf("%s", battery_percent); - printf(" %lc ", sep); - printf("%s", cpu_temp); - printf(" %lc ", sep); - printf("%s (~%s)", cpu_base_speed, cpu_avg_speed); - printf(" %lc ", sep); - printf("%s", fan_speed); - printf(" %lc ", sep); - printf("%s", volume); - printf(" %lc ", sep); - printf("%lc ", time); - printf("\n"); - - fflush(stdout); - sleep(2); - } - return 0; -} diff --git a/.config/spectrwm/spectrwm.conf b/.config/spectrwm/spectrwm.conf index 6bee184..31dda81 100644 --- a/.config/spectrwm/spectrwm.conf +++ b/.config/spectrwm/spectrwm.conf @@ -32,6 +32,7 @@ stack_mark_max = '' # Custom Quirks quirk[IPMIView20-IPMIView20:IPMIView20-IPMIView20] = FLOAT + ANYWHERE +quirk[scratchpad] = FLOAT + ANYWHERE # Window Manager Keys keyboard_mapping = ~/.config/spectrwm/spectrwm_map.conf @@ -52,6 +53,9 @@ bind[exec] = MOD+D program[ssh] = dexec_ssh bind[ssh] = MOD+S +program[scratchpad] = scratchpad +bind[scratchpad] = MOD+minus + program[apps] = dexec_apps bind[apps] = MOD+A diff --git a/.gdbearlyinit b/.gdbearlyinit new file mode 100644 index 0000000..b73aa96 --- /dev/null +++ b/.gdbearlyinit @@ -0,0 +1 @@ +set startup-quietly on diff --git a/.kshrc b/.kshrc index 2a8f61d..143e2ad 100644 --- a/.kshrc +++ b/.kshrc @@ -18,9 +18,12 @@ PATH=\ :/usr/games\ :/usr/ports/infrastructure/bin\ :/usr/local/cobol/bin -PATH="$PATH:/opt/zodiac/bin" +JAVA_HOME=/usr/local/jdk-11/bin +PATH=${PATH}:${JAVA_HOME} +PATH=${PATH}:/opt/zodiac/bin export PATH + MANPATH=/usr/share/man:/usr/X11R6/man:/usr/local/man export MANPATH diff --git a/.vim/vimrc b/.vim/vimrc index 46c0cb8..cc5c499 100644 --- a/.vim/vimrc +++ b/.vim/vimrc @@ -204,7 +204,7 @@ nnoremap :Texplore " TAGS FILE set tags="~/.dev/tags" nnoremap gt :cs find 1 =expand("") -nnoremap gg :cs find 4 =expand("") +nnoremap gs :cs find 4 =expand("") nnoremap gb nnoremap gh :FSHere @@ -220,6 +220,7 @@ xmap ga (EasyAlign) nmap ga (EasyAlign) " Compile Stuff +nnoremap mw :!cd /home/sdk/website && make nnoremap mm :call MyMake() nnoremap mr :!%:p:r function MyMake()