Artemis Nova-T2!

t2linux · Sep 15, 2022 · c1eb196 · c1eb196
2 parents d109700 + ae3084f
commit c1eb196
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 22 deletions.
diff --git a/calamares-extra-modules/src/modules/README.md b/calamares-extra-modules/src/modules/README.md
@@ -1,21 +1,16 @@
 ### Documentation on why we are using this modified versions will follow here:
 
 
-1. copy_kernel
+1. **copy_kernel:** *unused* now a shellprocess: [shellprocess_ck.conf](https://github.com/endeavouros-team/EndeavourOS-calamares/blob/main/calamares/modules/shellprocess_ck.conf)
 
-2. **eos_script:**
-   This module is unique to EndeavourOS, and used to integrate the scripts we need to create EndeavourOS and mainly Archlinux specific configurations.
+2. **eos_script:** This module is unique to EndeavourOS, and used to integrate the scripts we need to create EndeavourOS and mainly Archlinux specific configurations.
 
-3. **fstab** and ***mount**:
-   We use the fstab and mount modules from Calamares 3.3. There are a couple of big advantages:
+3. **fstab** and ***mount:** We use the fstab and mount modules from Calamares 3.3. There are a couple of big advantages:
+   * Mount options are now set prior to installation so things like compression are applied to the install itself
+   * You can now have separate options for both SSDs and HDDs
 
-    Mount options are now set prior to installation so things like compression are applied to the install itself
-    You can now have separate options for both SSDs and HDDs
+5. **packages:** We are using a custom version of the packages module to provide feedback to the user during the package installation process
 
-5. packages
+6. **pacstrap:** This module is unique to EndeavourOS, and the pure online install method to be close to arch we are using pacstrap for the initial system creation.
 
-6. **pacstrap:**
-   This module is uniowue to EndeavourOS, and the pure online install method to be close to arch we are using pacstrap for the initial system creation.
-
-7. **userpkglist:**
-  This module is unique to EndeavourOS, and used on the implementation for users to add a list of packages that will get installed in addition to the         system on install process. 
+7. **userpkglist:** This module is unique to EndeavourOS, and used on the implementation for users to add a list of packages that will get installed in addition to the system on install process. 
diff --git a/calamares/modules/netinstall.yaml b/calamares/modules/netinstall.yaml
@@ -447,7 +447,7 @@
     - x-apps
     - xdg-user-dirs-gtk
 - name: "Budgie-Desktop"
-  description: "Budgie - I Tawt I Taw A Purdy Desktop"
+  description: "Budgie - an independent, familiar, and modern desktop."
   hidden: false
   selected: false
   critical: true

diff --git a/calamares/modules/packagechooser_ce.conf b/calamares/modules/packagechooser_ce.conf
@@ -98,7 +98,7 @@ items:
             - thunar-archive-plugin
             - thunar-media-tags-plugin
             - thunar-volman
-            - ttf-nerd-fonts-symbols
+            - ttf-nerd-fonts-symbols-2048-em
             - tumbler
             - xbindkeys
             - xclip
@@ -170,7 +170,7 @@ items:
             - thunar-media-tags-plugin
             - thunar-volman
             - tint2
-            - ttf-nerd-fonts-symbols
+            - ttf-nerd-fonts-symbols-2048-em
             - tumbler
             - xbindkeys
             - xcursor-neutral
@@ -205,6 +205,7 @@ items:
             - arc-gtk-theme-eos
             - archlinux-xdg-menu
             - dex
+            - dunst
             - eos-lightdm-slick-theme
             - eos-qogir-icons
             - eos-skel-ce-qtile
@@ -233,7 +234,7 @@ items:
             - thunar-media-tags-plugin
             - thunar-volman
             - ttf-cascadia-code
-            - ttf-nerd-fonts-symbols
+            - ttf-nerd-fonts-symbols-2048-em
             - tumbler
             - xbindkeys
             - xcursor-neutral
@@ -299,7 +300,7 @@ items:
             - thunar-media-tags-plugin
             - thunar-volman
             - ttf-jetbrains-mono
-            - ttf-nerd-fonts-symbols
+            - ttf-nerd-fonts-symbols-2048-em
             - ttf-ubuntu-font-family
             - waybar
             - wayland-protocols
@@ -349,12 +350,13 @@ items:
             - picom
             - tint2
             - rofi
+            - slock
             - sxhkd
             - thunar
             - thunar-archive-plugin
             - thunar-volman
             - ttf-jetbrains-mono
-            - ttf-nerd-fonts-symbols
+            - ttf-nerd-fonts-symbols-2048-em
             - tumbler
             - worm
             - xcursor-neutral

diff --git a/calamares/modules/shellprocess_initialize_pacman.conf b/calamares/modules/shellprocess_initialize_pacman.conf
@@ -17,6 +17,9 @@ script:
  - command: "bash /etc/calamares/scripts/update-mirrorlist"
    timeout: 1200
  - "mkdir -p @@ROOT@@/etc/pacman.d/"
+ - command: "eos-rankmirrors"
+   timeout: 1200
+ - "cp /etc/pacman.d/endeavouros-mirrorlist @@ROOT@@/etc/pacman.d/"
  - "cp /etc/pacman.d/mirrorlist @@ROOT@@/etc/pacman.d/"
  - "cp -a /etc/pacman.d/gnupg @@ROOT@@/etc/pacman.d/"
  - "cp /etc/resolv.conf @@ROOT@@/etc/"

diff --git a/calamares/modules/shellprocess_initialize_pacman_offline.conf b/calamares/modules/shellprocess_initialize_pacman_offline.conf
@@ -12,6 +12,10 @@ script:
  - "chmod +x /etc/calamares/scripts/create-pacman-keyring"
  - command: "bash /etc/calamares/scripts/create-pacman-keyring"
    timeout: 1200
+ - "chmod +x /etc/calamares/scripts/create-endeavouros-mirrorlist-offline"
+ - command: "bash /etc/calamares/scripts/create-endeavouros-mirrorlist-offline"
+   timeout: 1200
+ - "cp /etc/pacman.d/endeavouros-mirrorlist.offline-install @@ROOT@@/etc/pacman.d/endeavouros-mirrorlist"
  - "cp /etc/pacman.d/mirrorlist @@ROOT@@/etc/pacman.d/"
  - "cp -a /etc/pacman.d/gnupg @@ROOT@@/etc/pacman.d/"
 

diff --git a/calamares/scripts/create-endeavouros-mirrorlist-offline b/calamares/scripts/create-endeavouros-mirrorlist-offline
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+Main()
+{
+    # Create endeavouros-mirrorlist.offline for offline install.
+    # Prefer mirrors that work well worldwide.
+    #
+    # Assumptions:
+    #  - official /etc/pacman.d/endeavouros-mirrorlist exists
+    #  - the format of country comments is static and unique, e.g.:
+    #      ## Germany
+
+    local suffix=".offline-install"
+    local mirrorlist="/etc/pacman.d/endeavouros-mirrorlist"
+    local offline="$mirrorlist$suffix"
+
+    printf "# EndeavourOS mirrorlist for offline install only.\n\n" > $offline
+    cat "$mirrorlist" | sed -n '/^## Germany/,/^$/p'  >> "$offline"
+    cat "$mirrorlist" | sed -n '/^## [A-Z].*/,$p'     >> "$offline"
+}
+
+Main "$@"
diff --git a/calamares/scripts/update-mirrorlist b/calamares/scripts/update-mirrorlist
@@ -16,7 +16,7 @@ CCCheck() {   # check validity of country code
 GetYourCountryCode() {
     local IP code
 
-    code="$(curl -Lsm 10 https://ipinfo.io/country)"
+    code="$(show-location-info country)"
     CCCheck "$code" && {
         echo "$code" ; return
     }
@@ -41,7 +41,7 @@ GetYourCountryCode() {
         echo "$code" ; return
     }
 
-    code="$(curl ipinfo.io 2>/dev/null | grep '"country":' | sed 's|^.*: "\([A-Z][A-Z]\)",$|\1|')"
+    code="$(show-location-info country)"
     CCCheck "$code" && {
         echo "$code" ; return
     }
@@ -118,7 +118,7 @@ RunCmd() {
 }
 
 Main() {
-    local VERSION="2.0.9"                   # started from 2.0!
+    local VERSION="2.1"                   # started from 2.0!
     local progname="$(basename "$0")"
     local mf=/etc/pacman.d/mirrorlist
     local bu=/tmp/mirrorlist.bu             # original mirrorlist, saved by Welcome