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
Download Patch File Download Diff File Expand all files Collapse all files

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: