From fa565874c3138369efa7912453e18c90863a3d64 Mon Sep 17 00:00:00 2001
From: "flyingscorpio@arch-desktop" <tfranken@protonmail.com>
Date: Sat, 5 Sep 2020 15:50:06 +0200
Subject: [PATCH 1/3] Refactor define_os()

---
 install.py | 61 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/install.py b/install.py
index 070b3f7..08352dd 100755
--- a/install.py
+++ b/install.py
@@ -38,43 +38,48 @@ class Installer:
     def define_os(self) -> str:
         """Define what OS we are using."""
 
-        os_release = Path("/etc/os-release")
-
         oses = ("arch", "debian", "manjaro", "ubuntu")
+        os_release = Path("/etc/os-release")
+        operating_system = None
+        for operating_system in oses:
+            if operating_system in os_release.read_text().lower():
+                ui.info_3("Found", operating_system, "based distribution")
+                break
 
+        if operating_system is None:
+            ui.warning("Operating system wasn't found")
+            operating_system = input("What is it ? ")
+
+        if operating_system in ("arch", "debian"):
+            self._update_system(operating_system)
+            return operating_system
+
+        ui.fatal("I only support Arch and Debian based distros.")
+        return "Unsupported OS"
+
+    def _update_system(self, operating_system: str) -> None:
         # defaults for subprocess.run()
         this_stdout: Optional[int] = subprocess.DEVNULL if self.hide_commands else None
         this_stderr: Optional[int] = subprocess.DEVNULL if self.hide_commands else None
 
-        for operating_system in oses:
-            if operating_system in os_release.read_text().lower():
-                ui.info_3("Found", operating_system, "based distribution")
+        if operating_system in ("arch", "manjaro"):
+            command = "sudo pacman -Syu"
+            operating_system = "arch"
 
-                if operating_system in ("arch", "manjaro"):
-                    command = "sudo pacman -Syu"
-                    operating_system = "arch"
+        elif operating_system in ("debian", "ubuntu"):
+            command = "sudo apt update"
+            operating_system = "debian"
 
-                if operating_system in ("debian", "ubuntu"):
-                    command = "sudo apt update"
-                    operating_system = "debian"
+        else:
+            raise AssertionError("The operating system should have been defined")
 
-                subprocess.run(
-                    command,
-                    check=True,
-                    shell=True,
-                    stdout=this_stdout,
-                    stderr=this_stderr,
-                )
-                return operating_system
-
-        ui.warning("Operating system wasn't found")
-        operating_system = input("What is it ? ")
-        if operating_system in ("arch", "debian"):
-            return operating_system
-
-        ui.fatal("I only support Arch and Debian based distros.")
-
-        return "Unsupported OS"
+        subprocess.run(
+            command,
+            check=True,
+            shell=True,
+            stdout=this_stdout,
+            stderr=this_stderr,
+        )
 
     def evaluate_condition(self, condition: str) -> bool:
         """Run a bash command. On success return True, else return False."""

From 7eaa6b260029f818fce4e6416a14f9ce3834f1c7 Mon Sep 17 00:00:00 2001
From: "flyingscorpio@arch-desktop" <tfranken@protonmail.com>
Date: Sat, 5 Sep 2020 16:10:47 +0200
Subject: [PATCH 2/3] Add branch icon

---
 dotfiles/zsh/p10k.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotfiles/zsh/p10k.zsh b/dotfiles/zsh/p10k.zsh
index 900fa8f..f6f6948 100644
--- a/dotfiles/zsh/p10k.zsh
+++ b/dotfiles/zsh/p10k.zsh
@@ -326,7 +326,7 @@
 
   #####################################[ vcs: git status ]######################################
   # Branch icon. Set this parameter to '\uF126 ' for the popular Powerline branch icon.
-  typeset -g POWERLEVEL9K_VCS_BRANCH_ICON=
+  typeset -g POWERLEVEL9K_VCS_BRANCH_ICON='\uF126 '
 
   # Untracked files icon. It's really a question mark, your font isn't broken.
   # Change the value of this parameter to show a different icon.

From 0be9666ae75e1ca576a8018d152b722b548671e5 Mon Sep 17 00:00:00 2001
From: "flyingscorpio@arch-desktop" <tfranken@protonmail.com>
Date: Sat, 5 Sep 2020 16:11:39 +0200
Subject: [PATCH 3/3] Minor changes in do_install()

---
 install.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/install.py b/install.py
index 08352dd..16345c2 100755
--- a/install.py
+++ b/install.py
@@ -215,6 +215,7 @@ class Installer:
                 command = "sudo apt install -y {}".format(package)
 
             ui.info_count(i, len(packages), package, end="... ")
+
             install = subprocess.run(
                 command,
                 check=False,
@@ -235,12 +236,7 @@ class Installer:
             for failed in failed_installs:
                 ui.info(" ", failed)
 
-            ui.info(
-                ui.yellow,
-                "Are the packages really meant for {} systems?".format(
-                    self.operating_system
-                ),
-            )
+            ui.warning(f"Are the packages really meant for {self.operating_system} systems?")
 
     def do_run(self, command: str, condition: str = "true") -> None:
         """Run a command."""