From ca373c992fd91c6e91d421766814c478238f052f Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 7 Jun 2024 16:14:43 +0300 Subject: [PATCH] Updated config.h --- config.h | 29 ++++++++++++++--------------- src/fetch.c | 3 +++ themes/default.h | 32 ++++++++++++++++++++++++++++++++ themes/mnnwvn.h | 31 +++++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+), 15 deletions(-) create mode 100644 themes/default.h create mode 100644 themes/mnnwvn.h diff --git a/config.h b/config.h index 26d2d7f..3947ab9 100644 --- a/config.h +++ b/config.h @@ -5,27 +5,26 @@ #include "structs.h" /* Config, EDIT THERE */ -#define COLORS " \033[31m<> \033[32m<> \033[33m<> \033[34m<> \033[35m<> \033[36m<>\033[0m" #define FONT_COLOR "\033[1;37m" #ifdef _MAIN_C +#define BORDER "-------------------" +#define STR1 "\033[1;37m Special for mnnwvn" +#define STR2 "\033[1;37m Edit config.h" + #define ON_ERROR_STR "none" PARAMETR CONFIG[] = { - {PrintOs, {.str0=" os ", .str1=NULL}}, - {GetKernel, {.str0=" kr ", .str1=NULL}}, - {GetUser, {.str0=" usr ", .str1=NULL}}, - {GetUptime, {.str0=" upt ", .str1=NULL}}, - {GetArch, {.str0=" arch ", .str1=NULL}}, - {GetShell, {.str0="shell ", .str1=NULL}}, - {GetPkg, {.str0=" pkgs ", .str1=NULL}}, - {GetMem, {.str0=" mem ", .str1=NULL}}, - {GetModel, {.str0="model ", .str1=NULL}}, - {GetHostname, {.str0=" host ", .str1=NULL}}, - {GetAVG, {.str0=" AVG ", .str1=NULL}}, - {Blank, {.str0=" ", .str1=NULL}}, - {Execute, {.str0=" Id's ", .str1=NULL, .str2="id -gn"}}, - {Blank, {.str0=COLORS, .str1=NULL}} + {Blank, {.str0=STR1, .str1=NULL}}, + {Blank, {.str0=BORDER, .str1=NULL}}, + {PrintOs, {.str0=" Distro: ", .str1=NULL}}, + {GetKernel, {.str0=" Kernel: ", .str1=NULL}}, + {GetUptime, {.str0=" Uptime: ", .str1=NULL}}, + {GetPkg, {.str0=" Packages: ", .str1=NULL}}, + {GetShell, {.str0=" Shell: ", .str1=NULL}}, + {GetMem, {.str0=" Memory: ", .str1=NULL}}, + {Blank, {.str0=BORDER, .str1=NULL}}, + {Blank, {.str0=STR2, .str1=NULL}} }; #endif diff --git a/src/fetch.c b/src/fetch.c index 5f21f64..c761d19 100644 --- a/src/fetch.c +++ b/src/fetch.c @@ -84,6 +84,9 @@ void GetArt(FETCH *fetch, int flag) { else if (strstr(fetch->os_name, "Mint")) SetArt(fetch, sizeof(Lmint), "dpkg -l | tail -n+6 | wc -l | tr -d ' '", Lmint, "\033[1;32m", flag); + else if (strstr(fetch->os_name, "OpenBSD")) + SetArt(fetch, sizeof(OpenBSD), "/bin/ls -1 /var/db/pkg/ | wc -l | tr -d ' '", OpenBSD, "\033[1;33m", flag); + else if (strstr(fetch->os_name, "Manana")) SetArt(fetch, sizeof(Manana), "pacman -Qq | wc -l", Manana, "\033[1;32m", flag); diff --git a/themes/default.h b/themes/default.h new file mode 100644 index 0000000..26d2d7f --- /dev/null +++ b/themes/default.h @@ -0,0 +1,32 @@ +#ifndef _CONFIG_H +#define _CONFIG_H + +#include "fetch.h" +#include "structs.h" + +/* Config, EDIT THERE */ +#define COLORS " \033[31m<> \033[32m<> \033[33m<> \033[34m<> \033[35m<> \033[36m<>\033[0m" +#define FONT_COLOR "\033[1;37m" + +#ifdef _MAIN_C +#define ON_ERROR_STR "none" + +PARAMETR CONFIG[] = { + {PrintOs, {.str0=" os ", .str1=NULL}}, + {GetKernel, {.str0=" kr ", .str1=NULL}}, + {GetUser, {.str0=" usr ", .str1=NULL}}, + {GetUptime, {.str0=" upt ", .str1=NULL}}, + {GetArch, {.str0=" arch ", .str1=NULL}}, + {GetShell, {.str0="shell ", .str1=NULL}}, + {GetPkg, {.str0=" pkgs ", .str1=NULL}}, + {GetMem, {.str0=" mem ", .str1=NULL}}, + {GetModel, {.str0="model ", .str1=NULL}}, + {GetHostname, {.str0=" host ", .str1=NULL}}, + {GetAVG, {.str0=" AVG ", .str1=NULL}}, + {Blank, {.str0=" ", .str1=NULL}}, + {Execute, {.str0=" Id's ", .str1=NULL, .str2="id -gn"}}, + {Blank, {.str0=COLORS, .str1=NULL}} +}; +#endif + +#endif diff --git a/themes/mnnwvn.h b/themes/mnnwvn.h new file mode 100644 index 0000000..7a6db58 --- /dev/null +++ b/themes/mnnwvn.h @@ -0,0 +1,31 @@ +#ifndef _CONFIG_H +#define _CONFIG_H + +#include "fetch.h" +#include "structs.h" + +/* Config, EDIT THERE */ +#define FONT_COLOR "\033[1;37m" + +#ifdef _MAIN_C +#define BORDER "-------------------" +#define STR1 "\033[1;37m Somechars" +#define STR2 "\033[1;37m Somechars x2" + +#define ON_ERROR_STR "none" + +PARAMETR CONFIG[] = { + {Blank, {.str0=STR1, .str1=NULL}}, + {Blank, {.str0=BORDER, .str1=NULL}}, + {PrintOs, {.str0=" Distro: ", .str1=NULL}}, + {GetKernel, {.str0=" Kernel: ", .str1=NULL}}, + {GetUptime, {.str0=" Uptime: ", .str1=NULL}}, + {GetPkg, {.str0=" Packages: ", .str1=NULL}}, + {GetShell, {.str0=" Shell: ", .str1=NULL}}, + {GetMem, {.str0=" Memory: ", .str1=NULL}}, + {Blank, {.str0=BORDER, .str1=NULL}}, + {Blank, {.str0=STR2, .str1=NULL}} +}; +#endif + +#endif