refactor: enable firewall explicitely for 'hecuba' host

home/modules/desktop/niri/default.nix

@@ -1,8 +1,13 @@
+{ pkgs, ... }:
+
 {
   imports = [
     ../../fuzzel
     ../../waybar
   ];
 
-  home.file.".config/niri/config.kdl".source = ./config.kdl;
+  home = {
+    file.".config/niri/config.kdl".source = ./config.kdl;
+    packages = with pkgs; [ wlsunset ];
+  };
 }

home/modules/waybar/config.jsonc

@@ -3,23 +3,55 @@
     "height": 16,
     "spacing": 4,
     "modules-left": ["niri/workspaces"],
-    "modules-center": ["sway/window"],
-    "modules-right": ["battery", "clock"],
+    "modules-right": [
+      "pulseaudio",
+      "memory",
+      "cpu",
+      "network",
+      "clock",
+      "battery",
+    ],
     "clock": {
       "format": "W{:%V %d %b %H:%M}",
       "tooltip-format": "{calendar}",
       "format-alt": "{:%Y-%m-%d %H:%M:%S}",
     },
     "battery": {
+      "bat": "BAT0",
+      "adapter": "ADP1",
+      "interval": 5,
+      "full-at": 99,
       "states": {
         "good": 80,
         "warning": 20,
         "critical": 10,
       },
-      "format": "{capacity}%",
-      "format-charging": "↑{capacity}%",
+      "format": "{capacity}%--",
+      "format-charging": "{capacity}%++",
       "format-plugged": "{capacity}%",
-      "format-alt": "{time}",
+      "format-alt": "{time} {power}W",
+    },
+    "pulseaudio": {
+      "format": "VOL {volume}%",
+      "format-muted": "muted",
+      "on-click": "pavucontrol",
+    },
+    "memory": {
+      "interval": 2,
+      "format": "RAM {percentage}%",
+      "format-alt": "RAM {used:0.1f}G/{total:0.1f}G",
+    },
+    "cpu": {
+      "interval": 2,
+      "format": "CPU {usage}%",
+      "format-alt": "CPU {avg_frequency}GHz",
+    },
+    "network": {
+      "interval": 5,
+      "format-wifi": "{ifname} {ipaddr} {essid}",
+      "format-ethernet": "{ifname} {ipaddr}",
+      "format-disconnected": "{ifname} disconnected",
+      "tooltip-format": "{ifname}: {ipaddr}/{cidr}",
     },
   },
 ]

home/modules/waybar/style.css

@@ -40,7 +40,11 @@ window#waybar.hidden {
 }
 
 #clock,
-#battery {
+#battery,
+#pulseaudio,
+#memory,
+#cpu,
+#network {
   padding: 0 4px;
   color: #ffffff;
   background-color: #111111;

hosts/astyanax/default.nix

@@ -13,7 +13,7 @@ let
 in
 {
   imports = [
-    ../../modules/common.nix
+    ../../modules/common
     inputs.nixos-hardware.nixosModules.lenovo-thinkpad-e14-intel
     inputs.disko.nixosModules.disko
     inputs.sops-nix.nixosModules.sops

hosts/hecuba/default.nix

@@ -5,7 +5,7 @@
 {
   imports = [
     ./hard.nix
-    ../../modules/common.nix
+    ../../modules/common
     ../../modules/ssh/hardened-openssh.nix
   ];
 
@@ -44,6 +44,10 @@
 
   security.sudo.wheelNeedsPassword = false;
 
+  networking = {
+    firewall.enable = true;
+  };
+
   services.openssh = {
     enable = true;
     harden = true;

hosts/vm/default.nix

@@ -11,7 +11,7 @@ let
 in
 {
   imports = [
-    ../../modules/common.nix
+    ../../modules/common
     inputs.disko.nixosModules.disko
     inputs.sops-nix.nixosModules.sops
     inputs.home-manager.nixosModules.default

modules/desktops/niri/default.nix

@@ -1,5 +1,3 @@
-{ pkgs, ... }:
-
 {
   programs.niri.enable = true;
 
@@ -7,6 +5,4 @@
   xdg = {
     portal.enable = true;
   };
-
-  environment.systemPackages = with pkgs; [ wlsunset ];
 }