From d7f1c06f40d3e0f55fa1eeb606c48cdcc518d258 Mon Sep 17 00:00:00 2001
From: Fabian Montero <fabian@posixlycorrect.com>
Date: Tue, 28 Jan 2025 12:15:31 -0600
Subject: [PATCH] modularize gui and browsers modules

---
 home/modules/browsers.nix |  7 +++++++
 home/modules/gui/i3.nix   | 24 ++++++++++--------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/home/modules/browsers.nix b/home/modules/browsers.nix
index b7996ec..96fe8ee 100644
--- a/home/modules/browsers.nix
+++ b/home/modules/browsers.nix
@@ -15,5 +15,12 @@ in {
       chromium
       firefox
     ];
+
+    # create an option for this
+    xsession.windowManager.i3.config.startup = [
+      {
+        command = "${lib.getExe pkgs.i3-gaps} 'workspace 1; exec ${lib.getExe pkgs.firefox}'";
+      }
+    ];
   };
 }
diff --git a/home/modules/gui/i3.nix b/home/modules/gui/i3.nix
index 527f462..29c9507 100644
--- a/home/modules/gui/i3.nix
+++ b/home/modules/gui/i3.nix
@@ -45,47 +45,43 @@ with lib; {
       # y se sobreescriba las cosas que pongo acá
       # NO QUITARLO. ver man home-configuration.nix
       keybindings = mkOptionDefault {
-        "${mod}+Return" = "exec ${pkgs.kitty}/bin/kitty ${pkgs.tmux}/bin/tmux";
+        "${mod}+Return" = "exec ${lib.getExe pkgs.kitty} ${lib.getExe pkgs.tmux}";
         "${mod}+Tab" = "focus right";
         "${mod}+Shift+Tab" = "focus left";
-        "${mod}+Shift+s" = "exec ${pkgs.maim}/bin/maim -s -u | ${pkgs.xclip}/bin/xclip -selection clipboard -t image/png -i";
+        "${mod}+Shift+s" = "exec ${lib.getExe pkgs.maim} -s -u | ${lib.getExe pkgs.xclip} -selection clipboard -t image/png -i";
         "${mod}+Shift+w" = "move workspace to output right";
-        "${mod}+l" = "exec ${pkgs.betterlockscreen}/bin/betterlockscreen -l";
+        "${mod}+l" = "exec ${lib.getExe pkgs.betterlockscreen} -l";
       };
 
       startup = [
         {
-          command = "${pkgs.xss-lock}/bin/xss-lock --transfer-sleep-lock -- ${pkgs.i3lock}/bin/i3lock --nofork";
+          command = "${lib.getExe pkgs.xss-lock} --transfer-sleep-lock -- ${lib.getExe pkgs.i3lock} --nofork";
           notification = false;
         }
         {
-          command = "${pkgs.networkmanagerapplet}/bin/nm-applet";
+          command = "${lib.getExe pkgs.networkmanagerapplet}";
           notification = false;
         }
         #todo: sería nice hostear esta imagen en el server y fetchearla si no existe
         {
-          command = "${pkgs.feh}/bin/feh --bg-fill ${config.home.homeDirectory}/Pictures/wallpapers/jupiter.png";
+          command = "${lib.getExe pkgs.feh} --bg-fill ${config.home.homeDirectory}/Pictures/wallpapers/jupiter.png";
           notification = false;
           always = true;
         }
         {
-          #todo: move this to browsers module
-          command = "${pkgs.i3-gaps}/bin/i3-msg 'workspace 1; exec ${pkgs.firefox}/bin/firefox'";
+          #todo: move this to telegram module
+          command = "${lib.getExe pkgs.i3-gaps} 'workspace 2; exec ${lib.getExe pkgs.tdesktop}'";
         }
         {
-          #todo: move this to telegram module
-          command = "${pkgs.i3-gaps}/bin/i3-msg 'workspace 2; exec ${pkgs.tdesktop}/bin/telegram-desktop'";
+          command = "${lib.getExe pkgs.i3-gaps} 'workspace 2; exec ${lib.getExe pkgs.gajim}'";
         }
-        #{
-        #  command = "${pkgs.i3-gaps}/bin/i3-msg 'workspace 2; exec ${pkgs.element-desktop}/bin/element-desktop'";
-        #}
         {
           command = "${pkgs.systemd}/bin/systemctl --user restart polybar.service";
           notification = false;
           always = true;
         }
         {
-          command = "${pkgs.autorandr}/bin/autorandr -c";
+          command = "${lib.getExe pkgs.autorandr} -c";
           notification = false;
           always = true;
         }