mirror of
https://github.com/Ahwxorg/nixos-config.git
synced 2025-12-04 15:00:13 +01:00
chore: merge remote-tracking branch 'refs/remotes/origin/master'
This commit is contained in:
commit
7d6257ddd5
18 changed files with 489 additions and 445 deletions
6
flake.lock
generated
6
flake.lock
generated
|
|
@ -1076,11 +1076,11 @@
|
||||||
"nixvim": "nixvim_2"
|
"nixvim": "nixvim_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1748338979,
|
"lastModified": 1749898168,
|
||||||
"narHash": "sha256-cu/DVvQZRKVmI9rqEygXPW0xjR0BEqSgzH2Ay9ZYHVw=",
|
"narHash": "sha256-aOUvfBcLdrNzI1BL+jhPh0y0cFkgjne2tstDb8k1vI0=",
|
||||||
"owner": "ahwxorg",
|
"owner": "ahwxorg",
|
||||||
"repo": "nixvim-config",
|
"repo": "nixvim-config",
|
||||||
"rev": "fc0d965d9bbd98047f777cb31e5b0708cd958956",
|
"rev": "546d385ec71b0ed34abc3f32100e3d0792c349c8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -41,6 +41,9 @@
|
||||||
laptop13.audioEnhancement.enable = true;
|
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";
|
networking.hostName = "sakura";
|
||||||
|
|
||||||
powerManagement = {
|
powerManagement = {
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,8 @@
|
||||||
fsType = "ext4";
|
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" = {
|
fileSystems."/boot" = {
|
||||||
device = "/dev/disk/by-uuid/0EFD-4B3F";
|
device = "/dev/disk/by-uuid/0EFD-4B3F";
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
nssmdns4 = true;
|
nssmdns4 = true;
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
};
|
};
|
||||||
|
services.printing.enable = true;
|
||||||
# environment.systemPackages = with pkgs; [
|
# environment.systemPackages = with pkgs; [
|
||||||
# ];
|
# ];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,8 @@
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
wget
|
wget
|
||||||
git
|
git
|
||||||
|
dig
|
||||||
|
traceroute
|
||||||
# agenix.packages.x86_64-linux.default
|
# agenix.packages.x86_64-linux.default
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,8 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
fonts.fontconfig.antialias = false;
|
||||||
|
|
||||||
users.groups.gay = { };
|
users.groups.gay = { };
|
||||||
|
|
||||||
users.users.${username} = {
|
users.users.${username} = {
|
||||||
|
|
|
||||||
|
|
@ -7,13 +7,14 @@
|
||||||
pkgs.twemoji-color-font
|
pkgs.twemoji-color-font
|
||||||
pkgs.noto-fonts-emoji
|
pkgs.noto-fonts-emoji
|
||||||
pkgs.swww
|
pkgs.swww
|
||||||
|
pkgs.swaylock
|
||||||
];
|
];
|
||||||
|
|
||||||
gtk = {
|
gtk = {
|
||||||
enable = true;
|
enable = true;
|
||||||
font = {
|
font = {
|
||||||
name = "CaskaydiaCove Nerd Font";
|
name = "GohuFont 14 Nerd Font Mono";
|
||||||
size = 12;
|
size = 14;
|
||||||
};
|
};
|
||||||
theme = {
|
theme = {
|
||||||
name = "Gruvbox-Green-Dark";
|
name = "Gruvbox-Green-Dark";
|
||||||
|
|
@ -95,11 +96,20 @@
|
||||||
gaps_in = 5;
|
gaps_in = 5;
|
||||||
gaps_out = 10;
|
gaps_out = 10;
|
||||||
border_size = 2;
|
border_size = 2;
|
||||||
# "col.active_border" = "rgb(cda5ef) rgb(cda5ef) 45deg";
|
|
||||||
"col.active_border" = "rgb(ffffff) rgb(ffffff) 45deg";
|
"col.active_border" = "rgb(ffffff) rgb(ffffff) 45deg";
|
||||||
"col.inactive_border" = "0x00000000";
|
"col.inactive_border" = "0x00000000";
|
||||||
no_border_on_floating = false;
|
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 = {
|
misc = {
|
||||||
disable_autoreload = true;
|
disable_autoreload = true;
|
||||||
|
|
@ -109,6 +119,12 @@
|
||||||
animate_manual_resizes = false;
|
animate_manual_resizes = false;
|
||||||
enable_swallow = true;
|
enable_swallow = true;
|
||||||
focus_on_activate = true;
|
focus_on_activate = true;
|
||||||
|
enable_anr_dialog = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
ecosystem = {
|
||||||
|
no_update_news = true;
|
||||||
|
no_donation_nag = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
dwindle = {
|
dwindle = {
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
# monitor=HDMI-A-1,1920x1080@165,0x0,1,transform,0
|
# monitor=HDMI-A-1,1920x1080@165,0x0,1,transform,0
|
||||||
# monitor=DP-1, 3440x1440@144,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-2, 3440x1440@144,1504x0,1,transform,0
|
||||||
|
monitor=CMT GM34-CWQ CMI231700118,3440x1440@144,1504x0,1,transform,0
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,8 @@
|
||||||
rounding = 32
|
rounding = 32
|
||||||
fail_color = rgba(191, 97, 106, 0.75)
|
fail_color = rgba(191, 97, 106, 0.75)
|
||||||
check_color = rgba(235, 203, 139, 0.75)
|
check_color = rgba(235, 203, 139, 0.75)
|
||||||
placeholder_text = <span foreground="##cdd6f4"></span>
|
placeholder_text = <span foreground="##cdd6f4">Password</span>
|
||||||
|
font_family = GohuFont 14 Nerd Font Mono
|
||||||
hide_input = false
|
hide_input = false
|
||||||
position = 0, -400
|
position = 0, -400
|
||||||
halign = center
|
halign = center
|
||||||
|
|
@ -63,7 +64,7 @@
|
||||||
text = cmd[update:1000] echo "$(date +"%A, %B %d")"
|
text = cmd[update:1000] echo "$(date +"%A, %B %d")"
|
||||||
color = rgba(209, 207, 207, 0.75)
|
color = rgba(209, 207, 207, 0.75)
|
||||||
font_size = 22
|
font_size = 22
|
||||||
font_family = JetBrains Mono
|
font_family = GohuFont 14 Nerd Font Mono
|
||||||
position = 0, 300
|
position = 0, 300
|
||||||
halign = center
|
halign = center
|
||||||
valign = center
|
valign = center
|
||||||
|
|
@ -74,7 +75,7 @@
|
||||||
text = cmd[update:1000] echo "$(date +"%-H:%M")"
|
text = cmd[update:1000] echo "$(date +"%-H:%M")"
|
||||||
color = rgba(209, 207, 207, 0.75)
|
color = rgba(209, 207, 207, 0.75)
|
||||||
font_size = 95
|
font_size = 95
|
||||||
font_family = JetBrains Mono Extrabold
|
font_family = GohuFont 14 Nerd Font Mono
|
||||||
position = 0, 200
|
position = 0, 200
|
||||||
halign = center
|
halign = center
|
||||||
valign = center
|
valign = center
|
||||||
|
|
@ -126,11 +127,11 @@
|
||||||
|
|
||||||
label {
|
label {
|
||||||
monitor =
|
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(209, 207, 207, 0.75)
|
||||||
#color = rgba(255, 255, 255, 0.6)
|
#color = rgba(255, 255, 255, 0.6)
|
||||||
font_size = 17
|
font_size = 17
|
||||||
font_family = JetBrains Mono Nerd Font Mono ExtraBold
|
font_family = GohuFont 14 Nerd Font Mono
|
||||||
position = 0, -200
|
position = 0, -200
|
||||||
halign = center
|
halign = center
|
||||||
valign = center
|
valign = center
|
||||||
|
|
@ -141,7 +142,7 @@
|
||||||
text = cmd[update:6000000] echo "$(bash /home/liv/.local/bin/weather.sh)"
|
text = cmd[update:6000000] echo "$(bash /home/liv/.local/bin/weather.sh)"
|
||||||
color = rgba(255, 255, 255, 1)
|
color = rgba(255, 255, 255, 1)
|
||||||
font_size = 10
|
font_size = 10
|
||||||
font_family = JetBrains Mono Nerd Font Mono ExtraBold
|
font_family = GohuFont 14 Nerd Font Mono
|
||||||
position = 0, 50
|
position = 0, 50
|
||||||
halign = center
|
halign = center
|
||||||
valign = top
|
valign = top
|
||||||
|
|
@ -152,7 +153,7 @@
|
||||||
text = cmd[update:1000] echo -e "$(/home/liv/.local/bin/hyprlock-battery.sh)"
|
text = cmd[update:1000] echo -e "$(/home/liv/.local/bin/hyprlock-battery.sh)"
|
||||||
color = rgba(255, 255, 255, 1)
|
color = rgba(255, 255, 255, 1)
|
||||||
font_size = 12
|
font_size = 12
|
||||||
font_family = JetBrains Mono Nerd Font Mono ExtraBold
|
font_family = GohuFont 14 Nerd Font Mono
|
||||||
position = 0, 0
|
position = 0, 0
|
||||||
halign = right
|
halign = right
|
||||||
valign = bottom
|
valign = bottom
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
theme = "3024 Night";
|
theme = "3024 Night";
|
||||||
|
|
||||||
font = {
|
font = {
|
||||||
name = "JetBrainsMono Nerd Font";
|
name = "GohuFont 14 Nerd Font Mono";
|
||||||
size = 9;
|
size = 9;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -73,12 +73,15 @@
|
||||||
thunderbird
|
thunderbird
|
||||||
lxqt.pavucontrol-qt
|
lxqt.pavucontrol-qt
|
||||||
mpv
|
mpv
|
||||||
|
plasma5Packages.kdeconnect-kde
|
||||||
|
|
||||||
# Gaming
|
# Gaming
|
||||||
lunar-client
|
lunar-client
|
||||||
|
|
||||||
inputs.alejandra.defaultPackage.${system}
|
inputs.alejandra.defaultPackage.${system}
|
||||||
inputs.nixvim.packages.${pkgs.system}.default
|
inputs.nixvim.packages.${pkgs.system}.default
|
||||||
|
mermaid-cli
|
||||||
|
gnuplot
|
||||||
|
|
||||||
# Email/calendar/etc
|
# Email/calendar/etc
|
||||||
neomutt
|
neomutt
|
||||||
|
|
|
||||||
|
|
@ -36,8 +36,8 @@ in
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
fonts = {
|
fonts = {
|
||||||
default_family = "FiraCode Nerd Font";
|
default_family = "GohuFont 14 Nerd Font Mono";
|
||||||
default_size = "10pt";
|
default_size = "14pt";
|
||||||
};
|
};
|
||||||
|
|
||||||
tabs = {
|
tabs = {
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ let
|
||||||
notes = pkgs.writeShellScriptBin "notes" (builtins.readFile ./scripts/notes.sh);
|
notes = pkgs.writeShellScriptBin "notes" (builtins.readFile ./scripts/notes.sh);
|
||||||
grabtext = pkgs.writeShellScriptBin "grabtext" (builtins.readFile ./scripts/grabtext.sh);
|
grabtext = pkgs.writeShellScriptBin "grabtext" (builtins.readFile ./scripts/grabtext.sh);
|
||||||
unfuck = pkgs.writeShellScriptBin "unfuck" (builtins.readFile ./scripts/unfuck.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_blur = pkgs.writeScriptBin "toggle_blur" (builtins.readFile ./scripts/toggle_blur.sh);
|
||||||
toggle_oppacity = pkgs.writeScriptBin "toggle_oppacity" (
|
toggle_oppacity = pkgs.writeScriptBin "toggle_oppacity" (
|
||||||
builtins.readFile ./scripts/toggle_oppacity.sh
|
builtins.readFile ./scripts/toggle_oppacity.sh
|
||||||
|
|
@ -20,6 +21,7 @@ in
|
||||||
notes
|
notes
|
||||||
grabtext
|
grabtext
|
||||||
unfuck
|
unfuck
|
||||||
|
hidname
|
||||||
toggle_blur
|
toggle_blur
|
||||||
toggle_oppacity
|
toggle_oppacity
|
||||||
ascii
|
ascii
|
||||||
|
|
|
||||||
8
modules/home/scripts/scripts/hidname.sh
Executable file
8
modules/home/scripts/scripts/hidname.sh
Executable file
|
|
@ -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
|
||||||
|
|
@ -2,86 +2,87 @@
|
||||||
# unfuck system when shit goes wrong
|
# unfuck system when shit goes wrong
|
||||||
|
|
||||||
unfuckable=(
|
unfuckable=(
|
||||||
"wallpaper"
|
"wallpaper"
|
||||||
"bar"
|
"bar"
|
||||||
"networkmanager"
|
"networkmanager"
|
||||||
"spotify"
|
"spotify"
|
||||||
"audio"
|
"audio"
|
||||||
"screenlock"
|
"screenlock"
|
||||||
)
|
)
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
echo "INFO: usage; unfuck [OPTION]"
|
echo "INFO: usage; unfuck [OPTION]"
|
||||||
echo "INFO: example; unfuck everything"
|
echo "INFO: example; unfuck everything"
|
||||||
echo ""
|
echo ""
|
||||||
echo "INFO: items: ${unfuckable[*]}"
|
echo "INFO: items: ${unfuckable[*]}"
|
||||||
echo ""
|
echo ""
|
||||||
echo "WARN: unfuck everything should only be used when *everything* is broken and nothing works anymore!"
|
echo "WARN: unfuck everything should only be used when *everything* is broken and nothing works anymore!"
|
||||||
}
|
}
|
||||||
|
|
||||||
unfuck_wallpaper() {
|
unfuck_wallpaper() {
|
||||||
pkill swww-daemon
|
pkill swww-daemon
|
||||||
setsid swww-daemon &
|
setsid swww-daemon &
|
||||||
|
swww img ~/.local/share/bg.png
|
||||||
}
|
}
|
||||||
|
|
||||||
unfuck_bar() {
|
unfuck_bar() {
|
||||||
pkill waybar
|
pkill waybar
|
||||||
setsid waybar &
|
setsid waybar &
|
||||||
}
|
}
|
||||||
|
|
||||||
unfuck_networkmanager() {
|
unfuck_networkmanager() {
|
||||||
# sudo modprobe -r iwlwifi
|
# sudo modprobe -r iwlwifi
|
||||||
# sudo modprobe iwlwifi
|
# sudo modprobe iwlwifi
|
||||||
sudo systemctl restart NetworkManager
|
sudo systemctl restart NetworkManager
|
||||||
}
|
}
|
||||||
|
|
||||||
unfuck_spotify() {
|
unfuck_spotify() {
|
||||||
if pgrep ncspot; then
|
if pgrep ncspot; then
|
||||||
pkill ncspot
|
pkill ncspot
|
||||||
kitty -e ncspot
|
kitty -e ncspot
|
||||||
elif pgrep spotify; then
|
elif pgrep spotify; then
|
||||||
pkill spotify
|
pkill spotify
|
||||||
spotify
|
spotify
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
unfuck_audio() {
|
unfuck_audio() {
|
||||||
if [[ "$(playerctl status)" == "Playing" ]]; then
|
if [[ "$(playerctl status)" == "Playing" ]]; then
|
||||||
playerctl pause
|
playerctl pause
|
||||||
fi
|
fi
|
||||||
for device in $(bluetoothctl devices Connected | awk '{print $2}'); do
|
for device in $(bluetoothctl devices Connected | awk '{print $2}'); do
|
||||||
devices+=("$device")
|
devices+=("$device")
|
||||||
done
|
done
|
||||||
systemctl --user restart wireplumber pipewire pipewire-pulse bluetooth
|
systemctl --user restart wireplumber pipewire pipewire-pulse bluetooth
|
||||||
bluetoothctl power off
|
bluetoothctl power off
|
||||||
bluetoothctl power on
|
bluetoothctl power on
|
||||||
for device in ${devices[*]}; do
|
for device in ${devices[*]}; do
|
||||||
# because bluetooth is the worst thing ever created and defaults to handset mode, devices will need to reconnect
|
# 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"
|
echo "INFO: disconnecting and reconnecting to $device"
|
||||||
bluetoothctl disconnect "$device"
|
bluetoothctl disconnect "$device"
|
||||||
bluetoothctl connect "$device"
|
bluetoothctl connect "$device"
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
unfuck_screenlock() {
|
unfuck_screenlock() {
|
||||||
hyprctl --instance 0 'keyword misc:allow_session_lock_restore 1'
|
hyprctl --instance 0 'keyword misc:allow_session_lock_restore 1'
|
||||||
hyprctl --instance 0 'dispatch exec hyprlock'
|
hyprctl --instance 0 'dispatch exec hyprlock'
|
||||||
}
|
}
|
||||||
|
|
||||||
case $1 in
|
case $1 in
|
||||||
"")
|
"")
|
||||||
echo "what is fucked?"
|
echo "what is fucked?"
|
||||||
;;
|
;;
|
||||||
-h | --help | help)
|
-h | --help | help)
|
||||||
usage
|
usage
|
||||||
;;
|
;;
|
||||||
everything)
|
everything)
|
||||||
unfuck_screenlock
|
unfuck_screenlock
|
||||||
unfuck_bar
|
unfuck_bar
|
||||||
unfuck_spotify
|
unfuck_spotify
|
||||||
unfuck_wallpaper
|
unfuck_wallpaper
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
eval "unfuck_$1"
|
eval "unfuck_$1"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@
|
||||||
"button-text": " Clear all "
|
"button-text": " Clear all "
|
||||||
},
|
},
|
||||||
"dnd": {
|
"dnd": {
|
||||||
"text": " Do Not Disturb"
|
"text": " Do not disturb"
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -51,7 +51,7 @@
|
||||||
* {
|
* {
|
||||||
all: unset;
|
all: unset;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
font-family: "Ubuntu Nerd Font";
|
font-family: "GohuFont 14 Nerd Font Mono";
|
||||||
transition: 200ms;
|
transition: 200ms;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,346 +22,347 @@
|
||||||
home.file = {
|
home.file = {
|
||||||
"/home/${username}/.config/waybar/config" = {
|
"/home/${username}/.config/waybar/config" = {
|
||||||
text = ''
|
text = ''
|
||||||
[{
|
[{
|
||||||
"layer": "top",
|
"layer": "top",
|
||||||
"position": "top",
|
"position": "top",
|
||||||
|
|
||||||
"modules-left": [
|
"modules-left": [
|
||||||
"privacy",
|
"privacy",
|
||||||
"network",
|
"network",
|
||||||
"custom/vpn",
|
"custom/vpn",
|
||||||
"custom/devices",
|
"custom/devices",
|
||||||
"custom/spotify",
|
"custom/spotify",
|
||||||
"tray",
|
"tray",
|
||||||
],
|
],
|
||||||
|
|
||||||
"modules-center": [
|
"modules-center": [
|
||||||
"hyprland/workspaces",
|
"hyprland/workspaces",
|
||||||
],
|
],
|
||||||
|
|
||||||
"modules-right": [
|
"modules-right": [
|
||||||
"custom/yubikey#icon",
|
"custom/yubikey#icon",
|
||||||
"custom/yubikey#data",
|
"custom/yubikey#data",
|
||||||
"group/hardware",
|
"group/hardware",
|
||||||
"group/resources",
|
"group/resources",
|
||||||
"bluetooth",
|
"bluetooth",
|
||||||
// "wireplumber",
|
// "wireplumber",
|
||||||
"group/audio",
|
"group/audio",
|
||||||
"group/battery",
|
"group/battery",
|
||||||
"group/clock"
|
"group/clock"
|
||||||
],
|
],
|
||||||
|
|
||||||
"hyprland/window": {
|
"hyprland/window": {
|
||||||
"format": "{}",
|
"format": "{}",
|
||||||
"rewrite": {
|
"rewrite": {
|
||||||
"(.*) - zsh": "> [$1]"
|
"(.*) - zsh": "> [$1]"
|
||||||
},
|
},
|
||||||
"separate-outputs": true
|
"separate-outputs": true
|
||||||
},
|
},
|
||||||
|
|
||||||
"sway/workspaces": {
|
"sway/workspaces": {
|
||||||
"all-outputs": true,
|
"all-outputs": true,
|
||||||
"disable-scroll": true,
|
"disable-scroll": true,
|
||||||
"format": "{name}"
|
"format": "{name}"
|
||||||
},
|
},
|
||||||
|
|
||||||
"hyprland/workspaces": {
|
"hyprland/workspaces": {
|
||||||
"all-outputs": true,
|
"all-outputs": true,
|
||||||
"disable-scroll": true,
|
"disable-scroll": true,
|
||||||
"format": "{name}"
|
"format": "{name}"
|
||||||
},
|
},
|
||||||
|
|
||||||
// "group/network": {
|
// "group/network": {
|
||||||
// "orientation": "horizontal",
|
// "orientation": "horizontal",
|
||||||
// "modules": [
|
// "modules": [
|
||||||
// "network",
|
// "network",
|
||||||
// "custom/vpn",
|
// "custom/vpn",
|
||||||
// ],
|
// ],
|
||||||
// "drawer": {
|
// "drawer": {
|
||||||
// "transition-left-to-right": true,
|
// "transition-left-to-right": true,
|
||||||
// "transition-duration": 500
|
// "transition-duration": 500
|
||||||
// }
|
// }
|
||||||
// },
|
// },
|
||||||
|
|
||||||
"network": {
|
"network": {
|
||||||
"format": " {ifname}",
|
"format": " {ifname}",
|
||||||
"format-wifi": " {ipaddr}/{cidr} <span color='#aaaaaa'>{signalStrength}%</span>",
|
"format-wifi": " {ipaddr}/{cidr} <span color='#aaaaaa'>{signalStrength}%</span>",
|
||||||
"format-ethernet": " {ipaddr}/{cidr}",
|
"format-ethernet": " {ipaddr}/{cidr}",
|
||||||
"format-disconnected": "",
|
"format-disconnected": "",
|
||||||
"tooltip-format": "{ifname} via {gwaddr}",
|
"tooltip-format": "{ifname} via {gwaddr}",
|
||||||
"tooltip-format-wifi": "{essid} ({signalStrength}%)",
|
"tooltip-format-wifi": "{essid} ({signalStrength}%)",
|
||||||
"tooltip-format-ethernet": "{ifname}",
|
"tooltip-format-ethernet": "{ifname}",
|
||||||
"tooltip-format-disconnected": "Disconnected"
|
"tooltip-format-disconnected": "Disconnected"
|
||||||
},
|
},
|
||||||
|
|
||||||
"custom/vpn": {
|
"custom/vpn": {
|
||||||
"format": "{icon}",
|
"format": "{icon}",
|
||||||
"tooltip-format": "{text}",
|
"tooltip-format": "{text}",
|
||||||
"format-icons": [ "","" ],
|
"format-icons": [ "","" ],
|
||||||
"return-type": "json",
|
"return-type": "json",
|
||||||
"exec": "~/.local/bin/waybar-vpn",
|
"exec": "~/.local/bin/waybar-vpn",
|
||||||
"interval": 30
|
"interval": 30
|
||||||
},
|
},
|
||||||
|
|
||||||
"custom/spotify": {
|
"custom/spotify": {
|
||||||
"interval": 5,
|
"interval": 5,
|
||||||
"return-type": "json",
|
"return-type": "json",
|
||||||
"exec": "~/.local/bin/waybar-music",
|
"exec": "~/.local/bin/waybar-music",
|
||||||
"on-click": "playerctl play-pause",
|
"on-click": "playerctl play-pause",
|
||||||
"escape": true
|
"escape": true
|
||||||
},
|
},
|
||||||
|
|
||||||
"custom/devices": {
|
"custom/devices": {
|
||||||
"interval": 60,
|
"interval": 60,
|
||||||
// "return-type": "json",
|
"font-size": 14,
|
||||||
"exec": "~/.local/bin/waybar-devices",
|
// "return-type": "json",
|
||||||
},
|
"exec": "~/.local/bin/waybar-devices",
|
||||||
|
},
|
||||||
|
|
||||||
"privacy": {
|
"privacy": {
|
||||||
"icon-spacing": 8,
|
"icon-spacing": 8,
|
||||||
"icon-size": 14,
|
"icon-size": 14,
|
||||||
"transition-duration": 250,
|
"transition-duration": 250,
|
||||||
"modules": [
|
"modules": [
|
||||||
{
|
{
|
||||||
"type": "screenshare",
|
"type": "screenshare",
|
||||||
"tooltip": true,
|
"tooltip": true,
|
||||||
"tooltip-icon-size": 24
|
"tooltip-icon-size": 24
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "audio-out",
|
"type": "audio-out",
|
||||||
"tooltip": true,
|
"tooltip": true,
|
||||||
"tooltip-icon-size": 24
|
"tooltip-icon-size": 24
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "audio-in",
|
"type": "audio-in",
|
||||||
"tooltip": true,
|
"tooltip": true,
|
||||||
"tooltip-icon-size": 24
|
"tooltip-icon-size": 24
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
||||||
"tray": {
|
"tray": {
|
||||||
"icon-size": 12,
|
"icon-size": 12,
|
||||||
"spacing": 0
|
"spacing": 0
|
||||||
},
|
},
|
||||||
|
|
||||||
"sway/mode": {
|
"sway/mode": {
|
||||||
"format": " {}",
|
"format": " {}",
|
||||||
"tooltip": false
|
"tooltip": false
|
||||||
},
|
},
|
||||||
|
|
||||||
"custom/yubikey#icon": {
|
"custom/yubikey#icon": {
|
||||||
"exec": "~/.local/bin/waybar-yubikey 0",
|
"exec": "~/.local/bin/waybar-yubikey 0",
|
||||||
"return-type": "json"
|
"return-type": "json"
|
||||||
},
|
},
|
||||||
|
|
||||||
"custom/yubikey#data": {
|
"custom/yubikey#data": {
|
||||||
"exec": "~/.local/bin/waybar-yubikey 1",
|
"exec": "~/.local/bin/waybar-yubikey 1",
|
||||||
"return-type": "json"
|
"return-type": "json"
|
||||||
},
|
},
|
||||||
|
|
||||||
"group/hardware": {
|
"group/hardware": {
|
||||||
"orientation": "horizontal",
|
"orientation": "horizontal",
|
||||||
"modules": [
|
"modules": [
|
||||||
"cpu",
|
"cpu",
|
||||||
"temperature#cpu",
|
"temperature#cpu",
|
||||||
"temperature#gpu",
|
"temperature#gpu",
|
||||||
"temperature#nvme",
|
"temperature#nvme",
|
||||||
"temperature#wifi"
|
"temperature#wifi"
|
||||||
],
|
],
|
||||||
"drawer": {
|
"drawer": {
|
||||||
"transition-left-to-right": false,
|
"transition-left-to-right": false,
|
||||||
"transition-duration": 500
|
"transition-duration": 500
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
"cpu": {
|
"cpu": {
|
||||||
"interval": 30,
|
"interval": 30,
|
||||||
"format": " {avg_frequency:3.2f}GHz <span color='#aaaaaa'>{usage}%</span>",
|
"format": " {avg_frequency:3.2f}GHz <span color='#aaaaaa'>{usage}%</span>",
|
||||||
"states": {
|
"states": {
|
||||||
"warning": 70,
|
"warning": 70,
|
||||||
"critical": 90
|
"critical": 90
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
"temperature#cpu": {
|
"temperature#cpu": {
|
||||||
"hwmon-path": "/sys/class/hwmon/hwmon5/temp1_input",
|
"hwmon-path": "/sys/class/hwmon/hwmon5/temp1_input",
|
||||||
"critical-threshold": 80,
|
"critical-threshold": 80,
|
||||||
"format": " CPU <span color='#aaaaaa'>{temperatureC}°C</span>"
|
"format": " CPU <span color='#aaaaaa'>{temperatureC}°C</span>"
|
||||||
},
|
},
|
||||||
|
|
||||||
"temperature#gpu": {
|
"temperature#gpu": {
|
||||||
"hwmon-path": "/sys/class/hwmon/hwmon0/temp1_input",
|
"hwmon-path": "/sys/class/hwmon/hwmon0/temp1_input",
|
||||||
"critical-threshold": 80,
|
"critical-threshold": 80,
|
||||||
"format": "· GPU <span color='#aaaaaa'>{temperatureC}°C</span>"
|
"format": "· GPU <span color='#aaaaaa'>{temperatureC}°C</span>"
|
||||||
},
|
},
|
||||||
|
|
||||||
"temperature#nvme": {
|
"temperature#nvme": {
|
||||||
"hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
|
"hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
|
||||||
"critical-threshold": 80,
|
"critical-threshold": 80,
|
||||||
"format": "· NVMe <span color='#aaaaaa'>{temperatureC}°C</span>"
|
"format": "· NVMe <span color='#aaaaaa'>{temperatureC}°C</span>"
|
||||||
},
|
},
|
||||||
|
|
||||||
"temperature#wifi": {
|
"temperature#wifi": {
|
||||||
"hwmon-path": "/sys/class/hwmon/hwmon11/temp1_input",
|
"hwmon-path": "/sys/class/hwmon/hwmon11/temp1_input",
|
||||||
"critical-threshold": 80,
|
"critical-threshold": 80,
|
||||||
"format": "· WiFi <span color='#aaaaaa'>{temperatureC}°C</span>"
|
"format": "· WiFi <span color='#aaaaaa'>{temperatureC}°C</span>"
|
||||||
},
|
},
|
||||||
|
|
||||||
"group/resources": {
|
"group/resources": {
|
||||||
"orientation": "horizontal",
|
"orientation": "horizontal",
|
||||||
"modules": [ "memory", "disk#root" ],
|
"modules": [ "memory", "disk#root" ],
|
||||||
"drawer": {
|
"drawer": {
|
||||||
"transition-left-to-right": false,
|
"transition-left-to-right": false,
|
||||||
"transition-duration": 500
|
"transition-duration": 500
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
"memory": {
|
"memory": {
|
||||||
"interval": 60,
|
"interval": 60,
|
||||||
"format": " {used:3.1f}GiB/<span color='#aaaaaa'>{total:3.1f}GiB</span>"
|
"format": " {used:3.1f}GiB/<span color='#aaaaaa'>{total:3.1f}GiB</span>"
|
||||||
},
|
},
|
||||||
|
|
||||||
"disk#root": {
|
"disk#root": {
|
||||||
"interval": 360,
|
"interval": 360,
|
||||||
"format": " {used}/<span color='#aaaaaa'>{total}</span>",
|
"format": " {used}/<span color='#aaaaaa'>{total}</span>",
|
||||||
"path": "/"
|
"path": "/"
|
||||||
},
|
},
|
||||||
|
|
||||||
"bluetooth": {
|
"bluetooth": {
|
||||||
// "controller": "controller1",
|
// "controller": "controller1",
|
||||||
"on-click": "~/.local/bin/waybar-bluetooth toggle",
|
"on-click": "~/.local/bin/waybar-bluetooth toggle",
|
||||||
"format": "<span color='#aaaaaa'></span>",
|
"format": "<span color='#aaaaaa'></span>",
|
||||||
"format-disabled": "<span color='#333333'></span>",
|
"format-disabled": "<span color='#333333'></span>",
|
||||||
"format-connected": "",
|
"format-connected": "",
|
||||||
"format-connected-battery": " {device_battery_percentage}%",
|
"format-connected-battery": " {device_battery_percentage}%",
|
||||||
"tooltip-format": "{controller_alias}\t\t[{controller_address}]",
|
"tooltip-format": "{controller_alias}\t\t[{controller_address}]",
|
||||||
"tooltip-format-connected": "{controller_alias}\t\t[{controller_address}]\n\n{device_enumerate}",
|
"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-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": "{device_alias}\t\t[{device_address}]",
|
||||||
"tooltip-format-enumerate-connected-battery": "{device_alias} ({device_battery_percentage})\t\t[{device_address}]"
|
"tooltip-format-enumerate-connected-battery": "{device_alias} ({device_battery_percentage})\t\t[{device_address}]"
|
||||||
},
|
},
|
||||||
|
|
||||||
"group/audio": {
|
"group/audio": {
|
||||||
"orientation": "horizontal",
|
"orientation": "horizontal",
|
||||||
"modules": [
|
"modules": [
|
||||||
"wireplumber",
|
"wireplumber",
|
||||||
"custom/audio-internal",
|
"custom/audio-internal",
|
||||||
"custom/audio-headphones",
|
"custom/audio-headphones",
|
||||||
"custom/audio-hdmi"
|
"custom/audio-hdmi"
|
||||||
],
|
],
|
||||||
"drawer": {
|
"drawer": {
|
||||||
"transition-left-to-right": false,
|
"transition-left-to-right": false,
|
||||||
"transition-duration": 500
|
"transition-duration": 500
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
"wireplumber": {
|
"wireplumber": {
|
||||||
"format": "{icon} {node_name}/<span color='#aaaaaa'>{volume}</span>",
|
"format": "{icon} {node_name}/<span color='#aaaaaa'>{volume}</span>",
|
||||||
"format-muted": "",
|
"format-muted": "",
|
||||||
"on-click": "pavucontrol-qt",
|
"on-click": "pavucontrol-qt",
|
||||||
"on-click-right": "helvum",
|
"on-click-right": "helvum",
|
||||||
"format-icons": ["", "", ""]
|
"format-icons": ["", "", ""]
|
||||||
},
|
},
|
||||||
|
|
||||||
"custom/audio-internal": {
|
"custom/audio-internal": {
|
||||||
"format": " ",
|
"format": " ",
|
||||||
"tooltip-format": "Internal",
|
"tooltip-format": "Internal",
|
||||||
"on-click": "audio-router analog",
|
"on-click": "audio-router analog",
|
||||||
"interval": "once"
|
"interval": "once"
|
||||||
},
|
},
|
||||||
|
|
||||||
"custom/audio-hdmi": {
|
"custom/audio-hdmi": {
|
||||||
"format": " ",
|
"format": " ",
|
||||||
"tooltip-format": "HDMI",
|
"tooltip-format": "HDMI",
|
||||||
"on-click": "audio-router hdmi",
|
"on-click": "audio-router hdmi",
|
||||||
"interval": "once"
|
"interval": "once"
|
||||||
},
|
},
|
||||||
|
|
||||||
"group/battery": {
|
"group/battery": {
|
||||||
"orientation": "horizontal",
|
"orientation": "horizontal",
|
||||||
"modules": [
|
"modules": [
|
||||||
"battery",
|
"battery",
|
||||||
"custom/powerdraw"
|
"custom/powerdraw"
|
||||||
],
|
],
|
||||||
"drawer": {
|
"drawer": {
|
||||||
"transition-left-to-right": false,
|
"transition-left-to-right": false,
|
||||||
"transition-duration": 500
|
"transition-duration": 500
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
"battery": {
|
"battery": {
|
||||||
"bat": "BAT1",
|
"bat": "BAT1",
|
||||||
"interval": 30,
|
"interval": 30,
|
||||||
"states": {
|
"states": {
|
||||||
"warning": 20,
|
"warning": 20,
|
||||||
"critical": 10
|
"critical": 10
|
||||||
},
|
},
|
||||||
"format-time": "{H}:{m}",
|
"format-time": "{H}:{m}",
|
||||||
"format": "{icon} {time} <span color='#aaaaaa'>{capacity}%</span>",
|
"format": "{icon} {time} <span color='#aaaaaa'>{capacity}%</span>",
|
||||||
"format-discharging": "{icon} <span color='#aaaaaa'>{capacity}%</span>",
|
"format-discharging": "{icon} <span color='#aaaaaa'>{capacity}%</span>",
|
||||||
"format-discharging-warning": "{icon} <span color='#FF5F1F'>{capacity}%</span>",
|
"format-discharging-warning": "{icon} <span color='#FF5F1F'>{capacity}%</span>",
|
||||||
"format-discharging-critical": "{icon} <span color='#FF3131'>{capacity}%</span>",
|
"format-discharging-critical": "{icon} <span color='#FF3131'>{capacity}%</span>",
|
||||||
"format-charging": "{icon} <span color='#DAF7A6'>{capacity}%</span><span color='#aaaaaa'> @ {power:2.0f}W</span>",
|
"format-charging": "{icon} <span color='#DAF7A6'>{capacity}%</span><span color='#aaaaaa'> @ {power:2.0f}W</span>",
|
||||||
"format-full": " <span color='#aaaaaa'>{capacity}%</span>",
|
"format-full": " <span color='#aaaaaa'>{capacity}%</span>",
|
||||||
"format-not-charging": " <span color='#aaaaaa'>{capacity}%</span>",
|
"format-not-charging": " <span color='#aaaaaa'>{capacity}%</span>",
|
||||||
"format-icons": [" ", " ", " ", " ", " "],
|
"format-icons": [" ", " ", " ", " ", " "],
|
||||||
},
|
},
|
||||||
|
|
||||||
"custom/powerdraw": {
|
"custom/powerdraw": {
|
||||||
"interval": 60,
|
"interval": 60,
|
||||||
"exec": "~/.local/bin/waybar-powerdraw",
|
"exec": "~/.local/bin/waybar-powerdraw",
|
||||||
},
|
},
|
||||||
|
|
||||||
"group/clock": {
|
"group/clock": {
|
||||||
"orientation": "horizontal",
|
"orientation": "horizontal",
|
||||||
"modules": [ "custom/clock#minutes", "clock#time", "clock#date" ],
|
"modules": [ "custom/clock#minutes", "clock#time", "clock#date" ],
|
||||||
"drawer": {
|
"drawer": {
|
||||||
"transition-left-to-right": false,
|
"transition-left-to-right": false,
|
||||||
"transition-duration": 500
|
"transition-duration": 500
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
"clock#date": {
|
"clock#date": {
|
||||||
"interval": 60,
|
"interval": 60,
|
||||||
"format": " <span color='#ffffff'> {:%a %e %b %Y}</span>",
|
"format": " <span color='#ffffff'> {:%a %e %b %Y}</span>",
|
||||||
"tooltip-format": "<big>{:%B %Y}</big>\n<tt>{calendar}</tt>",
|
"tooltip-format": "<big>{:%B %Y}</big>\n<tt>{calendar}</tt>",
|
||||||
"calendar": {
|
"calendar": {
|
||||||
"mode" : "year",
|
"mode" : "year",
|
||||||
"mode-mon-col" : 2,
|
"mode-mon-col" : 2,
|
||||||
"weeks-pos" : "right",
|
"weeks-pos" : "right",
|
||||||
"on-scroll" : 1,
|
"on-scroll" : 1,
|
||||||
"format": {
|
"format": {
|
||||||
"months": "<span color='#ffead3'><b>{}</b></span>",
|
"months": "<span color='#ffead3'><b>{}</b></span>",
|
||||||
"days": "<span color='#ecc6d9'><b>{}</b></span>",
|
"days": "<span color='#ecc6d9'><b>{}</b></span>",
|
||||||
"weeks": "<span color='#99ffdd'><b>W{}</b></span>",
|
"weeks": "<span color='#99ffdd'><b>W{}</b></span>",
|
||||||
"weekdays": "<span color='#ffcc66'><b>{}</b></span>",
|
"weekdays": "<span color='#ffcc66'><b>{}</b></span>",
|
||||||
"today": "<span color='#ff6699'><b><u>{}</u></b></span>"
|
"today": "<span color='#ff6699'><b><u>{}</u></b></span>"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"actions": {
|
"actions": {
|
||||||
"on-click-right": "mode",
|
"on-click-right": "mode",
|
||||||
"on-scroll-up": "shift_up",
|
"on-scroll-up": "shift_up",
|
||||||
"on-scroll-down": "shift_down"
|
"on-scroll-down": "shift_down"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
"clock#time": {
|
"clock#time": {
|
||||||
"interval": 60,
|
"interval": 60,
|
||||||
"format": " {:%I:%M %p}",
|
"format": " {:%I:%M %p}",
|
||||||
"actions": {
|
"actions": {
|
||||||
"on-scroll-up": "tz_up",
|
"on-scroll-up": "tz_up",
|
||||||
"on-scroll-down": "tz_down"
|
"on-scroll-down": "tz_down"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
"custom/clock#minutes": {
|
"custom/clock#minutes": {
|
||||||
"interval": 60,
|
"interval": 60,
|
||||||
"format": " <span color='#aaaaaa'>{}</span> ",
|
"format": " <span color='#aaaaaa'>{}</span> ",
|
||||||
"exec": "~/.local/bin/waybar-minutes"
|
"exec": "~/.local/bin/waybar-minutes"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
"/home/${username}/.config/waybar/style.css" = {
|
"/home/${username}/.config/waybar/style.css" = {
|
||||||
|
|
@ -369,7 +370,7 @@
|
||||||
* {
|
* {
|
||||||
border: none;
|
border: none;
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
font-family: 'CommitMono Nerd Font';
|
font-family: 'GohuFont 11 Nerd Font Mono';
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 11px;
|
font-size: 11px;
|
||||||
min-height: 26px;
|
min-height: 26px;
|
||||||
|
|
|
||||||
|
|
@ -174,6 +174,8 @@
|
||||||
vim = "nvim";
|
vim = "nvim";
|
||||||
doas = "sudo";
|
doas = "sudo";
|
||||||
sxiv = "nsxiv";
|
sxiv = "nsxiv";
|
||||||
|
enby = "man";
|
||||||
|
woman = "man";
|
||||||
|
|
||||||
# NixOS
|
# NixOS
|
||||||
ns = "nix-shell --run zsh";
|
ns = "nix-shell --run zsh";
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue