misc: fix some things

Author: Toni500github

.github/workflows/makefile.yml

@@ -248,41 +248,41 @@ jobs:
     - name: Test customfetch
       run: ./build/debug/customfetch --wrap-lines
 
-  build-macos:
-    runs-on: macos-latest
-    permissions:
-      contents: read
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install the packages
-        run: HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install --overwrite fastfetch neofetch tree llvm@19
-
-      - name: uname -a && clang++ --version
-        run: uname -a && echo "\n" && $(brew --prefix llvm@19)/bin/clang++ --version
-        
-      - name: Clean
-        run: make distclean
-
-      - name: Compile
-        run: make DEBUG=1 GUI_APP=0 CXX=$(brew --prefix llvm@19)/bin/clang++
-
-      - name: Test neofetch
-        run: neofetch
-
-      - name: Test fastfetch
-        run: fastfetch
-
-      - name: Test customfetch
-        run: ./build/debug/customfetch -D assets
-
-      - name: Upload to github artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          if-no-files-found: error
-          name: customfetch-macos
-          path: ./build/debug/customfetch
+      #  build-macos:
+      #    runs-on: macos-latest
+      #    permissions:
+      #      contents: read
+      #
+      #    steps:
+      #      - uses: actions/checkout@v4
+      #
+      #      - name: Install the packages
+      #        run: HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install --overwrite fastfetch neofetch tree llvm@19
+      #
+      #      - name: uname -a && clang++ --version
+      #        run: uname -a && echo "\n" && $(brew --prefix llvm@19)/bin/clang++ --version
+      #        
+      #      - name: Clean
+      #        run: make distclean
+      #
+      #      - name: Compile
+      #        run: make DEBUG=1 GUI_APP=0 CXX=$(brew --prefix llvm@19)/bin/clang++
+      #
+      #      - name: Test neofetch
+      #        run: neofetch
+      #
+      #      - name: Test fastfetch
+      #        run: fastfetch
+      #
+      #      - name: Test customfetch
+      #        run: ./build/debug/customfetch -D assets
+      #
+      #      - name: Upload to github artifacts
+      #        uses: actions/upload-artifact@v4
+      #        with:
+      #          if-no-files-found: error
+      #          name: customfetch-macos
+      #          path: ./build/debug/customfetch
 
           #  test-suitcase:
           #    runs-on: ubuntu-22.04

include/config.hpp

@@ -163,12 +163,12 @@ class Config : public ConfigBase
             o.value_type = BOOL;
             o.bool_value = value;
         }
-        else if constexpr (std::is_same_v<T, std::string>)
+        else if constexpr (std::is_convertible_v<T, std::string>)
         {
             o.value_type = STR;
             o.string_value = value;
         }
-        else if constexpr (std::is_same_v<T, int> || std::is_same_v<T, std::uint16_t>)
+        else if constexpr (std::is_convertible_v<T, int>)
         {
             o.value_type = INT;
             o.int_value = value;

libcufetch/Makefile

@@ -23,11 +23,11 @@ OUTPUT		:= ../$(BUILDDIR)/$(LIBNAME)
 
 all: $(OUTPUT)
 	@if [ "$(UNAME_S)" = "Linux" ]; then \
-		ln -sf libcufetch.so.1.0.0 ../build/debug/libcufetch.so.1; \
-		ln -sf libcufetch.so.1.0.0 ../build/debug/libcufetch.so; \
+		ln -sf libcufetch.so.1.0.0 ../$(BUILDDIR)/libcufetch.so.1; \
+		ln -sf libcufetch.so.1.0.0 ../$(BUILDDIR)/libcufetch.so; \
 	elif [ "$(UNAME_S)" = "Darwin" ]; then \
-		ln -sf libcufetch.dylib ../build/debug/libcufetch.1.dylib; \
-		ln -sf libcufetch.dylib ../build/debug/libcufetch.1.0.0.dylib; \
+		ln -sf libcufetch.dylib ../$(BUILDDIR)/libcufetch.1.dylib; \
+		ln -sf libcufetch.dylib ../$(BUILDDIR)/libcufetch.1.0.0.dylib; \
 	fi
 
 %.o: %.cc

src/display.cpp

@@ -418,7 +418,7 @@ std::vector<std::string> Display::render(const Config& config, const bool alread
 
     for (; i < asciiArt.size(); ++i)
     {
-        std::string line(config.logo_padding_left + asciiArt.at(i).length(), ' ');
+        std::string line(config.logo_padding_left, ' ');
         line += asciiArt.at(i);
 
         layout.push_back(line);

src/main.cpp

@@ -96,7 +96,7 @@ static void version()
 static void help(bool invalid_opt = false)
 {
     constexpr std::string_view help(
-        R"(Usage: customfetch [OPTIONS]...  
+        R"(Usage: customfetch [OPTIONS]...
 A command-line, GUI, and Android widget system information tool (like neofetch) focused on customizability and performance.
 
 NOTE: Boolean flags [<BOOL>] accept: "true", 1, "enable", or empty. Any other value is treated as false.
@@ -113,7 +113,7 @@ LOGO OPTIONS:
     -n, --no-logo               Disable logo display.
     -L, --logo-only             Print only the logo (skip layout completely).
     -s, --source-path <PATH>    Path to custom ASCII art/image file.
-    
+
     -a, --ascii-logo-type <TYPE>
                                 Type of ASCII art (typically "small", "old", or empty for default).
                                 Example: "-d arch -a older" looks for "arch_older.txt".
@@ -130,6 +130,7 @@ LAYOUT & FORMATTING:
                                 Example: `-m "${auto}OS: $<os.name>" -m "${auto}CPU: $<cpu>"`.
 
     -N, --no-color              Disable all colors (useful for pipes/scripts).
+    --layout-padding-top <NUM>	Layout padding from top (default: 0).
     --wrap-lines=[<BOOL>]       Enable terminal line wrapping (default: false).
     --title-sep <STRING>        String to use for $<title.sep> (default: "-").
     --sep-reset <STRING>        String that resets color (default: ":").