From b09cceb2593df299caf8923d5156ca060edc44a8 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Sun, 28 Jul 2024 01:44:16 -0400
Subject: [PATCH] feat: add 'from' script to get real path of exe

---
 common/default.nix             | 10 +-----
 common/home/default.nix        |  1 -
 common/nix-on-droid.nix        |  1 +
 common/{home => }/packages.nix | 46 ++++++++++++++++++++++++--
 devices/android/default.nix    | 59 +++++++++++-----------------------
 5 files changed, 64 insertions(+), 53 deletions(-)
 rename common/{home => }/packages.nix (50%)

diff --git a/common/default.nix b/common/default.nix
index 32d240af..465d9b44 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -13,6 +13,7 @@
     ./vars
 
     ./modules
+    ./packages.nix
 
     home-manager.nixosModules.home-manager
 
@@ -80,15 +81,6 @@
 
   environment.systemPackages =
     (with pkgs; [
-      # File management
-      imagemagick
-      unzip
-      zip
-      unzip
-      p7zip
-      rar
-      unrar
-
       # Peripherals
       hdparm
       pciutils
diff --git a/common/home/default.nix b/common/home/default.nix
index b86d8a13..3c274ddf 100644
--- a/common/home/default.nix
+++ b/common/home/default.nix
@@ -6,6 +6,5 @@
     ./neovim
     ./nix-index
     ./tmux
-    ./packages.nix
   ];
 }
diff --git a/common/nix-on-droid.nix b/common/nix-on-droid.nix
index b13dbe79..23b58c4c 100644
--- a/common/nix-on-droid.nix
+++ b/common/nix-on-droid.nix
@@ -6,6 +6,7 @@
   imports = [
     ./vars
     ./modules/global.nix
+    ./packages.nix
   ];
 
   nix = {
diff --git a/common/home/packages.nix b/common/packages.nix
similarity index 50%
rename from common/home/packages.nix
rename to common/packages.nix
index f43d1e31..37ab5157 100644
--- a/common/home/packages.nix
+++ b/common/packages.nix
@@ -3,7 +3,7 @@
   self,
   ...
 }: {
-  home.packages =
+  environment.systemPackages =
     (with self.packages.${pkgs.system}; [
       pokemon-colorscripts
       repl
@@ -12,18 +12,45 @@
       undollar
     ])
     ++ (with pkgs; [
+      alejandra
+
+      # Archiving
+      zip
+      unzip
+      p7zip
+      rar
+      bzip2
+      gzip
+      gnutar
+      xz
+
+      # File management
+      findutils
+      diffutils
+      utillinux
+      which
+      imagemagick
+
       # Networking
       dig.dnsutils
-      mosh
       openssh
       rsync
       wget
+      gnupg
 
       # Misc CLI stuff
       killall
       nix-output-monitor
       progress
       tree
+      gnugrep
+      gnused
+
+      # Expected Stuff
+      hostname
+      man
+      perl
+      tzdata
     ])
     ++ [
       # This could help as well: nix derivation show -r /run/current-system
@@ -33,5 +60,20 @@
           nix-store --query --requisites /run/current-system | cut -d- -f2- | sort -u
         '';
       })
+
+      (pkgs.writeShellApplication {
+        name = "from";
+
+        runtimeInputs = with pkgs; [
+          coreutils
+          which
+        ];
+
+        text = ''
+          for var do
+              realpath "$(which "$var")"
+          done
+        '';
+      })
     ];
 }
diff --git a/devices/android/default.nix b/devices/android/default.nix
index e0a687d3..87c971d6 100644
--- a/devices/android/default.nix
+++ b/devices/android/default.nix
@@ -18,47 +18,24 @@
     ];
   })}/share/fonts/truetype/NerdFonts/JetBrainsMonoNerdFontMono-Regular.ttf";
 
-  environment.packages =
-    (with pkgs; [
-      diffutils
-      findutils
-      utillinux
-      tzdata
-      hostname
-      man
-      gnugrep
-      ripgrep
-      gnupg
-      gnused
-      gnutar
-      bzip2
-      gzip
-      xz
-      zip
-      unzip
-      openssh
-      perl
-      which
-      alejandra
-    ])
-    ++ [
-      (pkgs.writeShellApplication {
-        name = "switch";
-        runtimeInputs = with pkgs; [
-          nix-output-monitor
-        ];
-        text = ''
-          exec nix-on-droid ${lib.concatStringsSep " " [
-            "switch"
-            "--flake ${config.environment.variables.FLAKE}"
-            "--builders ssh-ng://matt@100.64.0.7"
-            ''"$@"''
-            "|&"
-            "nom"
-          ]}
-        '';
-      })
-    ];
+  environment.packages = [
+    (pkgs.writeShellApplication {
+      name = "switch";
+      runtimeInputs = with pkgs; [
+        nix-output-monitor
+      ];
+      text = ''
+        exec nix-on-droid ${lib.concatStringsSep " " [
+          "switch"
+          "--flake ${config.environment.variables.FLAKE}"
+          "--builders ssh-ng://matt@100.64.0.7"
+          ''"$@"''
+          "|&"
+          "nom"
+        ]}
+      '';
+    })
+  ];
 
   environment.etcBackupExtension = ".bak";
   environment.motd = null;