diff --git a/CHANGELOG.md b/CHANGELOG.md index 86d4600d9..52969f3a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# TBD + +Logos: + +* Update NixOS_small + # 2.2.1 Hotfix release for #606 diff --git a/CMakeLists.txt b/CMakeLists.txt index 4678b1871..9a4ccc28a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -234,14 +234,11 @@ endif() function(fastfetch_load_raw_text FILENAME OUTVAR) file(READ "${FILENAME}" TEMP) - string(REGEX REPLACE "\n$" "" TEMP "${TEMP}") # Remove trailing newline - string(JSON TEMP SET "{}" "${TEMP}" "0") # Encode raw strings using JSON_SET - string(REGEX REPLACE "^\\{[ \t\r\n]*" "" TEMP "${TEMP}") # Remove JSON braces - string(REGEX REPLACE "[ \t\r\n]*:[ \t\r\n]*0[ \t\r\n]*\\}$" "" TEMP "${TEMP}") # Remove trailing ` : 0 }` - if(NOT "${TEMP}" MATCHES "^\"[^\n]*\"") - message(FATAL_ERROR "Internal error: unexpected output: '${TEMP}'") - endif() - set(${OUTVAR} "${TEMP}" PARENT_SCOPE) + string(REGEX REPLACE "\n$" "" TEMP "${TEMP}") # Remove trailing newline + string(REPLACE "\\" "\\\\" TEMP "${TEMP}") # Escape backslashes + string(REPLACE "\n" "\\n" TEMP "${TEMP}") # Replace newlines with \n + string(REPLACE "\"" "\\\"" TEMP "${TEMP}") # Replace quotes with \" + set(${OUTVAR} "\"${TEMP}\"" PARENT_SCOPE) endfunction(fastfetch_load_raw_text) file(GLOB LOGO_FILES "src/logo/ascii/*.txt") diff --git a/src/logo/ascii/nixos_old_small.txt b/src/logo/ascii/nixos_old_small.txt new file mode 100644 index 000000000..4ca2f52c5 --- /dev/null +++ b/src/logo/ascii/nixos_old_small.txt @@ -0,0 +1,7 @@ +$1 \\ $2\\ // +$1 ==\\__$2\\/ $1// +$2 // $2\\$1// +$2==// $1//== +$2 //$1\\$2___$1// +$2// $1/\\ $2\\== + $1// \\ $2\\ diff --git a/src/logo/ascii/nixos_small.txt b/src/logo/ascii/nixos_small.txt index be1b628a3..3e46ea598 100644 --- a/src/logo/ascii/nixos_small.txt +++ b/src/logo/ascii/nixos_small.txt @@ -1,7 +1,7 @@ - \\ \\ // - ==\\__\\/ // - // \\// -==// //== - //\\___// -// /\\ \\== - // \\ \\ +$1 ▗▄ $2▗▄ ▄▖ +$1 ▄▄🬸█▄▄▄$2🬸█▛ $1▃ +$2 ▟▛ ▜$1▃▟🬕 +$2🬋🬋🬫█ $1█🬛🬋🬋 +$2 🬷▛🮃$1▙ ▟▛ +$2 🮃 $1▟█🬴$2▀▀▀█🬴▀▀ +$1 ▝▀ ▀▘ $2▀▘ diff --git a/src/logo/builtin.c b/src/logo/builtin.c index d9252f561..9f1c051cf 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c @@ -2596,48 +2596,41 @@ static const FFlogo N[] = { }, // NixOS { - .names = {"NixOS", "nix", "nixos-linux", "nix-linux", "nix-os", "nix_os", "nix_os_linux"}, + .names = {"NixOS", "nix", "nixos-linux", "nix-linux"}, .lines = FASTFETCH_DATATEXT_LOGO_NIXOS, .colors = { FF_COLOR_FG_BLUE, FF_COLOR_FG_CYAN, }, - .colorKeys = FF_COLOR_FG_CYAN, - .colorTitle = FF_COLOR_FG_BLUE, }, - // NixOS_small + // NixOSSmall { - .names = {"NixOS_small", "nix_small"}, + .names = {"NixOS_small", "nix_small", "nixos-linux-small", "nix-linux-small"}, .lines = FASTFETCH_DATATEXT_LOGO_NIXOS_SMALL, .colors = { FF_COLOR_FG_BLUE, FF_COLOR_FG_CYAN, }, - .colorKeys = FF_COLOR_FG_CYAN, - .colorTitle = FF_COLOR_FG_BLUE, }, - // NixOsOld + // NixOSOld { - .names = {"nixos_old", "nix-old", "nixos-old", "nix_old", "nix-os-old", "nix_os_old"}, + .names = {"nixos_old", "nix-old", "nixos-old", "nix_old"}, .type = FF_LOGO_LINE_TYPE_ALTER_BIT, .lines = FASTFETCH_DATATEXT_LOGO_NIXOS_OLD, .colors = { FF_COLOR_FG_BLUE, FF_COLOR_FG_CYAN, }, - .colorKeys = FF_COLOR_FG_CYAN, - .colorTitle = FF_COLOR_FG_BLUE, }, - // NixOsSmall + // NixOsOldSmall { - .names = {"nixos_small", "nix-small", "nixos-small", "nix_small", "nix-os-small", "nix_os_small"}, - .type = FF_LOGO_LINE_TYPE_SMALL_BIT, - .lines = FASTFETCH_DATATEXT_LOGO_NIXOS_SMALL, + .names = {"nixos_old_small", "nix-old-small", "nixos-old-small", "nix_old_small"}, + .type = FF_LOGO_LINE_TYPE_SMALL_BIT | FF_LOGO_LINE_TYPE_ALTER_BIT, + .lines = FASTFETCH_DATATEXT_LOGO_NIXOS_OLD_SMALL, .colors = { FF_COLOR_FG_BLUE, + FF_COLOR_FG_CYAN, }, - .colorKeys = FF_COLOR_FG_BLUE, - .colorTitle = FF_COLOR_FG_BLUE, }, // NetBSD {