From 172ccb907e8de2f76ba3024ede0d43c47a388d20 Mon Sep 17 00:00:00 2001
From: Madeleine <spyhoodle@gmail.com>
Date: Tue, 24 May 2022 14:35:41 +0100
Subject: [PATCH 01/21] Reorganise directory, improve comments and add more
 package managers

---
 packages.py                   | 19 -------------------
 pridefetch => src/__main__.py | 32 ++++++++++++++++++--------------
 src/modules/packages.py       | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 33 deletions(-)
 delete mode 100644 packages.py
 rename pridefetch => src/__main__.py (89%)
 create mode 100644 src/modules/packages.py

diff --git a/packages.py b/packages.py
deleted file mode 100644
index 431eb66..0000000
--- a/packages.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from subprocess import check_output
-
-commands = [
-    "pacman -Qq",
-    "apt list --installed",
-    "yum list installed",
-    "dnf list installed",
-    "qlist -I",
-    "rpm -qa",
-    "nix-store -qR /run/current-system/sw"
-]
-
-def get_num_packages() -> (int, bool):
-    for command in commands:
-        try:
-            return len(check_output(command.split(" ")).decode("utf-8").split("\n")) - 1
-        except FileNotFoundError:
-            pass
-    return False
diff --git a/pridefetch b/src/__main__.py
similarity index 89%
rename from pridefetch
rename to src/__main__.py
index db7b47f..35b7667 100755
--- a/pridefetch
+++ b/src/__main__.py
@@ -1,20 +1,23 @@
 #!/usr/bin/env python3
 
+# General imports
 from argparse import ArgumentParser
 from datetime import timedelta
-from getpass import getuser
-# from platform import machine as architecture
-from platform import platform as system
-from platform import release as kernel
 from random import choice as random_choice
-from socket import gethostname
 from time import clock_gettime, CLOCK_BOOTTIME
 
+# Title - user@hostname
+from getpass import getuser
+from socket import gethostname
+
+# System info modules
+from platform import platform as system
+from platform import release as kernel
+# from platform import machine as architecture
 from distro import name as distribution
+from modules.packages import get_num_packages as packages
 
-from packages import get_num_packages as packages
-
-# Define a dictionary of all the flags and their colors
+# A dictionary of all the flags and their colors
 # Each color is the color for an individual row in the flag
 flags = {
     "classic": [196, 208, 226, 28, 20, 90],
@@ -38,18 +41,18 @@ reset = "\033[0m\033[39m"
 
 
 def color256(col: int, bg_fg: str) -> str:
-    # Hacky alias around manually typing out escape codes every time
+    # Alias to avoid manually typing out escape codes every time
     return f"\033[{48 if bg_fg == 'bg' else 38};5;{col}m"
 
 
 def draw_fetch(flag_name: str, width: int = None):
-    # Load the flag from the dictionary of flags
+    # Load the chosen flag from the dictionary of flags
     flag = flags[flag_name]
 
     # Make sure that the row color is different to the color of the hostname
     row_color = color256(flag[1] if flag[0] != flag[1] else flag[2], "fg")
 
-    # The fetch data to be displayed
+    # The fetch data (system info) to be displayed
     row_data = [
         f"{color256(flag[0], 'fg') if flag[0] != 0 else color256(242, 'fg')}"
         f"\033[1m{getuser()}@{gethostname()}{reset}",
@@ -65,7 +68,7 @@ def draw_fetch(flag_name: str, width: int = None):
         # If the data is greater than the flag length then duplicate the length of the flag
         flag = [element for element in flag for _ in (0, 1)]
 
-    # Set the width of the flag relative to its height (keep it in a nice ratio)
+    # Set the width of the flag relative to its height (keep it in a ratio)
     width = width or round(len(flag) * 1.5 * 3)
 
     # Ensures nothing is printed for empty lines
@@ -83,14 +86,14 @@ def draw_fetch(flag_name: str, width: int = None):
 
 
 def main():
-    # Argument configuration
+    # Argument configuration - options
     parser = ArgumentParser()
     parser.add_argument("-f", "--flag", help="displays the chosen flag")
     parser.add_argument("-r", "--random", help="randomly choose a flag from a list seperated by commas")
     parser.add_argument("-w", "--width", help="choose a custom width for the flag", type=int)
     parser.add_argument("-l", "--list", help="lists all the flags that can be displayed", action="store_true")
 
-    # Parse the arguments
+    # Parse (collect) any arguments
     args = parser.parse_args()
 
     if args.flag:
@@ -110,6 +113,7 @@ def main():
         print(f"Available flags:\n{', '.join(flags)}")
 
     else:
+        # By default, draw the classic flag
         draw_fetch("classic", args.width)
 
 
diff --git a/src/modules/packages.py b/src/modules/packages.py
new file mode 100644
index 0000000..5f1fd96
--- /dev/null
+++ b/src/modules/packages.py
@@ -0,0 +1,32 @@
+from subprocess import check_output
+
+commands = [
+    "pacman -Qq --color never",  # Arch Linux
+    "xbps-query -l",  # Void Linux
+    "kiss l",  # KISS Linux
+    "apt list --installed",  # Debian, Ubuntu, Mint
+    "dpkg -l",  # Debian, Ubuntu, Mint
+    "dnf list installed",  # Fedora
+    "zypper search -i",  # openSUSE
+    "rpm -qa",  # RHEL, Fedora Core, CentOS
+    "yum list installed",  # RHEL, Fedora Core, CentOS
+    "nix-store -qR /run/current-system/sw",  # NixOS
+    "equery list '*'",  # Gentoo
+    "qlist -I",  # Gentoo
+    "pkg info -a",  # BSDs
+    "pkg_info",  # BSDs
+    "apk info",  # Alpine
+]
+
+
+def get_num_packages() -> (int, bool):
+    for command in commands:
+        try:
+            # Get the length of the output of the command - the number of packages
+            return len(check_output(command.split(" ")).decode("utf-8").split("\n")) - 1
+        except FileNotFoundError:
+            # If the command doesn't exist, skip it
+            pass
+
+    # If we get here, we didn't find any of the commands
+    return False

From afc6dcb7dd239c58b988ecd915aff3347971ad37 Mon Sep 17 00:00:00 2001
From: Madeleine <32415621+SpyHoodle@users.noreply.github.com>
Date: Tue, 24 May 2022 15:00:02 +0100
Subject: [PATCH 02/21] Create a github testing workflow

---
 .github/workflows/main.yml | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..35c3ea5
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,38 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Build executable
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  push:
+    branches: [ packaging ]
+
+  pull_request:
+    branches: [ packaging ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v3
+
+      # Runs a set of commands using the runners shell
+      - name: Zip the package
+        run: |
+          cd src
+          zip -r ../pridefetch.zip *
+      
+      - name: turn into a UNIX executable
+        run: |
+          echo '#!/usr/bin/env python' | cat - pridefetch.zip > pridefetch
+          chmod +x pridefetch

From 09a38c4bf394d6473d14184c15566eb93bec80d7 Mon Sep 17 00:00:00 2001
From: Madeleine <32415621+SpyHoodle@users.noreply.github.com>
Date: Tue, 24 May 2022 15:09:12 +0100
Subject: [PATCH 03/21] Update main.yml

---
 .github/workflows/main.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 35c3ea5..b64ad5e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -32,7 +32,19 @@ jobs:
           cd src
           zip -r ../pridefetch.zip *
       
-      - name: turn into a UNIX executable
+      - name: Turn into a UNIX executable
         run: |
           echo '#!/usr/bin/env python' | cat - pridefetch.zip > pridefetch
           chmod +x pridefetch
+      
+      - name: Commit files
+        run: |
+          git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+          git commit -m "Build executable" -a
+      
+      - name: Push changes
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          branch: ${{ github.ref }}

From b5165dd81d21ebf021ad12f3978e913275c47f62 Mon Sep 17 00:00:00 2001
From: Madeleine <32415621+SpyHoodle@users.noreply.github.com>
Date: Tue, 24 May 2022 15:10:32 +0100
Subject: [PATCH 04/21] Update main.yml

---
 .github/workflows/main.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b64ad5e..86680c4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -31,6 +31,7 @@ jobs:
         run: |
           cd src
           zip -r ../pridefetch.zip *
+          cd ..
       
       - name: Turn into a UNIX executable
         run: |
@@ -39,6 +40,8 @@ jobs:
       
       - name: Commit files
         run: |
+          git add pridefetch.zip
+          git add pridefetch
           git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git config --local user.name "github-actions[bot]"
           git commit -m "Build executable" -a

From 702e54c546016a8e78ca156ad1626aa311738b97 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 24 May 2022 14:10:47 +0000
Subject: [PATCH 05/21] Build executable

---
 pridefetch     | Bin 0 -> 2814 bytes
 pridefetch.zip | Bin 0 -> 2792 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100755 pridefetch
 create mode 100644 pridefetch.zip

diff --git a/pridefetch b/pridefetch
new file mode 100755
index 0000000000000000000000000000000000000000..4b69fad6f22d83577cf03d77c0024f2d8d7f67d2
GIT binary patch
literal 2814
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
W`Tr(NL;K@L;O~p_z0T18xcvsLQ`=ks

literal 0
HcmV?d00001

diff --git a/pridefetch.zip b/pridefetch.zip
new file mode 100644
index 0000000000000000000000000000000000000000..dec1d0cdfe8897b08b5058b9990cd123be216a44
GIT binary patch
literal 2792
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
F{Rh_()8haD

literal 0
HcmV?d00001


From cb16bc7da66feac4b162cfb31ed4c3667897ac47 Mon Sep 17 00:00:00 2001
From: Madeleine <32415621+SpyHoodle@users.noreply.github.com>
Date: Tue, 24 May 2022 15:31:47 +0100
Subject: [PATCH 06/21] Clean up workflow

---
 .github/workflows/main.yml | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 86680c4..e0689b9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,46 +1,33 @@
-# This is a basic workflow to help you get started with Actions
+name: Build pridefetch executable file
 
-name: Build executable
-
-# Controls when the workflow will run
 on:
-  # Triggers the workflow on push or pull request events but only for the master branch
   push:
     branches: [ packaging ]
-
   pull_request:
     branches: [ packaging ]
 
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
   build:
-    # The type of runner that the job will run on
     runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v3
 
-      # Runs a set of commands using the runners shell
       - name: Zip the package
         run: |
           cd src
           zip -r ../pridefetch.zip *
           cd ..
       
-      - name: Turn into a UNIX executable
+      - name: Turn into an executable file
         run: |
           echo '#!/usr/bin/env python' | cat - pridefetch.zip > pridefetch
           chmod +x pridefetch
       
-      - name: Commit files
+      - name: Remove the zip file
+        run: rm pridefetch.zip
+      
+      - name: Add and commit files
         run: |
-          git add pridefetch.zip
           git add pridefetch
           git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git config --local user.name "github-actions[bot]"

From e6f35255374f9987db6edb70bff10342ecb68440 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 24 May 2022 14:32:00 +0000
Subject: [PATCH 07/21] Build executable

---
 pridefetch     | Bin 2814 -> 2814 bytes
 pridefetch.zip | Bin 2792 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 pridefetch.zip

diff --git a/pridefetch b/pridefetch
index 4b69fad6f22d83577cf03d77c0024f2d8d7f67d2..bc8787fd2b3ea1eacbc19f250ca481adeaedb786 100755
GIT binary patch
delta 130
zcmew-`cHI%0uw{YL?tD*gf~4&32!!fDYF9wCg-!uD?>zjl1eMM85mh!GBYr+R5CCy
z1b8#EhyZC02B5l)>{?Krn;)`EGl8`J<1}DOcr)36OBTfQ=hB7n#5v%a=5kqp#IAFx
F0{~x_CWQb1

delta 130
zcmew-`cHI%0#iicL?tD*^yfWE>CZQMDYF9wCg-!uD?>zjl1eMM85mh!GBYr+R5CCy
z1b8#EhyZC02B5l)>{?Krn;)`EGl8`J<1}DOe?HlOOBTfQ=hB7n#5v%a=5kqp#IAFx
F0|4c2D3t&J

diff --git a/pridefetch.zip b/pridefetch.zip
deleted file mode 100644
index dec1d0cdfe8897b08b5058b9990cd123be216a44..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2792
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
F{Rh_()8haD


From 3d73cd0c94fbc6e474070cf2697fc28c757c7b8d Mon Sep 17 00:00:00 2001
From: Madeleine <spyhoodle@gmail.com>
Date: Tue, 24 May 2022 16:34:07 +0100
Subject: [PATCH 08/21] Improve README

---
 README.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7f06eaf..99dba05 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # pridefetch 🏳️‍⚧️
 
 ![pridefetch screenshot](https://file.coffee/u/J0dk4lIjU5Wmdu.png)<br>
-Python fetch script for showing your favourite pride flags & system info!<br>
+Python fetch script for showing your favourite pride flags & system stats!<br>
 Originally forked from [megabytesofrem/pridefetch](https://github.com/megabytesofrem/pridefetch).<br>
 
 ## Examples
@@ -53,9 +53,15 @@ You can run pridefetch straight away
 nix run github:SpyHoodle/pridefetch
 ```
 
-Or, install it and run
+Or, install it and then run
 
 ```bash
 nix profile install github:SpyHoodle/pridefetch
 pridefetch
 ```
+
+## Made with ❤️
+ - [SpyHoodle](https://github.com/SpyHoodle) - Developer
+ - [Minion3665](https://github.com/Minion3665) - Developer
+ - [megabytesofrem](https://github.com/megabytesofrem) - Original author and contributor
+ - [R0dn3yS](https://github.com/R0dn3yS) - AUR maintainer

From 0c6b7204cfb463fa22251185478b68a8a89d3df3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 24 May 2022 15:34:37 +0000
Subject: [PATCH 09/21] Build executable

---
 pridefetch | Bin 2814 -> 2814 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/pridefetch b/pridefetch
index bc8787fd2b3ea1eacbc19f250ca481adeaedb786..5f534df15a966e01ae6b3da04761bdf5bfe99a6e 100755
GIT binary patch
delta 130
zcmew-`cHI%0#i`UL?tCQp5Hx5Jij-3DYF9wCg-!uD?>zjl1eMM85mh!GBYr+R5CCy
z1b8#EhyZC02B5l)>{?Krn;)`EGl8`J<1}F6`90ZyOBTfQ=hB7n#5v%a=5kqp#IAFx
F0{}waCNuy5

delta 130
zcmew-`cHI%0uw{YL?tD*gf~4&32!!fDYF9wCg-!uD?>zjl1eMM85mh!GBYr+R5CCy
z1b8#EhyZC02B5l)>{?Krn;)`EGl8`J<1}DOcr)36OBTfQ=hB7n#5v%a=5kqp#IAFx
F0{~x_CWQb1


From 41bd94800bf45cc18e6ad65fa46b6b5a9b8698bb Mon Sep 17 00:00:00 2001
From: Madeleine <spyhoodle@gmail.com>
Date: Tue, 24 May 2022 16:52:33 +0100
Subject: [PATCH 10/21] Improve README

---
 README.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 99dba05..423aee8 100644
--- a/README.md
+++ b/README.md
@@ -60,8 +60,7 @@ nix profile install github:SpyHoodle/pridefetch
 pridefetch
 ```
 
-## Made with ❤️
- - [SpyHoodle](https://github.com/SpyHoodle) - Developer
- - [Minion3665](https://github.com/Minion3665) - Developer
- - [megabytesofrem](https://github.com/megabytesofrem) - Original author and contributor
- - [R0dn3yS](https://github.com/R0dn3yS) - AUR maintainer
+## Made with ❤️ and 🏳️‍⚧
+ - Pridefetch is at an early stage, so may not work on all systems. 
+ - Please report any issues or bugs on the Issues tab
+ - Checkout our [contributing guidelines](https://github.com/SpyHoodle/pridefetch/blob/master/CONTRIBUTING.md) if you'd like to contribute.
\ No newline at end of file

From 1ab47933e832211c799836f6e92925d029ec8d18 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 24 May 2022 15:53:07 +0000
Subject: [PATCH 11/21] Build executable

---
 pridefetch | Bin 2814 -> 2814 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/pridefetch b/pridefetch
index 5f534df15a966e01ae6b3da04761bdf5bfe99a6e..eaba9d5214da54642bbef416468f48e0a44c4b5f 100755
GIT binary patch
delta 130
zcmew-`cHI%0@ISZiAqXr$^UzjlK*e?Qf3DVOwMPQSB8l6B$ZZhGcdBeWM*JssbpYa
z2=HcR5dqR13_x`o*|nfLH$P;TW&&yb$7#Tn{C~0mmn?|q&!r3DiF3d;&E>KHiCyPX
F2LPJmD_;Nr

delta 130
zcmew-`cHI%0#i`UL?tCQp5Hx5Jij-3DYF9wCg-!uD?>zjl1eMM85mh!GBYr+R5CCy
z1b8#EhyZC02B5l)>{?Krn;)`EGl8`J<1}F6`90ZyOBTfQ=hB7n#5v%a=5kqp#IAFx
F0{}waCNuy5


From 5be2e9f51f3ba247a463cef67da2c513f7d6477a Mon Sep 17 00:00:00 2001
From: Madeleine <spyhoodle@gmail.com>
Date: Tue, 24 May 2022 16:57:11 +0100
Subject: [PATCH 12/21] Fix emoji in README

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 423aee8..dedf9d9 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ nix profile install github:SpyHoodle/pridefetch
 pridefetch
 ```
 
-## Made with ❤️ and 🏳️‍⚧
+## Made with ❤️ and 🏳️‍⚧️
  - Pridefetch is at an early stage, so may not work on all systems. 
- - Please report any issues or bugs on the Issues tab
+ - Please report any issues or bugs on the Issues tab.
  - Checkout our [contributing guidelines](https://github.com/SpyHoodle/pridefetch/blob/master/CONTRIBUTING.md) if you'd like to contribute.
\ No newline at end of file

From 4608c0b1daae2a141ffafec09e6e9092ce0c72a3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 24 May 2022 15:57:31 +0000
Subject: [PATCH 13/21] Build executable

---
 pridefetch | Bin 2814 -> 2814 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/pridefetch b/pridefetch
index eaba9d5214da54642bbef416468f48e0a44c4b5f..42080344fbf35efb6219707a9e402659bf421d61 100755
GIT binary patch
delta 135
zcmew-`cHI%0+T`gL?tEmY=+(>Al~S$#10ghoX;+=3>8W$t>9*0WO>QVz`#<;z`zjT
z&CDVKq&XOX>Nc`#!L)9E#4g1I()*9ofElQFvLTlYi0jX#3+0M&!1c}LvH%O-;8Fts
DoNOY<

delta 135
zcmew-`cHI%0@ISZiAqZB$^UzjfOw;~5<5_2az4AfGE^w3w1S&~k>w>b0|QGX0|P^V
zH#3U}kmg_js@uq}1=G6u5xW!<Nbf&R17@J!$%b4qAg(``E|e?A0oON|%K|KTgG&tn
DvwJQe


From 65ee1c997ceb4a2781a40cf739994d4dfe9f7127 Mon Sep 17 00:00:00 2001
From: Skyler <skyler3665@gmail.com>
Date: Tue, 24 May 2022 19:23:27 +0100
Subject: [PATCH 14/21] Stop moving unnecessary files

We no longer need to move the packages.py file if pridefetch has been packaged into an executable
---
 flake.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index b5173b5..88d772c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,7 +22,6 @@
         installPhase = ''
           mkdir -p $out/bin
           cp ${./pridefetch} $out/bin/pridefetch
-          cp ${./packages.py} $out/bin/packages.py
           chmod +x $out/bin/pridefetch
         '';
         meta = with pkgs.lib; {

From 4b66098f2cf21acdfb258cb650b2b9a7de39ce50 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 24 May 2022 18:23:42 +0000
Subject: [PATCH 15/21] Build executable

---
 pridefetch | Bin 2814 -> 2814 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/pridefetch b/pridefetch
index 42080344fbf35efb6219707a9e402659bf421d61..074f07136dc20fbafd736a40df97dc3ed9022e86 100755
GIT binary patch
delta 130
zcmew-`cHI%0@K$?6P1+M)+zNSty9|QrOXZ#n4HfpuM83CO)9P6W?*D_$;`mOQpv!;
z5a7+sA_Am27=Y?FvTH$gZhpuv%>>f=kJEr@ozi3jE?E%IpGz0Q6X$?yn#*MY61&c&
F4glc0D4zfT

delta 130
zcmew-`cHI%0+T`gL?tD*Y=+*XY=(_q%IrXa$@%Q^$`Fy>q|yp*21b^b%nS@Hl?)6F
z0p83kB0!ph0jO>xyB1XE=7;RkOdzfQI1QMx873QW$%1(PT)GgRI0szQTrLZc*mW*-
E0ID}20ssI2


From 1fd3413005c24995e86edaf25458948057351f6a Mon Sep 17 00:00:00 2001
From: Skyler <skyler3665@gmail.com>
Date: Tue, 24 May 2022 20:35:55 +0100
Subject: [PATCH 16/21] Attempt to fix flake.nix so it packages correctly

- Match the new directory structure
- Do not copy packages.py into bin
---
 flake.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index 88d772c..aaf89bb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,9 @@
         unpackPhase = "true";
         installPhase = ''
           mkdir -p $out/bin
-          cp ${./pridefetch} $out/bin/pridefetch
+          cd src
+          zip -r ../pridefetch.zip *
+          echo '#!/usr/bin/env python' | cat - pridefetch.zip > $out/bin/pridefetch
           chmod +x $out/bin/pridefetch
         '';
         meta = with pkgs.lib; {

From d0a71df7e962ae3ff1314376821901b439c678ac Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 24 May 2022 19:36:08 +0000
Subject: [PATCH 17/21] Build executable

---
 pridefetch | Bin 2814 -> 2814 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/pridefetch b/pridefetch
index 074f07136dc20fbafd736a40df97dc3ed9022e86..4a20d433c3225a5be7ac79e92c1e956a150a98a7 100755
GIT binary patch
delta 130
zcmew-`cHI%0#nPJiAqXrD~x-SRv2&eQf3DVOwMPQSB8l6CY4rjGcdBeWM*JssbpYa
z2=HcR5dqR13_x`o*|nfLH$P;TW&&yb$7#T{!g#U)mn?|q&!r3DiF3d;&E>KHiCyPX
F2LN6GCYS&K

delta 130
zcmew-`cHI%0@K$?6P1+M)+zNSty9|QrOXZ#n4HfpuM83CO)9P6W?*D_$;`mOQpv!;
z5a7+sA_Am27=Y?FvTH$gZhpuv%>>f=kJEr@ozi3jE?E%IpGz0Q6X$?yn#*MY61&c&
F4glc0D4zfT


From a0122e1beecf5479292f1102fb9eb530445fe446 Mon Sep 17 00:00:00 2001
From: Skyler Grey <skyler3665@gmail.com>
Date: Tue, 24 May 2022 20:46:35 +0100
Subject: [PATCH 18/21] Make the flake actually work (needed to reference src
 directory properly)

---
 flake.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index aaf89bb..d991ce9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,18 +13,20 @@
     in {
       pridefetch = pkgs.stdenv.mkDerivation {
         name = "pridefetch";
-        buildInputs = [
-          (pkgs.python39.withPackages (pythonPackages: with pythonPackages; [
+        buildInputs = with pkgs; [
+          (python39.withPackages (pythonPackages: with pythonPackages; [
             distro          
           ]))
+          zip
         ];
         unpackPhase = "true";
         installPhase = ''
           mkdir -p $out/bin
-          cd src
-          zip -r ../pridefetch.zip *
-          echo '#!/usr/bin/env python' | cat - pridefetch.zip > $out/bin/pridefetch
+          cd ${./src}
+          zip -r $out/pridefetch.zip *
+          echo '#!/usr/bin/env python' | cat - $out/pridefetch.zip > $out/bin/pridefetch
           chmod +x $out/bin/pridefetch
+          rm $out/pridefetch.zip
         '';
         meta = with pkgs.lib; {
           description = "Print out system statistics with pride flags";

From b3ca1fb2eb64baa2757c76fe15f5175d7201ead1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 24 May 2022 19:48:12 +0000
Subject: [PATCH 19/21] Build executable

---
 pridefetch | Bin 2814 -> 2814 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/pridefetch b/pridefetch
index 4a20d433c3225a5be7ac79e92c1e956a150a98a7..2c3dae282c76cb120cb81f71df5ebb2669e38d51 100755
GIT binary patch
delta 130
zcmew-`cHI%0u$T3iAqXrHD<j@HD(*Vl-Yp-lk?f-l_4U%Nu?Fs42&!<nHd;ZDj66U
z0=$`7M1V9015n*Yb}gvR%@5h7nLt|qaT+kym`yg|k_GYnxpW~saSphqxm*??vFlvw
E06-`rKL7v#

delta 130
zcmew-`cHI%0#nPJiAqXrD~x-SRv2&eQf3DVOwMPQSB8l6CY4rjGcdBeWM*JssbpYa
z2=HcR5dqR13_x`o*|nfLH$P;TW&&yb$7#T{!g#U)mn?|q&!r3DiF3d;&E>KHiCyPX
F2LN6GCYS&K


From 7c712fbdac3209e849766daf780d4b10d74b9259 Mon Sep 17 00:00:00 2001
From: Madeleine <32415621+SpyHoodle@users.noreply.github.com>
Date: Tue, 24 May 2022 20:51:16 +0100
Subject: [PATCH 20/21] Delete main.yml

---
 .github/workflows/main.yml | 40 --------------------------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644
index e0689b9..0000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: Build pridefetch executable file
-
-on:
-  push:
-    branches: [ packaging ]
-  pull_request:
-    branches: [ packaging ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Zip the package
-        run: |
-          cd src
-          zip -r ../pridefetch.zip *
-          cd ..
-      
-      - name: Turn into an executable file
-        run: |
-          echo '#!/usr/bin/env python' | cat - pridefetch.zip > pridefetch
-          chmod +x pridefetch
-      
-      - name: Remove the zip file
-        run: rm pridefetch.zip
-      
-      - name: Add and commit files
-        run: |
-          git add pridefetch
-          git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
-          git commit -m "Build executable" -a
-      
-      - name: Push changes
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ github.ref }}

From 7c40532db99deaf70dc5f3ca496dd9a86f4bde2d Mon Sep 17 00:00:00 2001
From: Madeleine <32415621+SpyHoodle@users.noreply.github.com>
Date: Tue, 24 May 2022 20:51:21 +0100
Subject: [PATCH 21/21] Delete pridefetch

---
 pridefetch | Bin 2814 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100755 pridefetch

diff --git a/pridefetch b/pridefetch
deleted file mode 100755
index 2c3dae282c76cb120cb81f71df5ebb2669e38d51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2814
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
Xzd8Tkgc%?|egr;Rw4*x7{Nwf;0qxZb