diff --git a/installparty/lumi-handout/handout-english.tex b/installparty/lumi-handout/handout-english.tex
index bcb149186793f864d1ad13d21af08b4151cc1e3d..9a069e62f8ab48a4092234e2fdb43d59a70cdf1b 100644
--- a/installparty/lumi-handout/handout-english.tex
+++ b/installparty/lumi-handout/handout-english.tex
@@ -76,6 +76,8 @@
\newcommand{\softwarecenter}{\textit{Discover}}
\newcommand{\windowsverzeichnis}{\texttt{windows} im Benutzerverzeichnis}
\newcommand{\cryptokiss}{\textit{Crypto-KISS}}
+\newcommand{\icon}[2][]{\raisebox{-0.5ex}{\includegraphics[#1]{icons/#2}}}
+
\begin{document}
\lhead{\kopflinks}
\rhead{\kopfrechts}
@@ -88,6 +90,7 @@
\item There is a \helpindicator\footnotemark{} on your table. If you have a question place the \helpindicator{} and an assistant will join you as soon as possible. Please do not pull the inner part of the \helpindicator{} on your own.
\item You have scanned the QR code of this event (which you find on this sheet) with the Corona-Warn-App\footnotemark{} to check in.
\item Make sure you have a backup of all important data on an external device.
+ \item You have a charge cable for you computer. (The battery must not get empty during the installation!)
\item Please wear a mask during the whole event.
\end{itemize}
\vspace{1mm}
@@ -119,44 +122,36 @@
\end{itemize}
\item Now you can start the live system from the \lipstick\footnote{\lipstickexp}.
\begin{itemize}
- \item In order to improve preparation of upcoming LIPs we will collect hardware related data. If you don't want us to collect this data, select an entry labeled “without LIPNSA”.
- \item We usually recommend installing Kubuntu 22.04 LTS. If you have specific software requirements or use a Microsoft Surfacee device, discuss the Kubuntu version with your assistant.
+ \item We recommend installation with open source drivers. If there are problems with these drivers, you can try the proprietary drivers.
\item Select the appropriate entry with the arrow keys and \tasteReturn and wait until the user interface shows up.
\end{itemize}
\item With the help of the assistant set up the partition table.
\end{itemize}
-\vspace{3mm}
+\vspace{1mm}
\section{Installation}
\begin{itemize}
- \item \parbox[t]{.4\textwidth-\leftmargin}{Start the installer from the desktop shortcut. Make sure that:
+ \item \parbox[t]{.4\textwidth-\leftmargin}{%
+ Start the installer from the desktop shortcut.
+ \item Follow the instructions on the installation program. Please note:
\begin{itemize}
- \item \enquote{Install third-party software} is \textbf{checked}
- \item \enquote{Download updates while installing} is \textbf{unchecked}
- \item \textbf{Don't} select \enquote{Minimal Installation}.
- \item You might see a question concerning disk mounting, where you should select \enquote{no}.
- \item \parbox[t]{\textwidth}{Choose \enquote{Manual} in the partitioning menu. Fill out the filesystem assignment with your assistant.}
+ \item In the menu \enquote{partitioning}: select \enquote{manual partitioning} or \enquote{replace partition}. Fill out the filesystem assignment with your assistant.
+ \item Remember your password or write it down!
+ \item Hints for choosing a password:
+ \rlap{\burl{https://xkcd.com/936} and \burl{https://xkcd.com/792}}
\end{itemize}
\vspace*{2pt}%
}%
\hfill%
- \parbox[t][3.3cm][c]{.58\textwidth}{\vspace*{-16mm}\includegraphics[width=.58\textwidth]{data/battery-staple}}
- \item Follow the instructions of the installer.
- \begin{itemize}
- \item \noindent Select \enquote{Require my password to log in}. Remember your password or write it down!
- \item Tips for choosing a password:
- \burl{https://xkcd.com/936} and \burl{https://xkcd.com/792}
- \end{itemize}
- \item After the installation has finished, a script will lead you through the installation of some useful programs.
- \begin{itemize}
- \item The Ubuntu firewall (\emph{ufw}) should be enabled when prompted. Exceptions can be added later if necessary. If you have questions, ask an assistant.
-% \item If you installed Xubuntu or are unsure: Please select the programs together with an assistant.
-% \item When prompted for Kerberos use the arrow-keys to choose \enquote{OK} and confirm with \tasteReturn.
- \end{itemize}
- \item After the script has finished reboot the device. As soon as Linux has been stopped unplug the \lipstick{}.
+ \parbox[t][3.5cm][c]{.58\textwidth}{\vspace*{-10mm}\includegraphics[width=.58\textwidth]{data/battery-staple}}
+ \item After the installation has finished, the installation program will lead you through the installation of some useful programs. Choose which you want to install.
+ \begin{itemize}
+ \item Confirm the installation of the selected programs.
+ \end{itemize}
+ \item After the installation program has finished reboot the device. As soon as Linux has been stopped unplug the \lipstick{}.
\item In case of dual-boot start Windows by choosing the Windows entry in the boot menu and pressing \tasteReturn.\\
Restart the device if Windows booted successfully.
- \item \parbox[t]{.5\textwidth-\leftmargin}{Start Linux. It should start by default, alternatively you can choose it manually in the boot menu and start it by pressing \tasteReturn.}
+ \item \parbox[t]{.5\textwidth-\leftmargin}{Start Manjaro. It should start by default, alternatively you can choose it manually in the boot menu and start it by pressing \tasteReturn.}
\end{itemize}
\begin{minipage}{0.5\textwidth}
\textbf{Almost done!}
@@ -185,25 +180,29 @@
\rhead{}
\cfoot{}
-\vspace*{-1cm}
-\section{Setting up an Internet connection}
-\subsection{Wired network (LAN)}
-\begin{itemize}
- \item Connect the network cable to your device. A notification will inform you when the connection is established.
- \item Briefly test the connection.
- \begin{itemize}
- \item Open your Browser (\textit{Firefox}) and visit the OSAK website: \osakurl{}
- \end{itemize}
-\end{itemize}
+%\vspace*{-1cm}
+%\section{Setting up an Internet connection}
+%\subsection{Wired network (LAN)}
+%\begin{itemize}
+% \item Connect the network cable to your device. A notification will inform you when the connection is established.
+% \item Briefly test the connection.
+% \begin{itemize}
+% \item Open your Browser (\textit{Firefox}) and visit the OSAK website: \osakurl{}
+% \end{itemize}
+%\end{itemize}
\begin{minipage}{0.5\textwidth}
-\subsection{Wireless connection (Wi-Fi)}
+\subsection{Configure eduroam}
\begin{itemize}
- \item Login into \burl{https://rwth-aachen.de/eduroam}. %using your TIM-identification and password.
- \item Choose \enquote{Create login data} to generate Wi-Fi credentials. You will need them later.
- \item Click on \enquote{Networks} in the menu bar on the bottom right corner. Choose \enquote{eduroam} from the available connections.
+ \item Connect with the Wi-Fi network \enquote{RWTH guests} or do the following steps using another device with internet connection:
+ \begin{itemize}
+ \item Login into \burl{https://rwth-aachen.de/eduroam}. %using your TIM-identification and password.
+ \item Choose \enquote{Create login data} to generate Wi-Fi credentials. You will need them later.
+ \end{itemize}
+ \item Click on \enquote{Networks} \icon{network-wireless-acquiring.pdf} in the menu bar on the bottom right corner. Choose \enquote{eduroam} from the available connections.
\item Configure according to the picture. Replace the username with the Wi-Fi-Login and password you generated earlier.
- \item Save the connection and test it briefly. Remove the cable plugged in beforehand.
+ \item Save the connection and test it.
+ %Remove the cable plugged in beforehand.
%\item Now disconnect the wireless connection.
%\begin{itemize}
% \item In the right bottom corner click \enquote{Networks}. Go to \enquote{active connections} $\rightarrow$ \enquote{eduroam}, click \enquote{Disconnect}.
@@ -219,24 +218,31 @@
\vspace{-2mm}
\section{Using Linux}
\begin{itemize}
- \item Open the File Manager (\textit{Dolphin}) via the \startmenu{}. You can put files in your home directory.
+ \item On the desktop you find a brief documentation of some of the installed programs.
+ \item Open the File Manager \icon[scale=0.5]{system-file-manager.pdf} (\textit{Dolphin}) via the \startmenu{}. You can put files in your home directory.
%There is also some documentation of already installed software.
\begin{itemize}
\item Under \enquote{devices} you find USB-Sticks and your Windows directories (is available and unencrypted). If you have problems accessing your Windows directories, ask an assistant.
\end{itemize}
- \item Configure your system to your liking using the system settings.
+ \item Configure your system to your liking using the system settings \icon[scale=0.5]{systemsettings.pdf}.
\begin{itemize}
- \item Configure you touchpad in \enquote{Input Devices}: You can invert the scrolling direction and enable Tap-to-click.
+ \item Configure you touchpad in \enquote{Input Devices}: For example you can invert the scrolling direction.
\item In \enquote{Workspace Behavior} you can add virtual desktops, which are very useful.
\item You can change the desktop background (and much more) by right-clicking on the desktop.
\item Other useful settings include: power management, night colors (in \enquote{Display and Monitor}), shortcuts, \ldots
\end{itemize}
\item Test logout, shutdown, restart, login, and stand-by
\item Test hotkeys, \textit{e.g.} keys for volume and display brightness.
- \item Check whether the correct time is shown.
+ \item In case of dual boot: check if Linux and Windows show the correct time.%
+ \footnote{%
+ Windows usually assumes that the system clock is set to local time while Linux sets the system clock to UTC.
+ }
+ If they do not agree on the time, the following command on the Linux command line may help: \texttt{sudo timedatectl set-local-rtc 1}
+ \item On the right of the menu bare you find the symbol for updates \icon{update.pdf}. The red dot shows that updates are available. Available updates should be installed!
+ \item With \enquote{add/remove software} \icon[scale=0.5]{system-software-install.pdf} you can install more software.
\item Let an assistant confirm the completeness and integrity of your installation.
\item Return your \lipstick{} and the \laufzettel{}\footnote{\laufzettelexp} to the assistant.
- \item At \burl{https://video.fsmpi.rwth-aachen.de/?course=14ss-kiss} you can find recordings of previous Linux workshops where a small introduction to Linux is given.
+ %\item At \burl{https://video.fsmpi.rwth-aachen.de/?course=14ss-kiss} you can find recordings of previous Linux workshops where a small introduction to Linux is given.
\begin{center}
\vspace{1em}
\begin{overpic}[width=0.6\textwidth]{data/cautionary.png}
@@ -261,7 +267,7 @@
\end{minipage}
\begin{minipage}{0.7\textwidth}
\textbf{In case of questions or feedback we are looking forward to your email to \osakmail{}.}
- If you enjoy using your Linux and want to help us out at the next LIP, ask an assistant to subscribe you to our LIP-assistant mailing list or join our OSAK-meeting. The OSAK-meeting takes place on Tuesday every second week (every even numbered week, e.g. 12.07., 26.07., \dots{}) at 8pm in room 2015 at the Informatikzentrum or virtually in \burl{https://fsmpi.eu/osak-sitzung}.
+ If you enjoy using your Linux and want to help us out at the next LIP, ask an assistant to subscribe you to our LIP-assistant mailing list or join our OSAK-meeting. The OSAK-meeting takes place on Tuesday every second week (every even numbered week, e.g. 18.10., 01.11., \dots{}) at 8pm in room 2015 at the Informatikzentrum or virtually in \burl{https://fsmpi.eu/osak-sitzung}.
\end{minipage}
\clearpage
diff --git a/installparty/lumi-handout/handout.tex b/installparty/lumi-handout/handout.tex
index 35b64089fc03f84792d2f59d89918f63b4f53c29..1470b9871063124bb344e937a7a85232c5778779 100644
--- a/installparty/lumi-handout/handout.tex
+++ b/installparty/lumi-handout/handout.tex
@@ -75,6 +75,8 @@
\newcommand{\softwarecenter}{\textit{pamac-manager}}
\newcommand{\windowsverzeichnis}{\texttt{windows} im Benutzerverzeichnis}
\newcommand{\cryptokiss}{\textit{Crypto-KISS}}
+\newcommand{\icon}[2][]{\raisebox{-0.5ex}{\includegraphics[#1]{icons/#2}}}
+
\begin{document}
\lhead{\kopflinks}
\rhead{\kopfrechts}
@@ -204,7 +206,7 @@
\item Öffne \burl{https://rwth-aachen.de/eduroam} und melde dich an.
\item Generiere dort WLAN-Zugangsdaten, die du gleich benötigst.
\end{itemize}
- \item In der Menüleiste unten rechts \includegraphics{icons/network-wireless-acquiring.pdf} \enquote{Netzwerke} (möglicherweise hinter kleinem Pfeilchen) anklicken. Wähle das WLAN-Netzwerk \enquote{eduroam}.
+ \item In der Menüleiste unten rechts \enquote{Netzwerke} \icon{network-wireless-acquiring.pdf} (möglicherweise hinter kleinem Pfeilchen) anklicken. Wähle \enquote{eduroam} unter den verfügbaren Verbindungen aus.
\item Konfiguriere es wie rechts im Bild gezeigt. Ersetze dabei den Benutzernamen durch den generierten WLAN-Login und trage das angezeigte Passwort ein.
\item Speichere die Verbindung ab und teste sie.
%Entferne dazu das LAN-Kabel.
@@ -225,12 +227,12 @@
\section{Dein Linux benutzen}
\begin{itemize}
\item Auf dem Desktop findest du eine kurze Dokumentation zu einem Teil der installierten Software.
- \item Öffne den Dateimanager \includegraphics[scale=0.5]{icons/system-file-manager.pdf} (\textit{Dolphin}). In deinem Benutzerverzeichnis kannst du Dateien ablegen. %Außerdem findest du dort eine kleine Dokumentation zu einem Teil der bereits installierten Software.
+ \item Öffne den Dateimanager \icon[scale=0.5]{system-file-manager.pdf} (\textit{Dolphin}). In deinem Benutzerverzeichnis kannst du Dateien ablegen. %Außerdem findest du dort eine kleine Dokumentation zu einem Teil der bereits installierten Software.
\begin{itemize}
\item Unter \enquote{Geräte} findest du z.B.~USB-Sticks und dein Windowsverzeichnis (falls vorhanden und nicht verschlüsselt). Falls dein Windowsverzeichnis nicht erkannt wird, frage eine:n Helfer:in.
\end{itemize}
%\item Wenn du unter Linux auf dein Windowsverzeichnis zugreifen möchtest, lass es dir von eine:r Helfer:in einrichten.
- \item Konfiguriere die Systemeinstellungen \includegraphics[scale=0.5]{icons/systemsettings.pdf} nach deinen Wünschen.
+ \item Konfiguriere die Systemeinstellungen \icon[scale=0.5]{systemsettings.pdf} nach deinen Wünschen.
\begin{itemize}
\item Unter \enquote{Eingabegeräte} kannst du z.B.~für Touchpads die Scrollrichtung umkehren.
\item Unter \enquote{Verhalten des Arbeitsbereichs} kannst du virtuelle Arbeitsflächen hinzufügen. Diese sind sehr praktisch.
@@ -244,8 +246,8 @@
Windows nimmt üblicherweise an, dass die interne Uhr des Computers die lokale Zeit anzeigt. Linux stellt die interne Uhr auf UTC.
}
Wenn Linux und Windows sich über die Uhrzeit nicht einig sind, führe folgenden Befehl in einer Linux-Kommandozeile aus: \texttt{sudo timedatectl set-local-rtc 1}
- \item Mit \enquote{Software hinzufügen/entfernen} \includegraphics[scale=0.5]{icons/system-software-install.pdf} kannst du weitere Programme installieren.
- \item Rechts unten findest du das Symbol für Updates \includegraphics{icons/update.pdf}. Der rote Punkt zeigt, dass Updates verfügbar sind. Wenn Updates verfügbar sind, solltest du diese auch installieren!
+ \item Rechts unten findest du das Symbol für Updates \icon{update.pdf}. Der rote Punkt zeigt, dass Updates verfügbar sind. Wenn Updates verfügbar sind, solltest du diese auch installieren!
+ \item Mit \enquote{Software hinzufügen/entfernen} \icon[scale=0.5]{system-software-install.pdf} kannst du weitere Programme installieren.
\item Lass dir von eine:r Helfer:in die vollständige und erfolgreiche Installation bestätigen.
%\item Bringe den \lipstick{} und den \laufzettel{}\footnote{\laufzettelexp} zurück zur Anmeldung, melde dich ab und erhalte deinen Pfand zurück.
\item \lipstick{} und \laufzettel{}\footnote{\laufzettelexp} werden dann auch von deine:r Helfer:in mitgenommen. So sparst du dir einen Weg.
@@ -276,7 +278,7 @@
\textbf{Schreib uns gern an \osakmail{} deine Fragen, dein Feedback oder was du sonst auf dem Herzen hast!}\\
Wenn du Spaß an deinem Linux hast und uns bei der nächsten Linux Install Party unterstützen möchtest, lass dich auf die Mailingliste für LIP-Helfer:innen setzen.
Alternativ komm' einfach zu einer Sitzung des \osak{}es.
- Wir treffen uns dienstags alle zwei Wochen in jeder geraden Woche (z.B. am 18.10., 01.11., \dots{}) um 20:00 Uhr in Raum 2015 im Informatikzentrum bzw. digital auf \burl{https://fsmpi.eu/osak-sitzung}.
+ Wir treffen uns dienstags alle zwei Wochen in jeder geraden Woche (z.B.~am 18.10., 01.11., \dots{}) um 20:00 Uhr in Raum 2015 im Informatikzentrum bzw. digital auf \burl{https://fsmpi.eu/osak-sitzung}.
\end{minipage}
\clearpage