From fe2a105c4ecf2072b124a21f405fcaf00a6e9ef6 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 18 Sep 2024 11:18:08 +0100
Subject: [PATCH] Adjust opacity of desktop elements, add zellij

Change opacity of desktop components to that floating / pop-up windows
are translucent, and base windows are opaque.

Add zellij back (with config), but not starting by default. Add zellij
config directory to rsync-local-config script.
---
 system/home/emacs/default.nix                   | 1 -
 system/home/fuzzel/default.nix                  | 5 +----
 system/home/scripts/shell/rsync-local-config.sh | 2 +-
 system/home/shell/default.nix                   | 1 +
 system/home/sway/default.nix                    | 8 +-------
 system/home/waybar/default.nix                  | 6 +++---
 6 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/system/home/emacs/default.nix b/system/home/emacs/default.nix
index 3022efb3..5a6d8e45 100644
--- a/system/home/emacs/default.nix
+++ b/system/home/emacs/default.nix
@@ -49,7 +49,6 @@
         custom-theme-hash = builtins.hashFile "sha256" "${custom-theme}/${custom-theme-name}-theme.el";
       in
       ''
-        (add-to-list 'default-frame-alist '(alpha-background . 85))
         (add-to-list 'custom-theme-load-path "${custom-theme}")
         (add-to-list 'custom-safe-themes "${custom-theme-hash}")
         (load-theme '${custom-theme-name})
diff --git a/system/home/fuzzel/default.nix b/system/home/fuzzel/default.nix
index 25aea3c2..3afe6de5 100644
--- a/system/home/fuzzel/default.nix
+++ b/system/home/fuzzel/default.nix
@@ -1,6 +1,5 @@
 {
   config,
-  pkgs,
   fonts,
   accentColourName,
   ...
@@ -17,9 +16,7 @@
         fields = "filename,name,generic,categories";
         fuzzy = true;
         filter-desktop = true;
-        terminal =
-          with config.programs;
-          "${if alacritty.enable then alacritty.package else pkgs.alacritty}/bin/alacritty -e";
+        terminal = "${config.programs.alacritty.package}/bin/alacritty -e";
         lines = 24;
         width = 80;
         tabs = 4;
diff --git a/system/home/scripts/shell/rsync-local-config.sh b/system/home/scripts/shell/rsync-local-config.sh
index c76ebb70..f5c8823a 100755
--- a/system/home/scripts/shell/rsync-local-config.sh
+++ b/system/home/scripts/shell/rsync-local-config.sh
@@ -1,6 +1,6 @@
 HOSTS=("$@")
 # Config files
-for TARGET in ".inputrc" ".config/bat/" ".config/starship.toml"; do
+for TARGET in ".inputrc" ".config/bat/" ".config/zellij" ".config/starship.toml"; do
     SOURCE="$HOME/$TARGET"
     echo "--- $SOURCE ---"
     TMP_TARGET=/tmp/rsync-local-config
diff --git a/system/home/shell/default.nix b/system/home/shell/default.nix
index 0345da0c..2d943e11 100644
--- a/system/home/shell/default.nix
+++ b/system/home/shell/default.nix
@@ -11,6 +11,7 @@
     ./readline.nix
     ./ssh.nix
     ./starship.nix
+    ./zellij.nix
   ];
   home.packages = with pkgs; [
     rclone
diff --git a/system/home/sway/default.nix b/system/home/sway/default.nix
index 3345758e..201c2ad5 100644
--- a/system/home/sway/default.nix
+++ b/system/home/sway/default.nix
@@ -30,13 +30,7 @@
       swaymsg exec "${protonmail-bridge}/bin/protonmail-bridge -n"
     '')
   ];
-  programs = {
-    waybar.systemd.target = "sway-session.target";
-    alacritty.settings.window = {
-      decorations = "none";
-      opacity = 0.85;
-    };
-  };
+  programs.waybar.systemd.target = "sway-session.target";
   services = {
     kanshi.systemdTarget = "sway-session.target";
     gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
diff --git a/system/home/waybar/default.nix b/system/home/waybar/default.nix
index 35e108d8..66f3218f 100644
--- a/system/home/waybar/default.nix
+++ b/system/home/waybar/default.nix
@@ -278,7 +278,7 @@
     style =
       let
         sc = config.scheme.withHashtag;
-        alpha = "0.85";
+        alpha = "0.8";
       in
       ''
         * {
@@ -295,7 +295,7 @@
 
         window > box {
             color: ${sc.base05};
-            background: alpha(${sc.base00}, ${alpha});
+            background: ${sc.base00};
             margin: 5px 5px 0px;
             padding: 0px;
             border-top: 1px solid ${sc.base04};
@@ -303,7 +303,7 @@
         }
 
         tooltip {
-            background: ${sc.base00};
+            background: alpha(${sc.base00}, ${alpha});
             border: 1px solid ${sc.${accentColourName}};
             border-radius: 5px;
             box-shadow: none;