migrate scripts

5 files changed, 20 insertions, 19 deletions

diff --git a/macos.local/.flake/home/programs/core.nix.org b/macos.local/.flake/home/programs/core.nix.org
index 1700521..96710ca 100644
--- a/macos.local/.flake/home/programs/core.nix.org
+++ b/macos.local/.flake/home/programs/core.nix.org
@@ -17,6 +17,7 @@
       aspell
       bash-language-server
       inetutils
+      choose-gui
       clang-tools
       cmake
       cmake-language-server
diff --git a/macos.local/.flake/home/scripts.nix.org b/macos.local/.flake/home/scripts.nix.org
new file mode 100644
index 0000000..6bf46a6
--- /dev/null
+++ b/macos.local/.flake/home/scripts.nix.org
@@ -0,0 +1,18 @@
+#+title: Custom Scripts
+
+#+begin_src nix
+  { config, pkgs, ... }:
+
+  {
+    home.file = {
+      ".local/bin/launcher" = {
+        text ''
+          #!/bin/sh
+          app="$(ls /Applications/ /Applications/Utilities/ /System/Applications/ /System/Applications/Utilities/ ~/Applications/ | grep '\.app$' | sed 's/\.app$//g' | choose -f "SauceCodePro Nerd Font" -s 15 -b ece0c9).app"
+          open -n "$HOME/Applications/$app" || open -n "/Applications/$app" || open -n "/System/Applications/Utilities/$app" || open -n "/System/Applications/$app" || open -n "/Applications/Utilities/$app"
+        '';
+        executable = true;
+      };
+    };
+  }
+#+end_src
diff --git a/macos.local/.flake/system/core.nix.org b/macos.local/.flake/system/core.nix.org
index d8e02dd..2cd455a 100644
--- a/macos.local/.flake/system/core.nix.org
+++ b/macos.local/.flake/system/core.nix.org
@@ -10,6 +10,7 @@ This file imports various system configuration components in addition to enablin
       ./skhd.nix
       ./yabai.nix
     ];
+
     environment.systemPackages = with pkgs; [
       emacs-macport
       gnupg
diff --git a/macos.local/.gnupg/gpg-agent.org b/macos.local/.gnupg/gpg-agent.org
deleted file mode 100644
index 8de64d2..0000000
--- a/macos.local/.gnupg/gpg-agent.org
+++ /dev/null
@@ -1,6 +0,0 @@
-#+title: GPG Agent Conf
-Add =pinentry= program for Mac OS.
-
-#+begin_src conf :tangle ~/.gnupg/gpg-agent.conf
-  pinentry-program /opt/homebrew/bin/pinentry-mac
-#+end_src
diff --git a/macos.local/.local/bin/launcher.org b/macos.local/.local/bin/launcher.org
deleted file mode 100755
index f74d094..0000000
--- a/macos.local/.local/bin/launcher.org
+++ /dev/null
@@ -1,13 +0,0 @@
-#+title: Application Launcher Script
-
-Search several locations for applications with =choose=.
-#+begin_src sh :tangle ~/.local/bin/launcher :mkdirp yes :tangle-mode o755
-  #!/bin/sh
-  app="$(ls /Applications/ /Applications/Utilities/ /System/Applications/ /System/Applications/Utilities/ ~/Applications/ | grep '\.app$' | sed 's/\.app$//g' | choose -f "SauceCodePro Nerd Font" -s 15 -b ece0c9).app"
-#+end_src
-
-Try opening the app in each location.
-#+begin_src sh :tangle ~/.local/bin/launcher :mkdirp yes :tangle-mode o755
-  open -n "$HOME/Applications/$app" || open -n "/Applications/$app" || open -n "/System/Applications/Utilities/$app" || open -n "/System/Applications/$app" || open -n "/Applications/Utilities/$app"
-
-#+end_src