m/desk-os
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply customization for EU edition

Browse Source
This commit is contained in:
Michael Smith 2024-09-11 10:39:48 +02:00
parent c08e57de0d
commit 1186cb2d47
18 changed files with 102 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
README.md
View File

@ -1,21 +1,3 @@
# deskOS - An easy to use, stable desktop operating system
See https://nixup.io/desk-os/learn-more
## Run a deskOS demo in a virtual machine
If you are running NixOS or you have the [Nix package manager](https://nixos.org/) installed, you can easily run a deskOS demo from this flake:
```sh
nix run github:nixup-io/desk-os
```
## Contact
- E-mail: [info@nixup.io](mailto:info@nixup.io)
- X: [@michaelshmitty](https://x.com/michaelshmitty)
- Fediverse: [@neo](https://social.hacktheplanet.be/@neo)
## Acknowledgements
# deskOS - EU Edition
deskOS is based on [Linux](https://en.wikipedia.org/wiki/Linux) and [NixOS](https://nixos.org/).

BIN
assets/eu-wallpaper.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 238 KiB

12
modules/desk-os/default.nix
View File

@ -20,12 +20,12 @@
loader.efi.canTouchEfiVariables = true;
plymouth = {
enable = true;
theme = "desk-os";
themePackages = [(pkgs.callPackage ../../packages/desk-os-plymouth {})];
theme = "eu-flag";
themePackages = [ (pkgs.callPackage ../../packages/eu-flag-plymouth {}) ];
};
};
system.nixos.distroName = "deskOS 1";
system.nixos.distroName = "deskOS 1 - EU Edition";
system.autoUpgrade = {
enable = true;
@ -76,8 +76,8 @@
{
settings = {
"org/gnome/desktop/background" = {
picture-uri = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/geometrics-l.jxl";
picture-uri-dark = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/geometrics-d.jxl";
picture-uri = "file://${../../assets/eu-wallpaper.jpg}";
picture-uri-dark = "file://${../../assets/eu-wallpaper.jpg}";
};
"org/gnome/desktop/wm/preferences" = {
@ -85,7 +85,7 @@
};
"org/gnome/desktop/screensaver" = {
picture-uri = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/geometrics-l.jxl";
picture-uri = "file://${../../assets/eu-wallpaper.jpg}";
};
"org/gnome/desktop/interface" = {

12
modules/installer/default.nix
View File

@ -30,7 +30,7 @@ in {
(modulesPath + "/profiles/installation-device.nix")
];
system.nixos.distroName = "deskOS 1";
system.nixos.distroName = "deskOS 1 - EU Edition";
# FIXME(m): Disable squashfs compression during development
# isoImage.squashfsCompression = null;
@ -43,8 +43,8 @@ in {
loader.timeout = lib.mkForce 0;
plymouth = {
enable = true;
theme = "desk-os-installer";
themePackages = [(pkgs.callPackage ../../packages/desk-os-installer-plymouth {})];
theme = "eu-flag-installer";
themePackages = [ (pkgs.callPackage ../../packages/eu-flag-installer-plymouth {}) ];
};
# NOTE(m): Enable kernel modules that improve wifi support on
# Macbooks during installation.
@ -125,6 +125,8 @@ in {
gnomeExtensions.no-overview
];
i18n.defaultLocale = "en_GB.UTF-8";
# Support choosing from any locale
i18n.supportedLocales = ["all"];
@ -147,9 +149,9 @@ in {
sleep-inactive-ac-type='nothing'
sleep-inactive-battery-type='nothing'
[org.gnome.desktop.background]
picture-uri='file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/geometrics-l.jxl'
picture-uri='file://${../../assets/eu-wallpaper.jpg}'
[org.gnome.desktop.screensaver]
picture-uri='file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/geometrics-l.jxl'
picture-uri='file://${../../assets/eu-wallpaper.jpg}'
'';
extraGSettingsOverridePackages = [pkgs.gnome.gnome-settings-daemon];

24
packages/calamares-extensions/branding/default/branding.desc
View File

@ -9,21 +9,21 @@ windowExpanding: fullscreen
windowPlacement: center
sidebar: none
strings:
productName: deskOS
shortProductName: deskOS
productName: deskOS - EU Edition
shortProductName: deskOS - EU Edition
version: 1
shortVersion: 1
versionedName: deskOS 1
shortVersionedName: deskOS 1
bootloaderEntryName: deskOS
productUrl: https://nixup.io
supportUrl: https://nixup.io
knownIssuesUrl: https://github.com/nixup-io/desk-os/issues
releaseNotesUrl: https://nixup.io
donateUrl: https://nixup.io
versionedName: deskOS 1 - EU Edition
shortVersionedName: deskOS 1 - EU Edition
bootloaderEntryName: deskOS - EU Edition
productUrl: https://www.edps.europa.eu/
supportUrl: https://www.edps.europa.eu/
knownIssuesUrl: https://github.com/EU-EDPS
releaseNotesUrl: https://www.edps.europa.eu/
donateUrl: https://www.edps.europa.eu/
images:
productIcon: "desk-os-logo.png"
productLogo: "desk-os-logo.png"
productIcon: "desk-os-logo-eu.png"
productLogo: "desk-os-logo-eu.png"
style:
SidebarBackground: "#292F34"
SidebarText: "#FFFFFF"

BIN
packages/calamares-extensions/branding/default/desk-os-logo-eu.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 395 KiB

5
packages/calamares-extensions/config/modules/partition.conf
View File

@ -8,6 +8,7 @@ efi:
label: "EFI"
userSwapChoices:
- suspend
luksGeneration: luks2
drawNestedPartitions: false
alwaysShowPartitionLabels: true
allowManualPartitioning: false
@ -26,5 +27,9 @@ initialSwapChoice: suspend
requiredPartitionTableType: gpt
partitionLayout:
- filesystem: "ext4"
noEncrypt: false
mountPoint: "/"
size: 100%
enableLuksAutomatedPartitioning: true
# FIXME(m): This does not seem to work
preCheckEncryption: true

5
packages/calamares-extensions/config/modules/users.conf
View File

@ -5,9 +5,8 @@
defaultGroups:
- users
- networkmanager
- wheel
setRootPassword: false
doAutologin: true
setRootPassword: true
doAutologin: false
user:
shell: /run/current-system/sw/bin/bash
forbidden_names: [ root ]

2
packages/calamares-extensions/config/modules/welcome.conf
View File

@ -8,7 +8,7 @@ showReleaseNotesUrl: false
requirements:
requiredStorage: 60
requiredRam: 4.0
internetCheckUrl: [ https://nixup.io, https://cache.nixos.org/ ]
internetCheckUrl: [ https://www.edps.europa.eu, https://cache.nixos.org/ ]
check:
- storage
- ram

13
packages/calamares-extensions/modules/desk_os_installation/main.py
View File

@ -56,7 +56,7 @@ flake = f"""
inputs = {{
nixpkgs.url = "github:nixup-io/nixpkgs-desk-os/stable";
desk-os = {{
url = "github:nixup-io/desk-os";
url = "github:nixup-io/desk-os/eu-edition";
inputs.nixpkgs.follows = "nixpkgs";
}};
}};
@ -114,11 +114,6 @@ configuration_body = """
extraGroups = [ @@groups@@ ];
};
services.displayManager.autoLogin = {
enable = true;
user = "@@username@@";
};
nixpkgs.config.allowUnfree = true;
"""
@ -168,7 +163,7 @@ configuration_tail = """
"""
def pretty_name():
return _("Installing deskOS (this can take a while depending on your Internet speed)...")
return _("Installing deskOS - EU Edition (this can take a while depending on your Internet speed)...")
status = pretty_name()
@ -243,7 +238,7 @@ def run():
if (gs.value("username") is not None):
fullname = gs.value("fullname")
groups = ["networkmanager", "wheel"]
groups = ["networkmanager"]
catenate(variables, "username", gs.value("username"))
catenate(variables, "fullname", fullname)
@ -295,7 +290,7 @@ def run():
libcalamares.utils.host_env_process_output(
["cp", "/dev/stdin", flakeFile], None, flake)
status = _("Installing deskOS (this can take a while depending on your Internet speed)...")
status = _("Installing deskOS - EU Edition (this can take a while depending on your Internet speed)...")
# Install
try:

16
packages/eu-flag-installer-plymouth/default.nix Normal file
View File

@ -0,0 +1,16 @@
{stdenv}:
stdenv.mkDerivation {
pname = "eu-flag-installer-plymouth";
version = "0.0.1";
src = ./src;
installPhase = ''
runHook preInstall
sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' eu-flag-installer.plymouth
sed -i 's:\(^ScriptFile=\)/usr:\1'"$out"':' eu-flag-installer.plymouth
mkdir -p $out/share/plymouth/themes/eu-flag-installer
cp * $out/share/plymouth/themes/eu-flag-installer
runHook postInstall
'';
}

8
packages/eu-flag-installer-plymouth/src/eu-flag-installer.plymouth Normal file
View File

@ -0,0 +1,8 @@
[Plymouth Theme]
Name=EU flag Installer
Description=A theme that displays the EU flag Installer logo
ModuleName=script
[script]
ImageDir=/usr/share/plymouth/themes/eu-flag-installer
ScriptFile=/usr/share/plymouth/themes/eu-flag-installer/eu-flag-installer.script

BIN
packages/eu-flag-installer-plymouth/src/eu-flag-installer.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 36 KiB

8
packages/eu-flag-installer-plymouth/src/eu-flag-installer.script Normal file
View File

@ -0,0 +1,8 @@
image = Image("eu-flag-installer.png");
pos_x = Window.GetWidth()/2 - image.GetWidth()/2;
pos_y = Window.GetHeight()/2 - image.GetHeight()/2;
sprite = Sprite(image);
sprite.SetX(pos_x);
sprite.SetY(pos_y);

16
packages/eu-flag-plymouth/default.nix Normal file
View File

@ -0,0 +1,16 @@
{stdenv}:
stdenv.mkDerivation {
pname = "eu-flag-plymouth";
version = "0.0.1";
src = ./src;
installPhase = ''
runHook preInstall
sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' eu-flag.plymouth
sed -i 's:\(^ScriptFile=\)/usr:\1'"$out"':' eu-flag.plymouth
mkdir -p $out/share/plymouth/themes/eu-flag
cp * $out/share/plymouth/themes/eu-flag
runHook postInstall
'';
}

8
packages/eu-flag-plymouth/src/eu-flag.plymouth Normal file
View File

@ -0,0 +1,8 @@
[Plymouth Theme]
Name=EU flag
Description=A theme that displays the EU flag
ModuleName=script
[script]
ImageDir=/usr/share/plymouth/themes/eu-flag
ScriptFile=/usr/share/plymouth/themes/eu-flag/eu-flag.script

BIN
packages/eu-flag-plymouth/src/eu-flag.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

8
packages/eu-flag-plymouth/src/eu-flag.script Normal file
View File

@ -0,0 +1,8 @@
image = Image("eu-flag.png");
pos_x = Window.GetWidth()/2 - image.GetWidth()/2;
pos_y = Window.GetHeight()/2 - image.GetHeight()/2;
sprite = Sprite(image);
sprite.SetX(pos_x);
sprite.SetY(pos_y);