Skip to content

Commit

Permalink
Merge branch 'main' into profiles
Browse files Browse the repository at this point in the history
  • Loading branch information
AdamIsrael authored Nov 5, 2021
2 parents f2636c8 + d9cceab commit 04094f9
Show file tree
Hide file tree
Showing 22 changed files with 329 additions and 8 deletions.
21 changes: 19 additions & 2 deletions 02-workarounds.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,24 @@
#rpm-ostree install moby-engine docker-compose

# Wallpaper
#
# Set a community wallpaper
#
# Set a community wallpaper
mkdir -p /var/home/$USER/.local/share/backgrounds
cp ./files/silvermorning.jpg /var/home/$USER/.local/share/backgrounds/
gsettings set org.gnome.desktop.background picture-uri file:///var/home/$USER/.local/share/backgrounds/silvermorning.jpg

# Fonts
#
# NerdFonts are basically fonts with a more rich set of emojis embeded
mkdir -p ~/.local/share/fonts
curl -sfLo "$HOME/.local/share/fonts/Ubuntu Mono Nerd Font Complete.ttf" https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/UbuntuMono/Regular/complete/Ubuntu%20Mono%20Nerd%20Font%20Complete.ttf
curl -sfLo "$HOME/.local/share/fonts/Ubuntu Nerd Font Complete.ttf" https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/Ubuntu/Regular/complete/Ubuntu%20Nerd%20Font%20Complete.ttf
cp -R files/fonts/ubuntu-font-family/*.ttf $HOME/.local/share/fonts/
# Flush font cache
fc-cache

# Get current profile for terminal, and update the font
current_profile=$(dconf list /org/gnome/terminal/legacy/profiles:/ | head -n1)
# TODO(mc): We /could/ prompt the user if they want to keep the current font, use Ubuntu Mono, or Ubuntu Mono Nerd Font?
dconf write /org/gnome/terminal/legacy/profiles:/${current_profile}use-system-font false
dconf write /org/gnome/terminal/legacy/profiles:/${current_profile}font "'UbuntuMono Nerd Font 12'"
14 changes: 10 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

TLDR: I've been using Ubuntu since 2004, however I want a [modern image based desktop](https://blog.verbum.org/2020/08/22/immutable-%E2%86%92-reprovisionable-anti-hysteresis/). Can I have my cake and eat it too? This is not a new distribution (whew!), just a different set of defaults and apps scripted up, with a dash of container goodies so can still also use Ubuntu.

The intended audience are cloud leaning developers who use Linux desktop, the niche of the niche. Realistically I don't want to maintain this longer than I have to, this is a crutch that I need and then at some point I'll end up on the default desktop. The cloud image I'll need until I retire because old habits die hard and it's good. Let's open our minds and do a mashup ...

## Scope

This is a proof-of-concept, ideally it's enough to get gears turning and starting conversations, it is by no means a a proper implementation.
Expand All @@ -23,9 +25,13 @@ If you want a more in depth view of what's happening, here's a [live video of me

If this scares you then you're in the wrong place, if you're ready to not only burn the ships but torpedo them just to make sure we don't end up back in the old world, read on. I have selected a default set of apps that I use that I notice lots of other people use, feel free to change them up, it's only a default:

- Work apps - vscode, zoom, slack, standard notes, signal, riot, mailspring
- Fun apps - discord, steam, and lutris
- A selection of browsers - Firefox, Brave, Chrome, Edge
- Keep Ubuntu app defaults and panel layout
- While this is a mashup, let's respect Ubuntu's choices here by default, you know how to change stuff
- But add apps that the intended audience love and need like vscode
- Optionally install:
- Work apps - zoom, slack, standard notes, signal, riot, mailspring
- Fun apps - discord and Steam (Last release of flatpak fixed many of Steam's issues, it works much better now, try it)
- A selection of browsers - Firefox, Brave, Chrome, Edge

I replaced the distro Firefox with the flatpak from upstream. As per upstream Silverblue, you want your apps to be either in containers (where you install them via apt/dnf) and your desktop apps to come via flatpaks.

Expand Down Expand Up @@ -103,4 +109,4 @@ NOTE: Graphical versions of applications WORK in these containers, so if there's
[wallpaper](https://www.flickr.com/photos/timewitch/51521513914/). We felt that
a wallpaper from one of the Ubuntu community wallpaper contest winners would
give us the vibe we're looking for. Plus it's called Silver Morning, what a
brilliant coincidence!
brilliant coincidence!
4 changes: 2 additions & 2 deletions applications.list
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ org.gustavoperedo.FontDownloader
org.libreoffice.LibreOffice
org.mozilla.firefox
org.mozilla.Thunderbird
org.freedesktop.Platform.ffmpeg-full/x86_64/21.08

# Other goodies
#
Expand All @@ -24,11 +25,10 @@ org.mozilla.Thunderbird
#org.audacityteam.Audacity
#org.flameshot.Flameshot
#org.freedesktop.Piper
#org.freedesktop.Platform.ffmpeg-full/x86_64/20.08
#org.gimp.GIMP
#org.inkscape.Inkscape
#org.kde.krita
#org.signal.Signal
#org.standardnotes.standardnotes
#org.videolan.VLC
#us.zoom.Zoom
#us.zoom.Zoom
177 changes: 177 additions & 0 deletions files/fonts/ubuntu-font-family/LICENCE-FAQ.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
Ubuntu Font Family Licensing FAQ

Stylistic Foundations

The Ubuntu Font Family is the first time that a libre typeface has been
designed professionally and explicitly with the intent of developing a
public and long-term community-based development process.

When developing an open project, it is generally necessary to have firm
foundations: a font needs to maintain harmony within itself even across
many type designers and writing systems. For the [1]Ubuntu Font Family,
the process has been guided with the type foundry Dalton Maag setting
the project up with firm stylistic foundation covering several
left-to-right scripts: Latin, Greek and Cyrillic; and right-to-left
scripts: Arabic and Hebrew (due in 2011).

With this starting point the community will, under the supervision of
[2]Canonical and [3]Dalton Maag, be able to build on the existing font
sources to expand their character coverage. Ultimately everybody will
be able to use the Ubuntu Font Family in their own written languages
across the whole of Unicode (and this will take some time!).

Licensing

The licence chosen by any free software project is one of the
foundational decisions that sets out how derivatives and contributions
can occur, and in turn what kind of community will form around the
project.

Using a licence that is compatible with other popular licences is a
powerful constraint because of the [4]network effects: the freedom to
share improvements between projects allows free software to reach
high-quality over time. Licence-proliferation leads to many
incompatible licences, undermining the network effect, the freedom to
share and ultimately making the libre movement that Ubuntu is a part of
less effective. For all kinds of software, writing a new licence is not
to be taken lightly and is a choice that needs to be thoroughly
justified if this path is taken.

Today it is not clear to Canonical what the best licence for a font
project like the Ubuntu Font Family is: one that starts life designed
by professionals and continues with the full range of community
development, from highly commercial work in new directions to curious
beginners' experimental contributions. The fast and steady pace of the
Ubuntu release cycle means that an interim libre licence has been
necessary to enable the consideration of the font family as part of
Ubuntu 10.10 operating system release.

Before taking any decision on licensing, Canonical as sponsor and
backer of the project has reviewed the many existing licenses used for
libre/open fonts and engaged the stewards of the most popular licenses
in detailed discussions. The current interim licence is the first step
in progressing the state-of-the-art in licensing for libre/open font
development.

The public discussion must now involve everyone in the (comparatively
new) area of the libre/open font community; including font users,
software freedom advocates, open source supporters and existing libre
font developers. Most importantly, the minds and wishes of professional
type designers considering entering the free software business
community must be taken on board.

Conversations and discussion has taken place, privately, with
individuals from the following groups (generally speaking personally on
behalf of themselves, rather than their affiliations):
* [5]SIL International
* [6]Open Font Library
* [7]Software Freedom Law Center
* [8]Google Font API

Document embedding

One issue highlighted early on in the survey of existing font licences
is that of document embedding. Almost all font licences, both free and
unfree, permit embedding a font into a document to a certain degree.
Embedding a font with other works that make up a document creates a
"combined work" and copyleft would normally require the whole document
to be distributed under the terms of the font licence. As beautiful as
the font might be, such a licence makes a font too restrictive for
useful general purpose digital publishing.

The situation is not entirely unique to fonts and is encountered also
with tools such as GNU Bison: a vanilla GNU GPL licence would require
anything generated with Bison to be made available under the terms of
the GPL as well. To avoid this, Bison is [9]published with an
additional permission to the GPL which allows the output of Bison to be
made available under any licence.

The conflict between licensing of fonts and licensing of documents, is
addressed in two popular libre font licences, the SIL OFL and GNU GPL:
* [10]SIL Open Font Licence: When OFL fonts are embedded in a
document, the OFL's terms do not apply to that document. (See
[11]OFL-FAQ for details.
* [12]GPL Font Exception: The situation is resolved by granting an
additional permission to allow documents to not be covered by the
GPL. (The exception is being reviewed).

The Ubuntu Font Family must also resolve this conflict, ensuring that
if the font is embedded and then extracted it is once again clearly
under the terms of its libre licence.

Long-term licensing

Those individuals involved, especially from Ubuntu and Canonical, are
interested in finding a long-term libre licence that finds broad favour
across the whole libre/open font community. The deliberation during the
past months has been on how to licence the Ubuntu Font Family in the
short-term, while knowingly encouraging everyone to pursue a long-term
goal.
* [13]Copyright assignment will be required so that the Ubuntu Font
Family's licensing can be progressively expanded to one (or more)
licences, as best practice continues to evolve within the
libre/open font community.
* Canonical will support and fund legal work on libre font licensing.
It is recognised that the cost and time commitments required are
likely to be significant. We invite other capable parties to join
in supporting this activity.

The GPL version 3 (GPLv3) will be used for Ubuntu Font Family build
scripts and the CC-BY-SA for associated documentation and non-font
content: all items which do not end up embedded in general works and
documents.

Ubuntu Font Licence

For the short-term only, the initial licence is the [14]Ubuntu Font
License (UFL). This is loosely inspired from the work on the SIL
OFL 1.1, and seeks to clarify the issues that arose during discussions
and legal review, from the perspective of the backers, Canonical Ltd.
Those already using established licensing models such as the GPL, OFL
or Creative Commons licensing should have no worries about continuing
to use them. The Ubuntu Font Licence (UFL) and the SIL Open Font
Licence (SIL OFL) are not identical and should not be confused with
each other. Please read the terms precisely. The UFL is only intended
as an interim license, and the overriding aim is to support the
creation of a more suitable and generic libre font licence. As soon as
such a licence is developed, the Ubuntu Font Family will migrate to
it—made possible by copyright assignment in the interium. Between the
OFL 1.1, and the UFL 1.0, the following changes are made to produce the
Ubuntu Font Licence:
* Clarification:

1. Document embedding (see [15]embedding section above).
2. Apply at point of distribution, instead of receipt
3. Author vs. copyright holder disambiguation (type designers are
authors, with the copyright holder normally being the funder)
4. Define "Propagate" (for internationalisation, similar to the GPLv3)
5. Define "Substantially Changed"
6. Trademarks are explicitly not transferred
7. Refine renaming requirement

Streamlining:
8. Remove "not to be sold separately" clause
9. Remove "Reserved Font Name(s)" declaration

A visual demonstration of how these points were implemented can be
found in the accompanying coloured diff between SIL OFL 1.1 and the
Ubuntu Font Licence 1.0: [16]ofl-1.1-ufl-1.0.diff.html

References

1. http://font.ubuntu.com/
2. http://www.canonical.com/
3. http://www.daltonmaag.com/
4. http://en.wikipedia.org/wiki/Network_effect
5. http://scripts.sil.org/
6. http://openfontlibrary.org/
7. http://www.softwarefreedom.org/
8. http://code.google.com/webfonts
9. http://www.gnu.org/licenses/gpl-faq.html#CanIUseGPLToolsForNF
10. http://scripts.sil.org/OFL_web
11. http://scripts.sil.org/OFL-FAQ_web
12. http://www.gnu.org/licenses/gpl-faq.html#FontException
13. https://launchpad.net/~uff-contributors
14. http://font.ubuntu.com/ufl/ubuntu-font-licence-1.0.txt
15. http://font.ubuntu.com/ufl/FAQ.html#embedding
16. http://font.ubuntu.com/ufl/ofl-1.1-ufl-1.0.diff.html
96 changes: 96 additions & 0 deletions files/fonts/ubuntu-font-family/LICENCE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
-------------------------------
UBUNTU FONT LICENCE Version 1.0
-------------------------------

PREAMBLE
This licence allows the licensed fonts to be used, studied, modified and
redistributed freely. The fonts, including any derivative works, can be
bundled, embedded, and redistributed provided the terms of this licence
are met. The fonts and derivatives, however, cannot be released under
any other licence. The requirement for fonts to remain under this
licence does not require any document created using the fonts or their
derivatives to be published under this licence, as long as the primary
purpose of the document is not to be a vehicle for the distribution of
the fonts.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this licence and clearly marked as such. This may
include source files, build scripts and documentation.

"Original Version" refers to the collection of Font Software components
as received under this licence.

"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.

"Copyright Holder(s)" refers to all individuals and companies who have a
copyright ownership of the Font Software.

"Substantially Changed" refers to Modified Versions which can be easily
identified as dissimilar to the Font Software by users of the Font
Software comparing the Original Version with the Modified Version.

To "Propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification and with or without charging
a redistribution fee), making available to the public, and in some
countries other activities as well.

PERMISSION & CONDITIONS
This licence does not grant any rights under trademark law and all such
rights are reserved.

Permission is hereby granted, free of charge, to any person obtaining a
copy of the Font Software, to propagate the Font Software, subject to
the below conditions:

1) Each copy of the Font Software must contain the above copyright
notice and this licence. 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.

2) The font name complies with the following:
(a) The Original Version must retain its name, unmodified.
(b) Modified Versions which are Substantially Changed must be renamed to
avoid use of the name of the Original Version or similar names entirely.
(c) Modified Versions which are not Substantially Changed must be
renamed to both (i) retain the name of the Original Version and (ii) add
additional naming elements to distinguish the Modified Version from the
Original Version. The name of such Modified Versions must be the name of
the Original Version, with "derivative X" where X represents the name of
the new work, appended to that name.

3) The name(s) of the Copyright Holder(s) and any contributor to the
Font Software shall not be used to promote, endorse or advertise any
Modified Version, except (i) as required by this licence, (ii) to
acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with
their explicit written permission.

4) The Font Software, modified or unmodified, in part or in whole, must
be distributed entirely under this licence, and must not be distributed
under any other licence. The requirement for fonts to remain under this
licence does not affect any document created using the Font Software,
except any version of the Font Software extracted from a document
created using the Font Software may only be distributed under this
licence.

TERMINATION
This licence 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.
16 changes: 16 additions & 0 deletions files/fonts/ubuntu-font-family/README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
----------------------
Ubuntu Font Family
======================

The Ubuntu Font Family are a set of matching new libre/open fonts in
development during 2010--2011. And with further expansion work and
bug fixing during 2015. The development is being funded by
Canonical Ltd on behalf the wider Free Software community and the
Ubuntu project. The technical font design work and implementation is
being undertaken by Dalton Maag.

Both the final font Truetype/OpenType files and the design files used
to produce the font family are distributed under an open licence and
you are expressly encouraged to experiment, modify, share and improve.

http://font.ubuntu.com/
4 changes: 4 additions & 0 deletions files/fonts/ubuntu-font-family/TRADEMARKS.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Ubuntu and Canonical are registered trademarks of Canonical Ltd.

The licence accompanying these works does not grant any rights
under trademark law and all such rights are reserved.
Binary file added files/fonts/ubuntu-font-family/Ubuntu-B.ttf
Binary file not shown.
Binary file added files/fonts/ubuntu-font-family/Ubuntu-BI.ttf
Binary file not shown.
Binary file added files/fonts/ubuntu-font-family/Ubuntu-C.ttf
Binary file not shown.
Binary file added files/fonts/ubuntu-font-family/Ubuntu-L.ttf
Binary file not shown.
Binary file added files/fonts/ubuntu-font-family/Ubuntu-LI.ttf
Binary file not shown.
Binary file added files/fonts/ubuntu-font-family/Ubuntu-M.ttf
Binary file not shown.
Binary file added files/fonts/ubuntu-font-family/Ubuntu-MI.ttf
Binary file not shown.
Binary file added files/fonts/ubuntu-font-family/Ubuntu-R.ttf
Binary file not shown.
Binary file added files/fonts/ubuntu-font-family/Ubuntu-RI.ttf
Binary file not shown.
Binary file added files/fonts/ubuntu-font-family/Ubuntu-Th.ttf
Binary file not shown.
Binary file added files/fonts/ubuntu-font-family/UbuntuMono-B.ttf
Binary file not shown.
Binary file added files/fonts/ubuntu-font-family/UbuntuMono-BI.ttf
Binary file not shown.
Binary file added files/fonts/ubuntu-font-family/UbuntuMono-R.ttf
Binary file not shown.
Binary file added files/fonts/ubuntu-font-family/UbuntuMono-RI.ttf
Binary file not shown.
5 changes: 5 additions & 0 deletions files/fonts/ubuntu-font-family/copyright.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Copyright 2010,2011 Canonical Ltd.

This Font Software is licensed under the Ubuntu Font Licence, Version
1.0. https://launchpad.net/ubuntu-font-licence

0 comments on commit 04094f9

Please sign in to comment.