From fd79ee3c05ddca45616be2b029ab3478234c5a02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= <lelgenio@disroot.org>
Date: Tue, 6 Dec 2022 20:29:38 -0300
Subject: [PATCH] use correct syntax for spawning terminal app

---
 scripts/terminal      | 4 +---
 user/kak/usermode.kak | 2 +-
 user/mimeapps.nix     | 4 ++--
 user/rofi.nix         | 2 +-
 user/waybar.nix       | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/scripts/terminal b/scripts/terminal
index e125b8b..b363f01 100644
--- a/scripts/terminal
+++ b/scripts/terminal
@@ -15,6 +15,4 @@ while test $# -gt 0;do
     esac
 done
 
-test $# -gt 0 &&
-    exec alacritty --class "$CLASS" -e $@ ||
-    exec alacritty --class "$CLASS"
+exec alacritty --class "$CLASS" "$@"
diff --git a/user/kak/usermode.kak b/user/kak/usermode.kak
index 56b5ccb..01d3bbd 100644
--- a/user/kak/usermode.kak
+++ b/user/kak/usermode.kak
@@ -118,7 +118,7 @@ define-command -override -hidden find_line \
 define-command -override -hidden tree \
 %{ evaluate-commands %sh{
     file=`mktemp`
-    terminal --class file_picker ranger --selectfile="$kak_buffile" --choosefiles="$file"
+    terminal --class file_picker -e ranger --selectfile="$kak_buffile" --choosefiles="$file"
     for line in `cat "$file"`; do
         echo "edit '$line'"
     done
diff --git a/user/mimeapps.nix b/user/mimeapps.nix
index 18f8bb8..0dbc410 100644
--- a/user/mimeapps.nix
+++ b/user/mimeapps.nix
@@ -39,8 +39,8 @@ in {
         name = "Neomutt";
         genericName = "Email Client";
         comment = "View and Send Emails";
-        exec = "terminal neomutt %U";
-        terminal = false;
+        exec = "neomutt %U";
+        terminal = true;
         type = "Application";
         icon = "mutt";
         categories = [ "Network" "Email" ];
diff --git a/user/rofi.nix b/user/rofi.nix
index 2d12146..1c00435 100644
--- a/user/rofi.nix
+++ b/user/rofi.nix
@@ -43,7 +43,7 @@ in {
         "#listview" = {
           # fixed-height=0;
           border = mkLiteral "2px solid 0px 0px";
-          border-color = mkLiteral "@separatorcolor";
+          # border-color = mkLiteral "@separatorcolor";
           # spacing= 0 ;
         };
 
diff --git a/user/waybar.nix b/user/waybar.nix
index 7f3d3c2..c82f73b 100644
--- a/user/waybar.nix
+++ b/user/waybar.nix
@@ -36,7 +36,7 @@ in {
         network = {
           interval = 5;
           tooltip = false;
-          on-click = "terminal iwd";
+          on-click = "terminal -e iwd";
           format-wifi = "{icon}";
           format-icons = [ "" "" "" "" "" ];
           format-ethernet = "";