From 4f7c73250941c9f91c93f2f7511ee4fe14299bc2 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Mon, 31 Jul 2023 10:55:06 +0100
Subject: [PATCH] Add bitwarden and dedicated workspace

Add back shell shortcuts to update
---
 home/hyprland/hyprland.conf                   | 10 +++++--
 .../waybar/modules/wlr_workspaces.nix         |  3 +-
 hosts/common.nix                              | 28 ++++++++++---------
 hosts/desktop.nix                             |  1 +
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/home/hyprland/hyprland.conf b/home/hyprland/hyprland.conf
index 5339e4e7..5e3cfd60 100644
--- a/home/hyprland/hyprland.conf
+++ b/home/hyprland/hyprland.conf
@@ -133,11 +133,17 @@ windowrule = workspace 4,(Signal)
 windowrule = workspace 4,(fractal)
 windowrule = workspace 4,(discord)
 
-# 5: remote
+# 5: pass
 bind = SUPER, R, moveworkspacetomonitor, 5 current
 bind = SUPER, R, workspace, 5
 bind = SUPER SHIFT, R, movetoworkspace, 5
-windowrule = workspace 5,(Nxplayer.bin)
+windowrule = workspace 5,(Bitwarden)
+
+# 6: remote
+bind = SUPER, R, moveworkspacetomonitor, 6 current
+bind = SUPER, R, workspace, 6
+bind = SUPER SHIFT, R, movetoworkspace, 6
+windowrule = workspace 6,(Nxplayer.bin)
 windowrule = float,(Nxplayer.bin)
 windowrule = center,(Nxplayer.bin)
 
diff --git a/home/hyprland/waybar/modules/wlr_workspaces.nix b/home/hyprland/waybar/modules/wlr_workspaces.nix
index 249f08a7..a3a9d3ed 100644
--- a/home/hyprland/waybar/modules/wlr_workspaces.nix
+++ b/home/hyprland/waybar/modules/wlr_workspaces.nix
@@ -8,7 +8,8 @@
     "2" = "󰖟";
     "3" = "󰝰";
     "4" = "󰭹";
-    "5" = "󰢹";
+    "5" = "󰌾";
+    "6" = "󰢹";
     urgent = "󱈸";
   };
   sort-by-number = true;
diff --git a/hosts/common.nix b/hosts/common.nix
index ba889909..75e24335 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -1,12 +1,8 @@
-{
-  pkgs,
-  shell,
-  ...
-}: let
-  flakeURL = "git+https://git.xenia.me.uk/xenia/nixos.git?ref=main";
+{ pkgs, shell, ... }:
+let flakeURL = "git+https://git.xenia.me.uk/xenia/nixos.git?ref=main";
 in {
   nix = {
-    settings.experimental-features = ["nix-command" "flakes"];
+    settings.experimental-features = [ "nix-command" "flakes" ];
     gc = {
       automatic = true;
       dates = "daily";
@@ -20,7 +16,13 @@ in {
   system.autoUpgrade.flake = flakeURL;
   environment = {
     localBinInPath = true;
-    systemPackages = with pkgs; [distrobox];
+    systemPackages = with pkgs; [ distrobox ];
+    shellAliases = {
+      nou = "sudo nixos-rebuild switch --flake ${flakeURL}";
+      noul = "sudo nixos-rebuild switch --flake $HOME/.config/home-manager";
+      hms = "${pkgs.home-manager}/bin/home-manager switch --flake ${flakeURL}";
+      hmsl = "${pkgs.home-manager}/bin/home-manager switch --flake $HOME/.config/home-manager";
+    };
   };
   networking.networkmanager.enable = true;
   services.power-profiles-daemon.enable = true;
@@ -42,7 +44,7 @@ in {
       noto-fonts-emoji
       roboto
       # nerdfonts
-      (nerdfonts.override {fonts = ["FiraCode"];})
+      (nerdfonts.override { fonts = [ "FiraCode" ]; })
     ];
     fontconfig = {
       enable = true;
@@ -50,10 +52,10 @@ in {
       # the reason there's Noto Color Emoji everywhere is to override DejaVu's
       # B&W emojis that would sometimes show instead of some Color emojis
       defaultFonts = {
-        serif = ["Noto Serif" "Noto Color Emoji"];
-        sansSerif = ["Noto Sans" "Noto Color Emoji"];
-        monospace = ["FiraCode Nerd Font" "Noto Color Emoji"];
-        emoji = ["Noto Color Emoji"];
+        serif = [ "Noto Serif" "Noto Color Emoji" ];
+        sansSerif = [ "Noto Sans" "Noto Color Emoji" ];
+        monospace = [ "FiraCode Nerd Font" "Noto Color Emoji" ];
+        emoji = [ "Noto Color Emoji" ];
       };
     };
   };
diff --git a/hosts/desktop.nix b/hosts/desktop.nix
index 12e4e1b6..6f7eacde 100644
--- a/hosts/desktop.nix
+++ b/hosts/desktop.nix
@@ -13,6 +13,7 @@
     pavucontrol
     grim
     slurp
+    bitwarden
     signal-desktop
     libreoffice
     zotero