Apply customization for EU edition

README.md

@@ -1,3 +1,3 @@
-# deskOS - School Edition
+# deskOS - EU Edition
 
 deskOS is based on [Linux](https://en.wikipedia.org/wiki/Linux) and [NixOS](https://nixos.org/).

machines/demo/default.nix

@@ -20,8 +20,9 @@
 
     # Localization
     time.timeZone = "Europe/Brussels";
-    i18n.defaultLocale = "nl_NL.UTF-8";
+    i18n.defaultLocale = "en_US.UTF-8";
-    services.xserver.xkb.layout = "nl";
+    services.xserver.xkb.layout = "us";
+    services.xserver.xkb.variant = "dvorak";
 
     services.displayManager.autoLogin = {
       enable = true;

modules/desk-os/default.nix

@@ -20,12 +20,12 @@
     loader.efi.canTouchEfiVariables = true;
     plymouth = {
       enable = true;
-      theme = "lightbulb";
+      theme = "eu-flag";
-      themePackages = [ (pkgs.callPackage ../../packages/lightbulb-plymouth {}) ];
+      themePackages = [ (pkgs.callPackage ../../packages/eu-flag-plymouth {}) ];
     };
   };
 
-  system.nixos.distroName = "deskOS 1 - School Edition";
+  system.nixos.distroName = "deskOS 1 - EU Edition";
 
   system.autoUpgrade = {
     enable = true;
@@ -76,8 +76,8 @@
       {
         settings = {
           "org/gnome/desktop/background" = {
-            picture-uri = "file://${../../assets/school-wallpaper.jpg}";
+            picture-uri = "file://${../../assets/eu-wallpaper.jpg}";
-            picture-uri-dark = "file://${../../assets/school-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://${../../assets/school-wallpaper.jpg}";
+            picture-uri = "file://${../../assets/eu-wallpaper.jpg}";
           };
 
           "org/gnome/desktop/interface" = {
@@ -171,12 +171,12 @@
             menu-layout = "Windows";
             pinned-apps = lib.gvariant.mkArray [
               [(lib.gvariant.mkDictionaryEntry "id" "firefox.desktop")]
+              [(lib.gvariant.mkDictionaryEntry "id" "org.gnome.Geary.desktop")]
+              [(lib.gvariant.mkDictionaryEntry "id" "org.gnome.Calendar.desktop")]
               [(lib.gvariant.mkDictionaryEntry "id" "org.gnome.Nautilus.desktop")]
               [(lib.gvariant.mkDictionaryEntry "id" "writer.desktop")]
               [(lib.gvariant.mkDictionaryEntry "id" "calc.desktop")]
               [(lib.gvariant.mkDictionaryEntry "id" "impress.desktop")]
-              [(lib.gvariant.mkDictionaryEntry "id" "org.kde.krita.desktop")]
-              [(lib.gvariant.mkDictionaryEntry "id" "supertuxkart.desktop")]
               [(lib.gvariant.mkDictionaryEntry "id" "org.gnome.Software.desktop")]
             ];
           };
@@ -212,9 +212,7 @@
     gnomeExtensions.just-perfection
     gnomeExtensions.printers
     gnomeExtensions.removable-drive-menu
-    krita
     libreoffice
-    superTuxKart
   ];
 
   environment.gnome.excludePackages = with pkgs; [

modules/installer/default.nix

@@ -30,7 +30,7 @@ in {
     (modulesPath + "/profiles/installation-device.nix")
   ];
 
-  system.nixos.distroName = "deskOS 1 - School Edition";
+  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 = "lightbulb-installer";
+      theme = "eu-flag-installer";
-      themePackages = [ (pkgs.callPackage ../../packages/lightbulb-installer-plymouth {}) ];
+      themePackages = [ (pkgs.callPackage ../../packages/eu-flag-installer-plymouth {}) ];
     };
     # NOTE(m): Enable kernel modules that improve wifi support on
     # Macbooks during installation.
@@ -125,7 +125,7 @@ in {
     gnomeExtensions.no-overview
   ];
 
-  i18n.defaultLocale = "nl_NL.UTF-8";
+  i18n.defaultLocale = "en_GB.UTF-8";
 
   # Support choosing from any locale
   i18n.supportedLocales = ["all"];
@@ -149,9 +149,9 @@ in {
       sleep-inactive-ac-type='nothing'
       sleep-inactive-battery-type='nothing'
       [org.gnome.desktop.background]
-      picture-uri='file://${../../assets/school-wallpaper.jpg}'
+      picture-uri='file://${../../assets/eu-wallpaper.jpg}'
       [org.gnome.desktop.screensaver]
-      picture-uri='file://${../../assets/school-wallpaper.jpg}'
+      picture-uri='file://${../../assets/eu-wallpaper.jpg}'
     '';
 
     extraGSettingsOverridePackages = [pkgs.gnome.gnome-settings-daemon];

packages/calamares-extensions/branding/default/branding.desc

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

packages/calamares-extensions/config/modules/partition.conf

@@ -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

packages/calamares-extensions/config/modules/users.conf

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

packages/calamares-extensions/config/modules/welcome.conf

@@ -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

packages/calamares-extensions/modules/desk_os_installation/main.py

@@ -56,7 +56,7 @@ flake = f"""
   inputs = {{
     nixpkgs.url = "github:nixup-io/nixpkgs-desk-os/stable";
     desk-os = {{
-      url = "github:nixup-io/desk-os/school-edition";
+      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 - School Edition (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()
@@ -295,7 +290,7 @@ def run():
     libcalamares.utils.host_env_process_output(
         ["cp", "/dev/stdin", flakeFile], None, flake)
 
-    status = _("Installing deskOS - School Edition (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:

packages/eu-flag-installer-plymouth/default.nix

@@ -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
+  '';
+}

packages/eu-flag-installer-plymouth/src/eu-flag-installer.plymouth

@@ -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

packages/eu-flag-installer-plymouth/src/eu-flag-installer.script

@@ -1,4 +1,4 @@
-image = Image("lightbulb-installer.png");
+image = Image("eu-flag-installer.png");
 
 pos_x = Window.GetWidth()/2 - image.GetWidth()/2;
 pos_y = Window.GetHeight()/2 - image.GetHeight()/2;

packages/eu-flag-plymouth/default.nix

@@ -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
+  '';
+}

packages/eu-flag-plymouth/src/eu-flag.plymouth

@@ -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

packages/eu-flag-plymouth/src/eu-flag.script

@@ -1,4 +1,4 @@
-image = Image("lightbulb.png");
+image = Image("eu-flag.png");
 
 pos_x = Window.GetWidth()/2 - image.GetWidth()/2;
 pos_y = Window.GetHeight()/2 - image.GetHeight()/2;

packages/lightbulb-installer-plymouth/default.nix

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

packages/lightbulb-installer-plymouth/src/lightbulb-installer.plymouth

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

packages/lightbulb-plymouth/default.nix

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

packages/lightbulb-plymouth/src/lightbulb.plymouth

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