Apply customization for EU edition

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

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"

Binary file not shown.

After

Width:  |  Height:  |  Size: 395 KiB

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

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 ]

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

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: