Add services expression for H0615, update waybar and switch to hyprland

H0615.nix

@@ -2,15 +2,15 @@
   imports = [
     ./home
     ./common.nix
-    ./locales/en_GB.nix
-    ./desktop/plasma.nix
     ./hardware/audio.nix
-    ./syncthing/H0615.nix
+    ./locales/en_GB.nix
+    ./desktop/hyprland.nix
+    ./services/H0615.nix
   ];
 
   networking.hostName = "H0615"; # Define your hostname.
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.root.shell = pkgs.zsh;
   users.users.elitherl = {
     isNormalUser = true;
     description = "Evie Litherland-Smith";

home/H0615/elitherl.nix

@@ -4,6 +4,7 @@
   home.homeDirectory = "/home/elitherl";
   home.stateVersion = "22.11";
 
+  programs.fish.shellAbbrs.hypr = "exec Hyprland";
   xdg.configFile."hypr/hyprpaper.conf".text = ''
     preload = /etc/nixos/config/wallpaper/images_dark/1920x1080.png
     preload = /etc/nixos/config/wallpaper/images_dark/1920x1200.png
@@ -25,9 +26,6 @@
     exec-once = teams
   '';
   programs.waybar = {
-    style = ''
-      @import 'common.css';
-    '';
     settings = {
       main = {
         "include" = [
@@ -35,15 +33,26 @@
           "~/.config/waybar/layout.json"
         ];
         "output" = "HDMI-A-1";
-        "modules-left" = ["custom/launcher" "cpu" "memory" "temperature"];
-        "modules-center" = ["wlr/workspaces"];
-        "modules-right" = ["pulseaudio" "network" "backlight" "clock" "tray" "custom/power"];
+        "modules-left" = ["wlr/workspaces"];
+        "modules-center" = ["clock"];
+        "modules-right" = [
+          "cpu"
+          "memory"
+          "temperature"
+          "pulseaudio"
+          "bluetooth"
+          "network"
+          "backlight"
+          "battery"
+          "battery#bat2"
+          "tray"
+        ];
       };
       alt = {
         "output" = "DP-1";
-        "modules-left" = ["custom/launcher"];
-        "modules-center" = ["wlr/workspaces"];
-        "modules-right" = ["custom/power"];
+        "modules-left" = ["wlr/workspaces"];
+        "modules-center" = ["clock"];
+        "modules-right" = [];
       };
     };
   };

services/H0615.nix

@@ -0,0 +1 @@
+{...}:{ imports = [ ./syncthing/H0615.nix ]; }

services/syncthing/H0615.nix

@@ -1,5 +1,5 @@
 {...}: {
-  imports = [./default.nix ./devices/ion.nix];
+  imports = [./default.nix ./devices];
   services.syncthing = {
     user = "elitherl";
     group = "users";