From 395c47e31ff16f7424d5510ac43542339b9050c2 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Fri, 9 Jun 2023 14:38:57 +0100
Subject: [PATCH 1/3] Update J0162 home config

---
 J0162.nix                     |  2 +-
 home/J0162/elitherl.nix       | 16 ++++++++++++----
 home/J0162/hypr/hyprland.conf |  6 ++++++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/J0162.nix b/J0162.nix
index b3801564..c320b8e1 100644
--- a/J0162.nix
+++ b/J0162.nix
@@ -1,6 +1,5 @@
 {pkgs, ...}: {
   imports = [
-    ./home
     ./common.nix
     ./hardware/audio.nix
     ./hardware/bluetooth.nix
@@ -9,6 +8,7 @@
   ];
 
   networking.hostName = "J0162"; # Define your hostname.
+  services.xserver.displayManager.defaultSession = "hyprland";
 
   users.users.elitherl = {
     isNormalUser = true;
diff --git a/home/J0162/elitherl.nix b/home/J0162/elitherl.nix
index bdcb3f23..15583264 100644
--- a/home/J0162/elitherl.nix
+++ b/home/J0162/elitherl.nix
@@ -1,10 +1,19 @@
-{...}: {
+{pkgs, ...}: {
   imports = [../work.nix ../desktop/hyprland.nix];
   home.username = "elitherl";
   home.homeDirectory = "/home/elitherl";
   home.stateVersion = "22.11";
+  home.packages = with pkgs; [zotero];
+
+  programs.fish.functions.nvsync = ''
+    rsync -avz --filter=':- .gitignore' --exclude='.git*'\
+      --delete-during --delete-excluded\
+      $HOME/.config/nvim/ heimdall003.jet.uk:.config/nvim
+    rsync -avz --filter=':- .gitignore' --exclude='.git*'\
+      --delete-during --delete-excluded\
+      $HOME/.config/nvim/ freia:.config/nvim
+  '';
 
-  programs.fish.shellAbbrs.hypr = "exec Hyprland";
   xdg.configFile."hypr/hyprpaper.conf".source = ./hypr/hyprpaper.conf;
   wayland.windowManager.hyprland.extraConfig = builtins.readFile ./hypr/hyprland.conf;
   programs.waybar = {
@@ -22,12 +31,11 @@
           "temperature"
           "pulseaudio"
           "network"
-          "bluetooth"
           "backlight"
           "battery"
-          "battery#bat2"
           "tray"
         ];
+        "wlr/workspaces" = {"format-icons" = {"5" = "󰒍";};};
       };
     };
   };
diff --git a/home/J0162/hypr/hyprland.conf b/home/J0162/hypr/hyprland.conf
index cc5a3d6e..34d4b905 100644
--- a/home/J0162/hypr/hyprland.conf
+++ b/home/J0162/hypr/hyprland.conf
@@ -1 +1,7 @@
 source=./common.conf
+
+windowrule = float, title:^([Zz]oom).*$
+windowrule = float, ^(Nxplayer.bin)$
+windowrule = center, title:^([Zz]oom).*$
+windowrule = workspace 4, title:^([Zz]oom).*$
+windowrule = workspace 5 silent, ^(Nxplayer.bin)$

From d43337e12d5ee608c9d4f7f1d67c8a39dc3d127e Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Fri, 9 Jun 2023 18:51:28 +0100
Subject: [PATCH 2/3] Remove wayland check from chromium, add to Northstar

---
 home/Northstar/xenia.nix |  2 +-
 home/gui/chromium.nix    | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/home/Northstar/xenia.nix b/home/Northstar/xenia.nix
index 9afb0d13..bb446e8d 100644
--- a/home/Northstar/xenia.nix
+++ b/home/Northstar/xenia.nix
@@ -2,6 +2,7 @@
   imports = [
     ../env
     ../tui
+    ../gui/chromium.nix
     ../gui/foot.nix
     ../desktop/sway.nix
     ../ssh/personal.nix
@@ -14,7 +15,6 @@
   programs.bash.bashrcExtra = ''
     source $HOME/.nix-profile/etc/profile.d/nix.sh
   '';
-  programs.firefox.enable = true;
 
   wayland.windowManager.sway = {
     config = {
diff --git a/home/gui/chromium.nix b/home/gui/chromium.nix
index 9c74e790..2864780e 100644
--- a/home/gui/chromium.nix
+++ b/home/gui/chromium.nix
@@ -1,10 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.wayland.windowManager.hyprland;
-in {
+{...}: {
   programs.chromium = {
     enable = true;
     extensions = [
@@ -13,7 +7,7 @@ in {
       {id = "nngceckbapebfimnlniiiahkandclblb";} # Bitwarden
       {id = "dphilobhebphkdjbpfohgikllaljmgbn";} # Simplelogin
     ];
-    commandLineArgs = lib.mkIf cfg.enable [
+    commandLineArgs = [
       "--enable-features=UseOzonePlatform"
       "--ozone-platform=wayland"
     ];

From cc59ed5664ec9be9c1058870a155550aa69993cc Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Fri, 9 Jun 2023 19:05:17 +0100
Subject: [PATCH 3/3] Add syncthing to Northstar

---
 home/Northstar/xenia.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/home/Northstar/xenia.nix b/home/Northstar/xenia.nix
index bb446e8d..75f31b08 100644
--- a/home/Northstar/xenia.nix
+++ b/home/Northstar/xenia.nix
@@ -16,6 +16,11 @@
     source $HOME/.nix-profile/etc/profile.d/nix.sh
   '';
 
+  services.syncthing = {
+    enable = true;
+    tray = {enable = true;};
+  };
+
   wayland.windowManager.sway = {
     config = {
       input = {