add role variable, added ghostty terminal, updated flake

home/default.nix

@@ -3,6 +3,7 @@
   pkgs,
   userName,
   userEmail,
+  ghostty,
   ...
 }: let
   # Have a file sturcture that holds all the configuration files that can't be configured by Nix
@@ -12,7 +13,7 @@
   };
 in {
   # Import sub modules
-  imports = map (module: import module {inherit lib pkgs dirs userName userEmail;}) [
+  imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty;}) [
     ./atuin.nix
     ./shell.nix
     ./packages

home/sway.nix

@@ -6,6 +6,14 @@
   dirs = {
     defaults = ../defaults;
   };
+
+  # Derived from subprojects/cava.wrap
+  libcava.src = pkgs.fetchFromGitHub {
+    owner = "LukashonakV";
+    repo = "cava";
+    rev = "0.10.3";
+    hash = "sha256-ZDFbI69ECsUTjbhlw2kHRufZbQMu+FQSMmncCJ5pagg=";
+  };
 in {
   wayland.windowManager.sway = {
     enable = pkgs.stdenv.isLinux;
@@ -23,9 +31,24 @@ in {
   xdg.configFile."waybar/style.css".source = lib.mkForce (dirs.defaults + /waybar/style.css);
   programs.rofi.enable = pkgs.stdenv.isLinux;
   services.mako.enable = pkgs.stdenv.isLinux;
-  # programs.cliphist.enable = pkgs.stdenv.isLinux;
+
   programs.waybar = {
     enable = pkgs.stdenv.isLinux;
     systemd.enable = true;
+
+    package = pkgs.waybar.overrideAttrs (old: {
+      version = "0.11.0";
+
+      src = pkgs.fetchFromGitHub {
+        owner = "Alexays";
+        repo = "Waybar";
+        rev = "d56dd6ee7fdf8c5ba4e90790af62b7f7829d3a47";
+        sha256 = "sha256-3lc0voMU5RS+mEtxKuRayq/uJO09X7byq6Rm5NZohq8=";
+        fetchSubmodules = true;
+      };
+
+      buildInputs = old.buildInputs ++ [ pkgs.fftw pkgs.libcava ];
+      # mesonFlags = (old.mesonFlags or []) ++ [ "-Dcava=disabled" ];
+    });
   };
 }

home/terminal.nix

@@ -1,10 +1,12 @@
-{pkgs, ...}: {
-  programs.alacritty = {
-    enable = pkgs.stdenv.isLinux;
-    settings = {}; # TODO: this will be filled in the future
-  };
+{pkgs, ghostty, ...}: {
+    programs.alacritty = {
+      enable = pkgs.stdenv.isLinux;
+      settings = {}; # TODO: this will be filled in the future
+    };
 
-  programs.kitty = {
-    enable = false; # TODO: to enable later
-  };
+    programs.kitty = {
+      enable = false; # TODO: to enable later
+    };
+
+    home.packages = [ ghostty.packages.${pkgs.system}.default ];
 }