diff --git a/.gitattributes b/.gitattributes index c9f8b02..09ed4af 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,4 @@ # images - *.jpg binary *.jpeg binary *.bmp binary @@ -12,9 +11,13 @@ *.exe binary *.dll binary +# fonts +*.ttf binary + # PowerShell specific *.ps1 working-tree-encoding=UTF-8 *.psm1 working-tree-encoding=UTF-8 *.psd1 working-tree-encoding=UTF-8 +# misc *.md working-tree-encoding=UTF-8 diff --git a/Dockerfile b/Dockerfile index 38fe690..c6728bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,3 +24,8 @@ RUN \ echo 'source /etc/bash_completion.d/install-devruntime-completion' >> /etc/bash.bashrc && \ touch "$HOME/enable_motd" && \ echo "if [[ -e \"$HOME/enable_motd\" ]]; then echo -e \"Use \\e[32m'install-devruntime'\\e[0m to install missing runtimes like dotnet or NodeJs.\"; fi" >> /etc/bash.bashrc + +WORKDIR /app/code-server/lib/vscode/out/vs/workbench +ADD FiraCode/fonts/* ./fonts/ +ADD FiraCode/fonts.css ./ +RUN cat fonts.css >> workbench.web.main.css diff --git a/FiraCode/LICENSE b/FiraCode/LICENSE new file mode 100644 index 0000000..805e0b3 --- /dev/null +++ b/FiraCode/LICENSE @@ -0,0 +1,93 @@ +Copyright (c) 2014, The Fira Code Project Authors (https://github.com/tonsky/FiraCode) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/FiraCode/fonts.css b/FiraCode/fonts.css new file mode 100644 index 0000000..6e2b2fa --- /dev/null +++ b/FiraCode/fonts.css @@ -0,0 +1,29 @@ + +/* ::CUSTOM VSCODE FONTS:: */ +@font-face { + font-family: 'FiraCode'; + src: url('fonts/FiraCode-Regular-NerdFont-Complete.ttf') format('truetype'); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: 'FiraCode Mono'; + src: url('fonts/FiraCode-Regular-NerdFont-Complete-Mono.ttf') format('truetype'); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: 'FiraCode Win'; + src: url('fonts/FiraCode-Regular-NerdFont-Complete-Windows-Compatible.ttf') format('truetype'); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: 'FiraCode Win Mono'; + src: url('fonts/FiraCode-Regular-NerdFont-Complete-Mono-Windows-Compatible.ttf') format('truetype'); + font-weight: 400; + font-style: normal; +} diff --git a/FiraCode/fonts/FiraCode-Regular-NerdFont-Complete-Mono-Windows-Compatible.ttf b/FiraCode/fonts/FiraCode-Regular-NerdFont-Complete-Mono-Windows-Compatible.ttf new file mode 100644 index 0000000..171acc6 Binary files /dev/null and b/FiraCode/fonts/FiraCode-Regular-NerdFont-Complete-Mono-Windows-Compatible.ttf differ diff --git a/FiraCode/fonts/FiraCode-Regular-NerdFont-Complete-Mono.ttf b/FiraCode/fonts/FiraCode-Regular-NerdFont-Complete-Mono.ttf new file mode 100644 index 0000000..fc3ed85 Binary files /dev/null and b/FiraCode/fonts/FiraCode-Regular-NerdFont-Complete-Mono.ttf differ diff --git a/FiraCode/fonts/FiraCode-Regular-NerdFont-Complete-Windows-Compatible.ttf b/FiraCode/fonts/FiraCode-Regular-NerdFont-Complete-Windows-Compatible.ttf new file mode 100644 index 0000000..575faa5 Binary files /dev/null and b/FiraCode/fonts/FiraCode-Regular-NerdFont-Complete-Windows-Compatible.ttf differ diff --git a/FiraCode/fonts/FiraCode-Regular-NerdFont-Complete.ttf b/FiraCode/fonts/FiraCode-Regular-NerdFont-Complete.ttf new file mode 100644 index 0000000..974a527 Binary files /dev/null and b/FiraCode/fonts/FiraCode-Regular-NerdFont-Complete.ttf differ diff --git a/README.md b/README.md index 42ed4bf..0088f40 100644 --- a/README.md +++ b/README.md @@ -71,3 +71,5 @@ Example 2: install devruntime golang nodejs - Photo by frank mckenna on Unsplash +- A huge thanks to tuanpham for sharing his [code-server font patch](https://github.com/tuanpham-dev/code-server-font-patch). + diff --git a/install-devruntime b/install-devruntime index 956b8dc..507b29b 100755 --- a/install-devruntime +++ b/install-devruntime @@ -13,9 +13,9 @@ function showHelp() { golang Installs golang 1.19.3. nodejs Installs latest NodeJs LTS version. powershell Installs latest PowerShell LTS version. + disablemotd Disables hint in new bash terminal. + codesetting Sets VS Code user setting with basic (Fira Code). -h Prints this help messagee. - disablemotd Disables hint in new bash terminal - setcode Sets VS Code user setting with basic (Fira Code) Example 1: install-devruntime dotnet Example 2: install devruntime golang nodejs @@ -132,8 +132,8 @@ function setCodeSettings() { { "workbench.colorTheme": "One Dark Pro Darker", "window.menuBarVisibility": "classic", - "editor.fontFamily": "'FiraCode Nerd Font', 'FiraCode NF', Consolas, 'Courier New', monospace", - "terminal.integrated.fontFamily": "'FiraCode Nerd Font Mono', 'FiraCode NFM', Consolas, monospace", + "editor.fontFamily": "'FiraCode', 'FiraCode Nerd Font', 'FiraCode NF', Consolas, 'Courier New', monospace", + "terminal.integrated.fontFamily": "'FiraCode Mono', 'FiraCode Nerd Font Mono', 'FiraCode NFM', Consolas, monospace", "editor.fontLigatures": true, "workbench.iconTheme": "vscode-icons", "extensions.autoUpdate": false, @@ -163,7 +163,7 @@ function main() { elif [[ "$i" == "disablemotd" ]]; then disableMotd exit 0 - elif [[ "$i" == "setcode" ]]; then + elif [[ "$i" == "codesetting" ]]; then setCodeSettings exit 0 else diff --git a/install-devruntime-completion b/install-devruntime-completion index 48f328f..cb31d86 100644 --- a/install-devruntime-completion +++ b/install-devruntime-completion @@ -1,3 +1,3 @@ #!/bin/bash -complete -W "disablemotd dotnet golang nodejs powershell setcode -h" install-devruntime +complete -W "codesetting disablemotd dotnet golang nodejs powershell -h" install-devruntime