Add older Windows stuff + Updates

3 files changed, 26 insertions, 5 deletions

diff --git a/nix/programs/firefox.nix b/nix/programs/firefox.nix
index 6ee2751..fd10f99 100644
--- a/nix/programs/firefox.nix
+++ b/nix/programs/firefox.nix
@@ -19,8 +19,8 @@ in {
       source = (pkgs.fetchFromGitHub {
         owner = "rafaelmardojai";
         repo = "firefox-gnome-theme";
-        rev = "59e3de00f01e5adb851d824cf7911bd90c31083a";
-        hash = "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=";
+        rev = "6b2061ac6faf5dfb52d5b41dca98fa0c022b2b91";
+        hash = "sha256-c3oiw6RysUVxRqkv39gxhiO1WjfvuEzZw4PemN0C7Kk=";
       });
     };
     home.file."customChrome.css" = {
diff --git a/nix/programs/kitty.nix b/nix/programs/kitty.nix
index 0e2ad0b..c070871 100644
--- a/nix/programs/kitty.nix
+++ b/nix/programs/kitty.nix
@@ -17,6 +17,7 @@ in {
         mode = "enabled";
         enableBashIntegration = true;
       };
+      # @TODO: https://sw.kovidgoyal.net/kitty/conf/#opt-kitty.active_tab_title_template
       extraConfig = ''
         shell ${pkgs.bashInteractive}/bin/bash --login
         update_check_interval 0
@@ -33,13 +34,14 @@ in {
         paste_actions confirm,confirm-if-large
         disable_ligatures always
         modify_font baseline ${toString loc.font.baseline}
-        cursor #${colo.foreground}
         cursor_shape block
         #cursor_blink_interval -1 linear ease-out
         #cursor_stop_blinking_after 20.0
         cursor_trail 2
         cursor_trail_decay 0.075 0.425
         cursor_trail_start_threshold 3
+        cursor #${colo.foreground}
+        cursor_text_color background
         foreground #${colo.foreground}
         background #${colo.background}
         color0 #${colo.color0}
@@ -67,8 +69,27 @@ in {
         mark3_foreground #${colo.background}
         mark3_background #${colo.color4}
         background_opacity ${toString colo.alpha}
+        active_border_color #${colo.color4}
+        bell_border_color #${colo.color1}
+        inactive_border_color #${colo.color3}
+        url_color #${colo.color5}
+        enabled_layouts splits,stack
       '';
     };
+    home.file.".config/kitty/quick-access-terminal.conf".text = ''
+      lines 18
+      background_opacity 0.925
+      kitty_override startup_session=quick-access-session.conf
+      kitty_override placement_strategy=bottom-right
+      kitty_override window_padding_width=0 12 8 0
+    '';
+    home.file.".config/kitty/quick-access-session.conf".text = ''
+      output_name ${loc.monitors.monitor1}
+      layout splits
+      launch --var window=main
+      launch --location=vsplit --bias=17.1 /home/andrew/dl/tmp/clock/a.out
+      focus_matching_window var:window=first
+    '';
     wayland.windowManager.sway = {
       config = rec {
         terminal = "${pkgs.kitty}/bin/kitty -1";
@@ -76,7 +97,7 @@ in {
           mod1 = "Mod1";
         in {
           "${mod1}+Return" = "exec ${terminal}";
-          "${mod1}+backslash" = "exec ${terminal} --class=\"kitty-popup\"";
+          "${mod1}+backslash" = "exec ${pkgs.kitty}/bin/kitten quick-access-terminal";
         };
       };
     };
diff --git a/nix/programs/sway.nix b/nix/programs/sway.nix
index eb30595..5e9cb08 100644
--- a/nix/programs/sway.nix
+++ b/nix/programs/sway.nix
@@ -282,12 +282,12 @@ in {
           titlebar = false;
           commands = [
             { command = "move to scratchpad"; criteria.app_id = "kitty-server"; }
-            { command = "floating enable; allow_tearing yes"; criteria.app_id = "kitty-popup"; }
             { command = "allow_tearing yes"; criteria.app_id = "kitty"; }
             { command = "inhibit_idle fullscreen; floating enable; allow_tearing yes"; criteria.app_id = "cmv"; }
             { command = "floating enable"; criteria.class = "cmv.exe"; }
             { command = "floating enable"; criteria.app_id = "mauri"; }
             { command = "inhibit_idle fullscreen"; criteria.title = "Parsec"; }
+            { command = "inhibit_idle fullscreen"; criteria.class = "streaming_client"; }
             { command = "inhibit_idle fullscreen; allow_tearing yes"; criteria.class = "steam_app_.*"; }
             { command = "inhibit_idle fullscreen; allow_tearing yes; floating enable"; criteria.app_id = "gamescope"; }
             { command = "inhibit_idle fullscreen; allow_tearing yes"; criteria.class = ".gamescope-wrapped"; }