From b98f84915327ab512523239a74d3934aa0eb108d Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Sat, 17 Feb 2024 22:38:35 +0900
Subject: [PATCH] Re-add weechat, update waybar

---
 README.md                                                | 1 +
 .../common/desktops/hyprland/components/waybar.nix       | 9 ++++-----
 nixos/default.nix                                        | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index d4a82a78..ae4e1906 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,7 @@ nix develop -c /etc/nixos/git/docs/setup.sh
 ## General
 * [ ] Security hardening / scans / etc
 * [ ] Where possible, convert cronjobs to systemd services / timers
+* [ ] Replace fuzzel with rofi
 
 ## Home-Manager
 * [ ] Figure out what the home-manager `account` options are for.
diff --git a/home-manager/common/desktops/hyprland/components/waybar.nix b/home-manager/common/desktops/hyprland/components/waybar.nix
index 8e62c89c..7707c7a8 100644
--- a/home-manager/common/desktops/hyprland/components/waybar.nix
+++ b/home-manager/common/desktops/hyprland/components/waybar.nix
@@ -1,4 +1,4 @@
-{ config, inputs, system, ... }: {
+{ config, ... }: {
   imports = [ ../assets/waybar/scripts.nix ];
 
   programs.waybar = {
@@ -17,7 +17,6 @@
                 "hyprland/workspaces"
             ];
             modules-right = [
-                "gamemode"
                 "privacy"
                 "hyprland/submap"
                 "pulseaudio"
@@ -51,7 +50,7 @@
                 interval = 5;
                 format-icons = {
                     Running = "󰌆";
-                    Stopped = "󰌊";
+                    Stopped = "󰌊 ";
                 };
             };
             idle_inhibitor = {
@@ -72,8 +71,8 @@
                 on-click = "activate";
             };
             clock = {
-                format = "󰥔 {:%H:%M}";
-                format-alt = "󰃭 {:%A, %d %b, %Y}";
+                format = "󰥔  {:%H:%M}";
+                format-alt = "󰃭  {:%A, %d %b, %Y}";
                 tooltip-format = "<tt><small>{calendar}</small></tt>";
                 calendar = {
                     mode = "month";
diff --git a/nixos/default.nix b/nixos/default.nix
index 7c327e45..48936fd7 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, unstable-pkgs, pkgs, hostname, stateVersion, username, desktop, gpu, inputs, system, theme, ... }: {
+{ lib, pkgs, hostname, stateVersion, username, desktop, inputs, system, ... }: {
   imports = [ 
       # Modules
       inputs.disko.nixosModules.disko
@@ -11,6 +11,7 @@
       ./common/services/tailscale.nix
       ./common/services/gnupg-agent.nix
       ./common/services/opensnitch.nix
+      ./common/software/cli/weechat.nix
 
       # NixOS Modules
       ./common/modules/fonts.nix           # Font Configs