diff --git a/flake.lock b/flake.lock index c030866..4ac149b 100644 --- a/flake.lock +++ b/flake.lock @@ -1076,11 +1076,11 @@ "nixvim": "nixvim_2" }, "locked": { - "lastModified": 1748338979, - "narHash": "sha256-cu/DVvQZRKVmI9rqEygXPW0xjR0BEqSgzH2Ay9ZYHVw=", + "lastModified": 1749898168, + "narHash": "sha256-aOUvfBcLdrNzI1BL+jhPh0y0cFkgjne2tstDb8k1vI0=", "owner": "ahwxorg", "repo": "nixvim-config", - "rev": "fc0d965d9bbd98047f777cb31e5b0708cd958956", + "rev": "546d385ec71b0ed34abc3f32100e3d0792c349c8", "type": "github" }, "original": { diff --git a/hosts/sakura/default.nix b/hosts/sakura/default.nix index 50945a5..50363bb 100644 --- a/hosts/sakura/default.nix +++ b/hosts/sakura/default.nix @@ -41,6 +41,9 @@ laptop13.audioEnhancement.enable = true; }; + # Disable light sensors and accelerometers as they are not used and consume extra battery + hardware.sensor.iio.enable = lib.mkForce false; + networking.hostName = "sakura"; powerManagement = { diff --git a/hosts/sakura/hardware-configuration.nix b/hosts/sakura/hardware-configuration.nix index e0d299a..3a35650 100644 --- a/hosts/sakura/hardware-configuration.nix +++ b/hosts/sakura/hardware-configuration.nix @@ -30,7 +30,8 @@ fsType = "ext4"; }; - boot.initrd.luks.devices."luks-root".device = "/dev/nvme0n1p3"; + boot.initrd.luks.devices."luks-156453ac-bbad-452c-ad92-4fc569db9347".device = + "/dev/disk/by-uuid/156453ac-bbad-452c-ad92-4fc569db9347"; fileSystems."/boot" = { device = "/dev/disk/by-uuid/0EFD-4B3F"; diff --git a/modules/core/printing.nix b/modules/core/printing.nix index 0bf8a60..186ec4a 100644 --- a/modules/core/printing.nix +++ b/modules/core/printing.nix @@ -5,6 +5,7 @@ nssmdns4 = true; openFirewall = true; }; + services.printing.enable = true; # environment.systemPackages = with pkgs; [ # ]; } diff --git a/modules/core/program.nix b/modules/core/program.nix index a7e5917..2e7a9e7 100644 --- a/modules/core/program.nix +++ b/modules/core/program.nix @@ -1,4 +1,4 @@ -{ pkgs, agenix, ... }: +{ pkgs, agenix, ... }: { programs = { dconf.enable = true; @@ -13,6 +13,8 @@ environment.systemPackages = with pkgs; [ wget git + dig + traceroute # agenix.packages.x86_64-linux.default ]; } diff --git a/modules/core/user.nix b/modules/core/user.nix index 30222ca..5ddb8db 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -38,6 +38,8 @@ }; }; + fonts.fontconfig.antialias = false; + users.groups.gay = { }; users.users.${username} = { diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix index a95efb9..5ee7713 100644 --- a/modules/home/hyprland/config.nix +++ b/modules/home/hyprland/config.nix @@ -7,13 +7,14 @@ pkgs.twemoji-color-font pkgs.noto-fonts-emoji pkgs.swww + pkgs.swaylock ]; gtk = { enable = true; font = { - name = "CaskaydiaCove Nerd Font"; - size = 12; + name = "GohuFont 14 Nerd Font Mono"; + size = 14; }; theme = { name = "Gruvbox-Green-Dark"; @@ -95,11 +96,20 @@ gaps_in = 5; gaps_out = 10; border_size = 2; - # "col.active_border" = "rgb(cda5ef) rgb(cda5ef) 45deg"; "col.active_border" = "rgb(ffffff) rgb(ffffff) 45deg"; "col.inactive_border" = "0x00000000"; no_border_on_floating = false; }; + group = { + "col.border_active" = "rgb(ffffff) rgb(ffffff) 45deg"; + "col.border_inactive" = "0x00000000"; + groupbar = { + font_family = "GohuFont 11 Nerd Font Mono"; + font_size = 11; + "col.active" = "rgb(efa8a5) rgb(efa8a5) 45deg"; + "col.inactive" = "rgb(a5ecef) rgb(a5ecef) 45deg"; + }; + }; misc = { disable_autoreload = true; @@ -109,6 +119,12 @@ animate_manual_resizes = false; enable_swallow = true; focus_on_activate = true; + enable_anr_dialog = false; + }; + + ecosystem = { + no_update_news = true; + no_donation_nag = true; }; dwindle = { diff --git a/modules/home/hyprland/displays.conf b/modules/home/hyprland/displays.conf index db1dd93..bc693c8 100644 --- a/modules/home/hyprland/displays.conf +++ b/modules/home/hyprland/displays.conf @@ -1,3 +1,4 @@ # monitor=HDMI-A-1,1920x1080@165,0x0,1,transform,0 -# monitor=DP-1, 3440x1440@144,0x0,1,transform,0 -monitor=CMT GM34-CWQ CMI231700118,3440x1440@144,0x0,1,transform,0 +monitor=DP-1, 3440x1440@144,0x0,1,transform,0 +monitor=DP-2, 3440x1440@144,1504x0,1,transform,0 +monitor=CMT GM34-CWQ CMI231700118,3440x1440@144,1504x0,1,transform,0 diff --git a/modules/home/hyprlock/default.nix b/modules/home/hyprlock/default.nix index 2a5eece..dc557b6 100644 --- a/modules/home/hyprlock/default.nix +++ b/modules/home/hyprlock/default.nix @@ -51,7 +51,8 @@ rounding = 32 fail_color = rgba(191, 97, 106, 0.75) check_color = rgba(235, 203, 139, 0.75) - placeholder_text = + placeholder_text = Password + font_family = GohuFont 14 Nerd Font Mono hide_input = false position = 0, -400 halign = center @@ -63,7 +64,7 @@ text = cmd[update:1000] echo "$(date +"%A, %B %d")" color = rgba(209, 207, 207, 0.75) font_size = 22 - font_family = JetBrains Mono + font_family = GohuFont 14 Nerd Font Mono position = 0, 300 halign = center valign = center @@ -74,7 +75,7 @@ text = cmd[update:1000] echo "$(date +"%-H:%M")" color = rgba(209, 207, 207, 0.75) font_size = 95 - font_family = JetBrains Mono Extrabold + font_family = GohuFont 14 Nerd Font Mono position = 0, 200 halign = center valign = center @@ -126,11 +127,11 @@ label { monitor = - text = cmd[update:1000] echo "$(waybar-music | jq .text | cut -d\" -f2)" + text = cmd[update:1000] echo "$(waybar-music | jq .text --raw-output)" color = rgba(209, 207, 207, 0.75) #color = rgba(255, 255, 255, 0.6) font_size = 17 - font_family = JetBrains Mono Nerd Font Mono ExtraBold + font_family = GohuFont 14 Nerd Font Mono position = 0, -200 halign = center valign = center @@ -141,7 +142,7 @@ text = cmd[update:6000000] echo "$(bash /home/liv/.local/bin/weather.sh)" color = rgba(255, 255, 255, 1) font_size = 10 - font_family = JetBrains Mono Nerd Font Mono ExtraBold + font_family = GohuFont 14 Nerd Font Mono position = 0, 50 halign = center valign = top @@ -152,7 +153,7 @@ text = cmd[update:1000] echo -e "$(/home/liv/.local/bin/hyprlock-battery.sh)" color = rgba(255, 255, 255, 1) font_size = 12 - font_family = JetBrains Mono Nerd Font Mono ExtraBold + font_family = GohuFont 14 Nerd Font Mono position = 0, 0 halign = right valign = bottom 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/packages.nix b/modules/home/packages.nix index 0a80335..bbf04d7 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -73,12 +73,15 @@ thunderbird lxqt.pavucontrol-qt mpv + plasma5Packages.kdeconnect-kde # Gaming lunar-client inputs.alejandra.defaultPackage.${system} inputs.nixvim.packages.${pkgs.system}.default + mermaid-cli + gnuplot # Email/calendar/etc neomutt diff --git a/modules/home/qutebrowser.nix b/modules/home/qutebrowser.nix index 5256591..2fc880f 100644 --- a/modules/home/qutebrowser.nix +++ b/modules/home/qutebrowser.nix @@ -36,8 +36,8 @@ in settings = { fonts = { - default_family = "FiraCode Nerd Font"; - default_size = "10pt"; + default_family = "GohuFont 14 Nerd Font Mono"; + default_size = "14pt"; }; tabs = { diff --git a/modules/home/scripts/scripts.nix b/modules/home/scripts/scripts.nix index 417d193..4151d79 100644 --- a/modules/home/scripts/scripts.nix +++ b/modules/home/scripts/scripts.nix @@ -6,6 +6,7 @@ let notes = pkgs.writeShellScriptBin "notes" (builtins.readFile ./scripts/notes.sh); grabtext = pkgs.writeShellScriptBin "grabtext" (builtins.readFile ./scripts/grabtext.sh); unfuck = pkgs.writeShellScriptBin "unfuck" (builtins.readFile ./scripts/unfuck.sh); + hidname = pkgs.writeShellScriptBin "hidname" (builtins.readFile ./scripts/hidname.sh); toggle_blur = pkgs.writeScriptBin "toggle_blur" (builtins.readFile ./scripts/toggle_blur.sh); toggle_oppacity = pkgs.writeScriptBin "toggle_oppacity" ( builtins.readFile ./scripts/toggle_oppacity.sh @@ -20,6 +21,7 @@ in notes grabtext unfuck + hidname toggle_blur toggle_oppacity ascii diff --git a/modules/home/scripts/scripts/hidname.sh b/modules/home/scripts/scripts/hidname.sh new file mode 100755 index 0000000..61f41aa --- /dev/null +++ b/modules/home/scripts/scripts/hidname.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +FILES=/dev/hidraw* +for f in $FILES; do + FILE=${f##*/} + DEVICE="$(cat /sys/class/hidraw/${FILE}/device/uevent | grep HID_NAME | cut -d '=' -f2)" + printf "%s \t %s\n" $FILE "$DEVICE" +done diff --git a/modules/home/scripts/scripts/unfuck.sh b/modules/home/scripts/scripts/unfuck.sh index 667f09d..fc07b19 100644 --- a/modules/home/scripts/scripts/unfuck.sh +++ b/modules/home/scripts/scripts/unfuck.sh @@ -2,86 +2,87 @@ # unfuck system when shit goes wrong unfuckable=( - "wallpaper" - "bar" - "networkmanager" - "spotify" - "audio" - "screenlock" + "wallpaper" + "bar" + "networkmanager" + "spotify" + "audio" + "screenlock" ) usage() { - echo "INFO: usage; unfuck [OPTION]" - echo "INFO: example; unfuck everything" - echo "" - echo "INFO: items: ${unfuckable[*]}" - echo "" - echo "WARN: unfuck everything should only be used when *everything* is broken and nothing works anymore!" + echo "INFO: usage; unfuck [OPTION]" + echo "INFO: example; unfuck everything" + echo "" + echo "INFO: items: ${unfuckable[*]}" + echo "" + echo "WARN: unfuck everything should only be used when *everything* is broken and nothing works anymore!" } unfuck_wallpaper() { - pkill swww-daemon - setsid swww-daemon & + pkill swww-daemon + setsid swww-daemon & + swww img ~/.local/share/bg.png } unfuck_bar() { - pkill waybar - setsid waybar & + pkill waybar + setsid waybar & } unfuck_networkmanager() { - # sudo modprobe -r iwlwifi - # sudo modprobe iwlwifi - sudo systemctl restart NetworkManager + # sudo modprobe -r iwlwifi + # sudo modprobe iwlwifi + sudo systemctl restart NetworkManager } unfuck_spotify() { - if pgrep ncspot; then - pkill ncspot - kitty -e ncspot - elif pgrep spotify; then - pkill spotify - spotify - fi + if pgrep ncspot; then + pkill ncspot + kitty -e ncspot + elif pgrep spotify; then + pkill spotify + spotify + fi } unfuck_audio() { - if [[ "$(playerctl status)" == "Playing" ]]; then - playerctl pause - fi - for device in $(bluetoothctl devices Connected | awk '{print $2}'); do - devices+=("$device") - done - systemctl --user restart wireplumber pipewire pipewire-pulse bluetooth - bluetoothctl power off - bluetoothctl power on - for device in ${devices[*]}; do - # because bluetooth is the worst thing ever created and defaults to handset mode, devices will need to reconnect - echo "INFO: disconnecting and reconnecting to $device" - bluetoothctl disconnect "$device" - bluetoothctl connect "$device" - done + if [[ "$(playerctl status)" == "Playing" ]]; then + playerctl pause + fi + for device in $(bluetoothctl devices Connected | awk '{print $2}'); do + devices+=("$device") + done + systemctl --user restart wireplumber pipewire pipewire-pulse bluetooth + bluetoothctl power off + bluetoothctl power on + for device in ${devices[*]}; do + # because bluetooth is the worst thing ever created and defaults to handset mode, devices will need to reconnect + echo "INFO: disconnecting and reconnecting to $device" + bluetoothctl disconnect "$device" + bluetoothctl connect "$device" + done } unfuck_screenlock() { - hyprctl --instance 0 'keyword misc:allow_session_lock_restore 1' - hyprctl --instance 0 'dispatch exec hyprlock' + hyprctl --instance 0 'keyword misc:allow_session_lock_restore 1' + hyprctl --instance 0 'dispatch exec hyprlock' } case $1 in "") - echo "what is fucked?" - ;; + echo "what is fucked?" + ;; -h | --help | help) - usage - ;; + usage + ;; everything) - unfuck_screenlock - unfuck_bar - unfuck_spotify - unfuck_wallpaper - ;; + unfuck_screenlock + unfuck_bar + unfuck_spotify + unfuck_wallpaper + ;; *) - eval "unfuck_$1" - ;; + eval "unfuck_$1" + ;; esac diff --git a/modules/home/swaync/default.nix b/modules/home/swaync/default.nix index e87ab70..f70bcbd 100644 --- a/modules/home/swaync/default.nix +++ b/modules/home/swaync/default.nix @@ -41,7 +41,7 @@ "button-text": " Clear all " }, "dnd": { - "text": " Do Not Disturb" + "text": " Do not disturb" }, } } @@ -51,25 +51,25 @@ * { all: unset; font-size: 14px; - font-family: "Ubuntu Nerd Font"; + font-family: "GohuFont 14 Nerd Font Mono"; transition: 200ms; } - + trough highlight { background: #cdd6f4; } - + scale trough { margin: 0rem 1rem; background-color: #313244; min-height: 8px; min-width: 70px; } - + slider { background-color: #89b4fa; } - + .floating-notifications.background .notification-row .notification-background { box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.8), inset 0 0 0 1px #313244; margin: 18px; @@ -77,71 +77,71 @@ color: #cdd6f4; padding: 0; } - + .floating-notifications.background .notification-row .notification-background .notification { padding: 7px; } - + .floating-notifications.background .notification-row .notification-background .notification.critical { box-shadow: inset 0 0 7px 0 #f38ba8; } - + .floating-notifications.background .notification-row .notification-background .notification .notification-content { margin: 7px; } - + .floating-notifications.background .notification-row .notification-background .notification .notification-content .summary { color: #cdd6f4; } - + .floating-notifications.background .notification-row .notification-background .notification .notification-content .time { color: #a6adc8; } - + .floating-notifications.background .notification-row .notification-background .notification .notification-content .body { color: #cdd6f4; } - + .floating-notifications.background .notification-row .notification-background .notification > *:last-child > * { min-height: 3.4em; } - + .floating-notifications.background .notification-row .notification-background .notification > *:last-child > * .notification-action { color: #cdd6f4; background-color: #000000; box-shadow: inset 0 0 0 1px #45475a; margin: 7px; } - + .floating-notifications.background .notification-row .notification-background .notification > *:last-child > * .notification-action:hover { box-shadow: inset 0 0 0 1px #45475a; background-color: #000000; color: #cdd6f4; } - + .floating-notifications.background .notification-row .notification-background .notification > *:last-child > * .notification-action:active { box-shadow: inset 0 0 0 1px #45475a; background-color: #000000; color: #cdd6f4; } - + .floating-notifications.background .notification-row .notification-background .close-button { margin: 7px; padding: 2px; color: #1e1e2e; background-color: #000000; } - + .floating-notifications.background .notification-row .notification-background .close-button:hover { background-color: #000000; color: #1e1e2e; } - + .floating-notifications.background .notification-row .notification-background .close-button:active { background-color: #000000; color: #1e1e2e; } - + .control-center { box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.8), inset 0 0 0 1px #313244; margin: 18px; @@ -149,229 +149,229 @@ color: #cdd6f4; padding: 14px; } - + .control-center .widget-title > label { color: #cdd6f4; font-size: 1.3em; } - + .control-center .widget-title button { color: #cdd6f4; background-color: #313244; box-shadow: inset 0 0 0 1px #45475a; padding: 8px; } - + .control-center .widget-title button:hover { box-shadow: inset 0 0 0 1px #45475a; background-color: #585b70; color: #cdd6f4; } - + .control-center .widget-title button:active { box-shadow: inset 0 0 0 1px #45475a; background-color: #74c7ec; color: #1e1e2e; } - + .control-center .notification-row .notification-background { color: #cdd6f4; background-color: #313244; box-shadow: inset 0 0 0 1px #45475a; margin-top: 14px; } - + .control-center .notification-row .notification-background .notification { padding: 7px; } - + .control-center .notification-row .notification-background .notification.critical { box-shadow: inset 0 0 7px 0 #f38ba8; } - + .control-center .notification-row .notification-background .notification .notification-content { margin: 7px; } - + .control-center .notification-row .notification-background .notification .notification-content .summary { color: #cdd6f4; } - + .control-center .notification-row .notification-background .notification .notification-content .time { color: #a6adc8; } - + .control-center .notification-row .notification-background .notification .notification-content .body { color: #cdd6f4; } - + .control-center .notification-row .notification-background .notification > *:last-child > * { min-height: 3.4em; } - + .control-center .notification-row .notification-background .notification > *:last-child > * .notification-action { color: #cdd6f4; background-color: #11111b; box-shadow: inset 0 0 0 1px #45475a; margin: 7px; } - + .control-center .notification-row .notification-background .notification > *:last-child > * .notification-action:hover { box-shadow: inset 0 0 0 1px #45475a; background-color: #313244; color: #cdd6f4; } - + .control-center .notification-row .notification-background .notification > *:last-child > * .notification-action:active { box-shadow: inset 0 0 0 1px #45475a; background-color: #74c7ec; color: #cdd6f4; } - + .control-center .notification-row .notification-background .close-button { margin: 7px; padding: 2px; color: #1e1e2e; background-color: #eba0ac; } - + .close-button { } - + .control-center .notification-row .notification-background .close-button:hover { background-color: #f38ba8; color: #1e1e2e; } - + .control-center .notification-row .notification-background .close-button:active { background-color: #f38ba8; color: #1e1e2e; } - + .control-center .notification-row .notification-background:hover { box-shadow: inset 0 0 0 1px #45475a; background-color: #7f849c; color: #cdd6f4; } - + .control-center .notification-row .notification-background:active { box-shadow: inset 0 0 0 1px #45475a; background-color: #74c7ec; color: #cdd6f4; } - + .notification.critical progress { background-color: #f38ba8; } - + .notification.low progress, .notification.normal progress { background-color: #89b4fa; } - + .control-center-dnd { margin-top: 5px; background: #313244; border: 1px solid #45475a; box-shadow: none; } - + .control-center-dnd:checked { background: #313244; } - + .control-center-dnd slider { background: #45475a; } - + .widget-dnd { margin: 0px; font-size: 1.1rem; } - + .widget-dnd > switch { font-size: initial; background: #313244; border: 1px solid #45475a; box-shadow: none; } - + .widget-dnd > switch:checked { background: #313244; } - + .widget-dnd > switch slider { background: #45475a; border: 1px solid #6c7086; } - + .widget-mpris .widget-mpris-player { background: #313244; padding: 7px; } - + .widget-mpris .widget-mpris-title { font-size: 1.2rem; } - + .widget-mpris .widget-mpris-subtitle { font-size: 0.8rem; } - + .widget-menubar > box > .menu-button-bar > button > label { font-size: 3rem; padding: 0.5rem 2rem; } - + .widget-menubar > box > .menu-button-bar > :last-child { color: #f38ba8; } - + .power-buttons button:hover, .powermode-buttons button:hover, .screenshot-buttons button:hover { background: #313244; } - + .control-center .widget-label > label { color: #cdd6f4; font-size: 2rem; } - + .widget-buttons-grid { padding-top: 1rem; } - + .widget-buttons-grid > flowbox > flowboxchild > button label { font-size: 2.5rem; } - + .widget-volume { padding-top: 1rem; } - + .widget-volume label { font-size: 1.5rem; color: #74c7ec; } - + .widget-volume trough highlight { background: #74c7ec; } - + .widget-backlight trough highlight { background: #f9e2af; } - + .widget-backlight scale { margin-right: 1rem; } - + .widget-backlight label { font-size: 1.5rem; color: #f9e2af; } - + .widget-backlight .KB { padding-bottom: 1rem; } 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; diff --git a/modules/home/zsh.nix b/modules/home/zsh.nix index 82e98d8..a50b200 100644 --- a/modules/home/zsh.nix +++ b/modules/home/zsh.nix @@ -174,6 +174,8 @@ vim = "nvim"; doas = "sudo"; sxiv = "nsxiv"; + enby = "man"; + woman = "man"; # NixOS ns = "nix-shell --run zsh";