diff --git a/modules/home/kitty.nix b/modules/home/kitty.nix
index 085dafa..cac7f8c 100644
--- a/modules/home/kitty.nix
+++ b/modules/home/kitty.nix
@@ -6,7 +6,7 @@
theme = "3024 Night";
font = {
- name = "JetBrainsMono Nerd Font";
+ name = "GohuFont 14 Nerd Font Mono";
size = 9;
};
diff --git a/modules/home/waybar/default.nix b/modules/home/waybar/default.nix
index fe79bc0..184134c 100644
--- a/modules/home/waybar/default.nix
+++ b/modules/home/waybar/default.nix
@@ -22,346 +22,347 @@
home.file = {
"/home/${username}/.config/waybar/config" = {
text = ''
- [{
- "layer": "top",
- "position": "top",
+ [{
+ "layer": "top",
+ "position": "top",
- "modules-left": [
- "privacy",
- "network",
- "custom/vpn",
- "custom/devices",
- "custom/spotify",
- "tray",
- ],
+ "modules-left": [
+ "privacy",
+ "network",
+ "custom/vpn",
+ "custom/devices",
+ "custom/spotify",
+ "tray",
+ ],
- "modules-center": [
- "hyprland/workspaces",
- ],
+ "modules-center": [
+ "hyprland/workspaces",
+ ],
- "modules-right": [
- "custom/yubikey#icon",
- "custom/yubikey#data",
- "group/hardware",
- "group/resources",
- "bluetooth",
- // "wireplumber",
- "group/audio",
- "group/battery",
- "group/clock"
- ],
+ "modules-right": [
+ "custom/yubikey#icon",
+ "custom/yubikey#data",
+ "group/hardware",
+ "group/resources",
+ "bluetooth",
+ // "wireplumber",
+ "group/audio",
+ "group/battery",
+ "group/clock"
+ ],
- "hyprland/window": {
- "format": "{}",
- "rewrite": {
- "(.*) - zsh": "> [$1]"
- },
- "separate-outputs": true
- },
+ "hyprland/window": {
+ "format": "{}",
+ "rewrite": {
+ "(.*) - zsh": "> [$1]"
+ },
+ "separate-outputs": true
+ },
- "sway/workspaces": {
- "all-outputs": true,
- "disable-scroll": true,
- "format": "{name}"
- },
+ "sway/workspaces": {
+ "all-outputs": true,
+ "disable-scroll": true,
+ "format": "{name}"
+ },
- "hyprland/workspaces": {
- "all-outputs": true,
- "disable-scroll": true,
- "format": "{name}"
- },
+ "hyprland/workspaces": {
+ "all-outputs": true,
+ "disable-scroll": true,
+ "format": "{name}"
+ },
- // "group/network": {
- // "orientation": "horizontal",
- // "modules": [
- // "network",
- // "custom/vpn",
- // ],
- // "drawer": {
- // "transition-left-to-right": true,
- // "transition-duration": 500
- // }
- // },
-
- "network": {
- "format": " {ifname}",
- "format-wifi": " {ipaddr}/{cidr} {signalStrength}%",
- "format-ethernet": " {ipaddr}/{cidr}",
- "format-disconnected": "",
- "tooltip-format": "{ifname} via {gwaddr}",
- "tooltip-format-wifi": "{essid} ({signalStrength}%)",
- "tooltip-format-ethernet": "{ifname}",
- "tooltip-format-disconnected": "Disconnected"
- },
+ // "group/network": {
+ // "orientation": "horizontal",
+ // "modules": [
+ // "network",
+ // "custom/vpn",
+ // ],
+ // "drawer": {
+ // "transition-left-to-right": true,
+ // "transition-duration": 500
+ // }
+ // },
+
+ "network": {
+ "format": " {ifname}",
+ "format-wifi": " {ipaddr}/{cidr} {signalStrength}%",
+ "format-ethernet": " {ipaddr}/{cidr}",
+ "format-disconnected": "",
+ "tooltip-format": "{ifname} via {gwaddr}",
+ "tooltip-format-wifi": "{essid} ({signalStrength}%)",
+ "tooltip-format-ethernet": "{ifname}",
+ "tooltip-format-disconnected": "Disconnected"
+ },
- "custom/vpn": {
- "format": "{icon}",
- "tooltip-format": "{text}",
- "format-icons": [ "","" ],
- "return-type": "json",
- "exec": "~/.local/bin/waybar-vpn",
- "interval": 30
- },
+ "custom/vpn": {
+ "format": "{icon}",
+ "tooltip-format": "{text}",
+ "format-icons": [ "","" ],
+ "return-type": "json",
+ "exec": "~/.local/bin/waybar-vpn",
+ "interval": 30
+ },
- "custom/spotify": {
- "interval": 5,
- "return-type": "json",
- "exec": "~/.local/bin/waybar-music",
- "on-click": "playerctl play-pause",
- "escape": true
- },
+ "custom/spotify": {
+ "interval": 5,
+ "return-type": "json",
+ "exec": "~/.local/bin/waybar-music",
+ "on-click": "playerctl play-pause",
+ "escape": true
+ },
- "custom/devices": {
- "interval": 60,
- // "return-type": "json",
- "exec": "~/.local/bin/waybar-devices",
- },
+ "custom/devices": {
+ "interval": 60,
+ "font-size": 14,
+ // "return-type": "json",
+ "exec": "~/.local/bin/waybar-devices",
+ },
- "privacy": {
- "icon-spacing": 8,
- "icon-size": 14,
- "transition-duration": 250,
- "modules": [
- {
- "type": "screenshare",
- "tooltip": true,
- "tooltip-icon-size": 24
- },
- {
- "type": "audio-out",
- "tooltip": true,
- "tooltip-icon-size": 24
- },
- {
- "type": "audio-in",
- "tooltip": true,
- "tooltip-icon-size": 24
- }
- ]
- },
+ "privacy": {
+ "icon-spacing": 8,
+ "icon-size": 14,
+ "transition-duration": 250,
+ "modules": [
+ {
+ "type": "screenshare",
+ "tooltip": true,
+ "tooltip-icon-size": 24
+ },
+ {
+ "type": "audio-out",
+ "tooltip": true,
+ "tooltip-icon-size": 24
+ },
+ {
+ "type": "audio-in",
+ "tooltip": true,
+ "tooltip-icon-size": 24
+ }
+ ]
+ },
- "tray": {
- "icon-size": 12,
- "spacing": 0
- },
+ "tray": {
+ "icon-size": 12,
+ "spacing": 0
+ },
- "sway/mode": {
- "format": " {}",
- "tooltip": false
- },
+ "sway/mode": {
+ "format": " {}",
+ "tooltip": false
+ },
- "custom/yubikey#icon": {
- "exec": "~/.local/bin/waybar-yubikey 0",
- "return-type": "json"
- },
+ "custom/yubikey#icon": {
+ "exec": "~/.local/bin/waybar-yubikey 0",
+ "return-type": "json"
+ },
- "custom/yubikey#data": {
- "exec": "~/.local/bin/waybar-yubikey 1",
- "return-type": "json"
- },
+ "custom/yubikey#data": {
+ "exec": "~/.local/bin/waybar-yubikey 1",
+ "return-type": "json"
+ },
- "group/hardware": {
- "orientation": "horizontal",
- "modules": [
- "cpu",
- "temperature#cpu",
- "temperature#gpu",
- "temperature#nvme",
- "temperature#wifi"
- ],
- "drawer": {
- "transition-left-to-right": false,
- "transition-duration": 500
- }
- },
+ "group/hardware": {
+ "orientation": "horizontal",
+ "modules": [
+ "cpu",
+ "temperature#cpu",
+ "temperature#gpu",
+ "temperature#nvme",
+ "temperature#wifi"
+ ],
+ "drawer": {
+ "transition-left-to-right": false,
+ "transition-duration": 500
+ }
+ },
- "cpu": {
- "interval": 30,
- "format": " {avg_frequency:3.2f}GHz {usage}%",
- "states": {
- "warning": 70,
- "critical": 90
- },
- },
+ "cpu": {
+ "interval": 30,
+ "format": " {avg_frequency:3.2f}GHz {usage}%",
+ "states": {
+ "warning": 70,
+ "critical": 90
+ },
+ },
- "temperature#cpu": {
- "hwmon-path": "/sys/class/hwmon/hwmon5/temp1_input",
- "critical-threshold": 80,
- "format": " CPU {temperatureC}°C"
- },
+ "temperature#cpu": {
+ "hwmon-path": "/sys/class/hwmon/hwmon5/temp1_input",
+ "critical-threshold": 80,
+ "format": " CPU {temperatureC}°C"
+ },
- "temperature#gpu": {
- "hwmon-path": "/sys/class/hwmon/hwmon0/temp1_input",
- "critical-threshold": 80,
- "format": "· GPU {temperatureC}°C"
- },
+ "temperature#gpu": {
+ "hwmon-path": "/sys/class/hwmon/hwmon0/temp1_input",
+ "critical-threshold": 80,
+ "format": "· GPU {temperatureC}°C"
+ },
- "temperature#nvme": {
- "hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
- "critical-threshold": 80,
- "format": "· NVMe {temperatureC}°C"
- },
+ "temperature#nvme": {
+ "hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
+ "critical-threshold": 80,
+ "format": "· NVMe {temperatureC}°C"
+ },
- "temperature#wifi": {
- "hwmon-path": "/sys/class/hwmon/hwmon11/temp1_input",
- "critical-threshold": 80,
- "format": "· WiFi {temperatureC}°C"
- },
+ "temperature#wifi": {
+ "hwmon-path": "/sys/class/hwmon/hwmon11/temp1_input",
+ "critical-threshold": 80,
+ "format": "· WiFi {temperatureC}°C"
+ },
- "group/resources": {
- "orientation": "horizontal",
- "modules": [ "memory", "disk#root" ],
- "drawer": {
- "transition-left-to-right": false,
- "transition-duration": 500
- }
- },
+ "group/resources": {
+ "orientation": "horizontal",
+ "modules": [ "memory", "disk#root" ],
+ "drawer": {
+ "transition-left-to-right": false,
+ "transition-duration": 500
+ }
+ },
- "memory": {
- "interval": 60,
- "format": " {used:3.1f}GiB/{total:3.1f}GiB"
- },
+ "memory": {
+ "interval": 60,
+ "format": " {used:3.1f}GiB/{total:3.1f}GiB"
+ },
- "disk#root": {
- "interval": 360,
- "format": " {used}/{total}",
- "path": "/"
- },
+ "disk#root": {
+ "interval": 360,
+ "format": " {used}/{total}",
+ "path": "/"
+ },
- "bluetooth": {
- // "controller": "controller1",
- "on-click": "~/.local/bin/waybar-bluetooth toggle",
- "format": "",
- "format-disabled": "",
- "format-connected": "",
- "format-connected-battery": " {device_battery_percentage}%",
- "tooltip-format": "{controller_alias}\t\t[{controller_address}]",
- "tooltip-format-connected": "{controller_alias}\t\t[{controller_address}]\n\n{device_enumerate}",
- "tooltip-format-connected-battery": "{controller_alias}\t\t[{controller_address}]\n\n{device_enumerate}",
- "tooltip-format-enumerate-connected": "{device_alias}\t\t[{device_address}]",
- "tooltip-format-enumerate-connected-battery": "{device_alias} ({device_battery_percentage})\t\t[{device_address}]"
- },
+ "bluetooth": {
+ // "controller": "controller1",
+ "on-click": "~/.local/bin/waybar-bluetooth toggle",
+ "format": "",
+ "format-disabled": "",
+ "format-connected": "",
+ "format-connected-battery": " {device_battery_percentage}%",
+ "tooltip-format": "{controller_alias}\t\t[{controller_address}]",
+ "tooltip-format-connected": "{controller_alias}\t\t[{controller_address}]\n\n{device_enumerate}",
+ "tooltip-format-connected-battery": "{controller_alias}\t\t[{controller_address}]\n\n{device_enumerate}",
+ "tooltip-format-enumerate-connected": "{device_alias}\t\t[{device_address}]",
+ "tooltip-format-enumerate-connected-battery": "{device_alias} ({device_battery_percentage})\t\t[{device_address}]"
+ },
- "group/audio": {
- "orientation": "horizontal",
- "modules": [
- "wireplumber",
- "custom/audio-internal",
- "custom/audio-headphones",
- "custom/audio-hdmi"
- ],
- "drawer": {
- "transition-left-to-right": false,
- "transition-duration": 500
- }
- },
+ "group/audio": {
+ "orientation": "horizontal",
+ "modules": [
+ "wireplumber",
+ "custom/audio-internal",
+ "custom/audio-headphones",
+ "custom/audio-hdmi"
+ ],
+ "drawer": {
+ "transition-left-to-right": false,
+ "transition-duration": 500
+ }
+ },
- "wireplumber": {
- "format": "{icon} {node_name}/{volume}",
- "format-muted": "",
- "on-click": "pavucontrol-qt",
- "on-click-right": "helvum",
- "format-icons": ["", "", ""]
- },
+ "wireplumber": {
+ "format": "{icon} {node_name}/{volume}",
+ "format-muted": "",
+ "on-click": "pavucontrol-qt",
+ "on-click-right": "helvum",
+ "format-icons": ["", "", ""]
+ },
- "custom/audio-internal": {
- "format": " ",
- "tooltip-format": "Internal",
- "on-click": "audio-router analog",
- "interval": "once"
- },
+ "custom/audio-internal": {
+ "format": " ",
+ "tooltip-format": "Internal",
+ "on-click": "audio-router analog",
+ "interval": "once"
+ },
- "custom/audio-hdmi": {
- "format": " ",
- "tooltip-format": "HDMI",
- "on-click": "audio-router hdmi",
- "interval": "once"
- },
+ "custom/audio-hdmi": {
+ "format": " ",
+ "tooltip-format": "HDMI",
+ "on-click": "audio-router hdmi",
+ "interval": "once"
+ },
- "group/battery": {
- "orientation": "horizontal",
- "modules": [
- "battery",
- "custom/powerdraw"
- ],
- "drawer": {
- "transition-left-to-right": false,
- "transition-duration": 500
- }
- },
+ "group/battery": {
+ "orientation": "horizontal",
+ "modules": [
+ "battery",
+ "custom/powerdraw"
+ ],
+ "drawer": {
+ "transition-left-to-right": false,
+ "transition-duration": 500
+ }
+ },
- "battery": {
- "bat": "BAT1",
- "interval": 30,
- "states": {
- "warning": 20,
- "critical": 10
- },
- "format-time": "{H}:{m}",
- "format": "{icon} {time} {capacity}%",
- "format-discharging": "{icon} {capacity}%",
- "format-discharging-warning": "{icon} {capacity}%",
- "format-discharging-critical": "{icon} {capacity}%",
- "format-charging": "{icon} {capacity}% @ {power:2.0f}W",
- "format-full": " {capacity}%",
- "format-not-charging": " {capacity}%",
- "format-icons": [" ", " ", " ", " ", " "],
- },
+ "battery": {
+ "bat": "BAT1",
+ "interval": 30,
+ "states": {
+ "warning": 20,
+ "critical": 10
+ },
+ "format-time": "{H}:{m}",
+ "format": "{icon} {time} {capacity}%",
+ "format-discharging": "{icon} {capacity}%",
+ "format-discharging-warning": "{icon} {capacity}%",
+ "format-discharging-critical": "{icon} {capacity}%",
+ "format-charging": "{icon} {capacity}% @ {power:2.0f}W",
+ "format-full": " {capacity}%",
+ "format-not-charging": " {capacity}%",
+ "format-icons": [" ", " ", " ", " ", " "],
+ },
- "custom/powerdraw": {
- "interval": 60,
- "exec": "~/.local/bin/waybar-powerdraw",
- },
+ "custom/powerdraw": {
+ "interval": 60,
+ "exec": "~/.local/bin/waybar-powerdraw",
+ },
- "group/clock": {
- "orientation": "horizontal",
- "modules": [ "custom/clock#minutes", "clock#time", "clock#date" ],
- "drawer": {
- "transition-left-to-right": false,
- "transition-duration": 500
- }
- },
+ "group/clock": {
+ "orientation": "horizontal",
+ "modules": [ "custom/clock#minutes", "clock#time", "clock#date" ],
+ "drawer": {
+ "transition-left-to-right": false,
+ "transition-duration": 500
+ }
+ },
- "clock#date": {
- "interval": 60,
- "format": " {:%a %e %b %Y}",
- "tooltip-format": "{:%B %Y}\n{calendar}",
- "calendar": {
- "mode" : "year",
- "mode-mon-col" : 2,
- "weeks-pos" : "right",
- "on-scroll" : 1,
- "format": {
- "months": "{}",
- "days": "{}",
- "weeks": "W{}",
- "weekdays": "{}",
- "today": "{}"
- }
- },
- "actions": {
- "on-click-right": "mode",
- "on-scroll-up": "shift_up",
- "on-scroll-down": "shift_down"
- }
- },
+ "clock#date": {
+ "interval": 60,
+ "format": " {:%a %e %b %Y}",
+ "tooltip-format": "{:%B %Y}\n{calendar}",
+ "calendar": {
+ "mode" : "year",
+ "mode-mon-col" : 2,
+ "weeks-pos" : "right",
+ "on-scroll" : 1,
+ "format": {
+ "months": "{}",
+ "days": "{}",
+ "weeks": "W{}",
+ "weekdays": "{}",
+ "today": "{}"
+ }
+ },
+ "actions": {
+ "on-click-right": "mode",
+ "on-scroll-up": "shift_up",
+ "on-scroll-down": "shift_down"
+ }
+ },
- "clock#time": {
- "interval": 60,
- "format": " {:%I:%M %p}",
- "actions": {
- "on-scroll-up": "tz_up",
- "on-scroll-down": "tz_down"
- }
- },
+ "clock#time": {
+ "interval": 60,
+ "format": " {:%I:%M %p}",
+ "actions": {
+ "on-scroll-up": "tz_up",
+ "on-scroll-down": "tz_down"
+ }
+ },
- "custom/clock#minutes": {
- "interval": 60,
- "format": " {} ",
- "exec": "~/.local/bin/waybar-minutes"
- }
- }
- ]
+ "custom/clock#minutes": {
+ "interval": 60,
+ "format": " {} ",
+ "exec": "~/.local/bin/waybar-minutes"
+ }
+ }
+ ]
'';
};
"/home/${username}/.config/waybar/style.css" = {
@@ -369,7 +370,7 @@
* {
border: none;
border-radius: 0;
- font-family: 'CommitMono Nerd Font';
+ font-family: 'GohuFont 11 Nerd Font Mono';
font-weight: 400;
font-size: 11px;
min-height: 26px;