merge

2 files changed, 26 insertions, 5 deletions

diff --git a/mixins/cli.nix b/mixins/cli.nix
index 84a5e3d..4137377 100644
--- a/mixins/cli.nix
+++ b/mixins/cli.nix
@@ -13,7 +13,7 @@
       ...
     }: {
       imports = [
-        # inputs.viper-nix-common.homeModules.xdg
+        inputs.viper-nix-common.homeModules.xdg
       ];
       home = {
         packages = with pkgs; [
diff --git a/mixins/sway.nix b/mixins/sway.nix
index c12d156..8143e6b 100644
--- a/mixins/sway.nix
+++ b/mixins/sway.nix
@@ -17,7 +17,7 @@
 
       app_id=menu
       chooser="${pkgs.fzf}/bin/fzf <$in_pipe >$out_pipe"
-      ${pkgs.foot}/bin/foot -W40x40 --app-id "$app_id" -- sh -c "$chooser" &
+      ${pkgs.foot}/bin/footclient -W40x40 --app-id "$app_id" -- sh -c "$chooser" &
       cat >"$in_pipe"
       cat <"$out_pipe"
     '';
@@ -75,10 +75,31 @@ in {
         wf-recorder
         font-awesome_6
         waypipe
-        foot
         alsa-utils
       ];
 
+      programs.foot = {
+        enable = true;
+        server.enable = true;
+        settings = {
+          # main = {
+          # term = "xterm-256color";
+
+          # font = "Fira Code:size=11";
+          # dpi-aware = "yes";
+          # };
+
+          colors = {
+            background = "000000";
+            foreground = "ffffff";
+          };
+
+          # mouse = {
+          #   hide-when-typing = "yes";
+          # };
+        };
+      };
+
       services.swayidle = let
         pgrep = "${pkgs.procps}/bin/pgrep";
         dpms_check = s:
@@ -161,7 +182,7 @@ in {
             "${modifier}+q" = "kill";
             "${modifier}+d" = "exec ${pkgs.dmenu}/bin/dmenu_path | ${menuscript} | xargs swaymsg exec --";
             "${modifier}+Shift+c" = "reload";
-            "${modifier}+Shift+q" = "exit";
+            "${modifier}+Shift+q" = "exec swaynag -t warning -m 'you sure?' -B 'yes' 'swaymsg exit' -s 'no'";
             "${modifier}+Shift+p" = "exec systemctl poweroff";
             "${modifier}+Shift+s" = "exec systemctl suspend";
             "${modifier}+${left}" = "focus left";
@@ -246,7 +267,7 @@ in {
           set $down n
           set $up e
           set $right i
-          set $term ${pkgs.foot}/bin/foot
+          set $term ${pkgs.foot}/bin/footclient
 
           default_border pixel
           hide_edge_borders smart