overhaul hypr, waybar, add trayscale, etc

modules/boot.nix

@@ -1,7 +1,21 @@
 {...}: {
-  boot.loader = {
-    efi.canTouchEfiVariables = true;
-    systemd-boot.enable = true;
+  boot = {
+    loader = {
+      efi.canTouchEfiVariables = true;
+      systemd-boot.enable = true;
+    };
+    plymouth.enable = false;
+    # consoleLogLevel = 0;
+    # initrd.verbose = false;
+    # kernelParams = [
+    #   "quiet"
+    #   "splash"
+    #   "boot.shell_on_fail"
+    #   "loglevel=3"
+    #   "rd.systemd.show_status=false"
+    #   "rd.udev.log_level=3"
+    #   "udev.log_priority=3"
+    # ];
   };
   system.stateVersion = "24.05";
 }

modules/default.nix

@@ -1,6 +1,7 @@
 {utils}: let
   nixosModules = utils.lib.exportModules [
     ./nix.nix
+    ./pinentry-fix.nix
     ./hm.nix
     ./boot.nix
     ./deploy.nix
@@ -8,7 +9,11 @@
     ./secret.nix
     ./tailscale.nix
   ];
+  homeManagerModules = utils.lib.exportModules [
+    ./trayscale.nix
+  ];
   sharedModules = with nixosModules; [
+    pinentry-fix
     nix
     hm
     boot
@@ -16,4 +21,6 @@
     tailscale
     secret
   ];
-in {inherit nixosModules sharedModules;}
+in {
+  inherit nixosModules homeManagerModules sharedModules;
+}

modules/pinentry-fix.nix

@@ -0,0 +1,8 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  services.dbus.packages = [pkgs.gcr];
+}

modules/trayscale.nix

@@ -0,0 +1,40 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.services.trayscale;
+in {
+  options.services.trayscale = {
+    enable =
+      mkEnableOption
+      "An unofficial GUI wrapper around the Tailscale CLI client.";
+    package = mkPackageOption pkgs "trayscale" {};
+    hideWindow = mkOption {
+      description = "Whether to hide the trayscale window on startup.";
+      type = types.bool;
+      default = true;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      (hm.assertions.assertPlatform "services.trayscale" pkgs platforms.linux)
+    ];
+
+    systemd.user.services.trayscale = {
+      Unit = {
+        Description = "An unofficial GUI wrapper around the Tailscale CLI client";
+        Requires = ["tray.target"];
+        After = ["graphical-session-pre.target" "tray.target"];
+        PartOf = ["graphical-session.target"];
+      };
+      Install = {WantedBy = ["graphical-session.target"];};
+      Service.ExecStart =
+        toString (["${cfg.package}/bin/trayscale"]
+          ++ optional cfg.hideWindow "--hide-window");
+    };
+  };
+}