peter/.dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drastic rework of my environment, and include some new tools

Browse source
This commit is contained in:
Simon Belmont 2025-05-08 20:38:29 -04:00
parent 9dcf22ecd8
commit 3d8e8e1534
4 changed files with 100 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.config/hypr/hyprland.conf
View file

@ -68,7 +68,7 @@ exec-once = [workspace 2 silent] kitty --session ~/.config/kitty/session --liste
exec-once = [workspace 2 silent] sleep 1; kitty newsboat exec-once = [workspace 2 silent] sleep 1; kitty newsboat
exec-once = [workspace 6 silent] kitty btop exec-once = [workspace 6 silent] kitty btop
exec-once = [workspace 6 silent] sleep 1; kitty exec-once = [workspace 6 silent] sleep 1; kitty
exec-once = [workspace 6 silent] sleep 2;kitty zsh -c "source ~/.zshrc;nnn -deUxH" exec-once = [workspace 6 silent] sleep 2;kitty yazi
exec-once = steam -silent exec-once = steam -silent
exec-once = sleep 1; heroic --ozone-platform=wayland exec-once = sleep 1; heroic --ozone-platform=wayland
exec-once = [workspace special:password silent] keepassxc exec-once = [workspace special:password silent] keepassxc
@ -78,7 +78,7 @@ exec-once = killall nextcloud
exec-once = gammastep -m wayland -O 6500K -g 1.1.0 exec-once = gammastep -m wayland -O 6500K -g 1.1.0
exec-once = [workspace special:email silent] sleep 1; tutanota-desktop --ozone-platform-hint=auto exec-once = [workspace special:email silent] sleep 1; tutanota-desktop --ozone-platform-hint=auto
exec-once = discord --enable-features=UseOzonePlatform --ozone-platform=wayland --start-minimized exec-once = discord --enable-features=UseOzonePlatform --ozone-platform=wayland --start-minimized
exec-once = jellyfin-mpv-shim exec = jellyfin-mpv-shim
# Variables # Variables

91
.config/waybar/config
View file

@ -14,7 +14,7 @@
"output": "DP-2", "output": "DP-2",
"layer": "top", "layer": "top",
"modules-left": ["hyprland/workspaces", "hyprland/mode"], "modules-left": ["hyprland/workspaces", "hyprland/mode"],
"modules-center": ["custom/gpu-usage", "cpu", "memory", "group/disks", "temperature", "clock", "custom/weather", "idle_inhibitor", "custom/pacman", "group/networks", "bluetooth", "group/audio-player"], "modules-center": ["group/statistics", "group/status", "group/networks", "group/audio-player"],
/* "modules-right": ["tray", "custom/scratchpad-indicator", "pulseaudio",], */ /* "modules-right": ["tray", "custom/scratchpad-indicator", "pulseaudio",], */
"modules-right": ["group/taskbar", "group/group-power"], "modules-right": ["group/taskbar", "group/group-power"],
@ -44,13 +44,25 @@
"group/audio-player": { "group/audio-player": {
"orientation": "inherit", "orientation": "inherit",
"modules": [ "modules": [
"mpris", "group/playing",
"cava" "cava"
] ]
}, },
"group/playing": {
"orientation": "inherit",
"drawer": {
"transition-duration": 500,
"children-class": "not-power",
"transition-left-to-right": true,
},
"modules": [
"mpris",
"mpris#2"
]
},
"mpris": { "mpris": {
"format": "<span color=\"#bd93f9\">{player_icon}</span> <span color=\"#f8f8f2\">Playing </span>", "format": "<span color=\"#bd93f9\">{player_icon}</span> <span color=\"#f8f8f2\">Playing </span>",
"format-paused": "<span color=\"#bd93f9\">{status_icon}</span> <span color=\"#f8f8f2\">Paused </span>", "format-paused": "<span color=\"#bd93f9\">{status_icon}</span> <span color=\"#f8f8f2\">Paused </span>",
"tooltip-format": "󰠃 {artist}:  {title} (󰀥 {album})", "tooltip-format": "󰠃 {artist}:  {title} (󰀥 {album})",
"interval": 1, "interval": 1,
"album-len": 0, "album-len": 0,
@ -66,7 +78,16 @@
}, },
// "ignored-players": ["firefox"] // "ignored-players": ["firefox"]
}, },
"mpris#2": {
"format": "<span color=\"#8be9fd\"> </span><span color=\"#f8f8f2\">{title} </span><span color=\"#ff79c6\">󰠃 </span><span color=\"#f8f8f2\">{artist} <small>({position}/{length}) </small></span>",
"format-paused": "<span color=\"#8be9fd\"> </span><span color=\"#f8f8f2\">{title} </span><span color=\"#ff79c6\">󰠃 </span><span color=\"#f8f8f2\">{artist} <small>({position}/{length}) </small></span>",
"tooltip-format": "󰠃 {artist}:  {title} (󰀥 {album})",
"interval": 1,
"album-len": 0,
"on-click": "exec ~/.bin/sh/dunstaudio.sh play_pause",
"on-click-right": "exec ~/.bin/sh/dunstaudio.sh next_track",
"on-click-middle": "exec ~/.bin/sh/dunstaudio.sh prev_track",
},
"cava": { "cava": {
"cava_config": "/home/peter/.config/cava/config", "cava_config": "/home/peter/.config/cava/config",
"framerate": 240, "framerate": 240,
@ -88,8 +109,18 @@
"on-click-right": "mode" "on-click-right": "mode"
} }
}, },
"group/statistics": {
"orientation": "inherit",
"modules": [
"custom/gpu-usage",
"cpu",
"memory",
"group/disks",
"temperature"
]
},
"custom/pacman": { "custom/pacman": {
"format": "<span color=\"#8BE9FD\"> </span>{}", "format": "<span color=\"#8BE9FD\"> </span>{} ",
"tooltip": true, "tooltip": true,
"tooltip-format": "Available updates", "tooltip-format": "Available updates",
"interval": 60, "interval": 60,
@ -128,8 +159,10 @@
"group/networks": { "group/networks": {
"orientation": "inherit", "orientation": "inherit",
"modules": [ "modules": [
"custom/pacman",
"network", "network",
"custom/vpn", "custom/vpn",
"bluetooth"
] ]
}, },
"network": { "network": {
@ -137,8 +170,8 @@
"format": "{ifname}", "format": "{ifname}",
"interval": 1, "interval": 1,
"format-wifi": "{essid} ({signalStrength}%) ", "format-wifi": "{essid} ({signalStrength}%) ",
"format-ethernet": "<span color=\"#50fa7b\"> </span>{ifname}", "format-ethernet": "<span color=\"#50fa7b\"> </span>{ifname}",
"format-disconnected": "<span color=\"#FF5555\"> </span>{ifname}", "format-disconnected": "<span color=\"#FF5555\">󱄁 </span>{ifname}",
"max-length": 50, "max-length": 50,
"tooltip-format": "speed:  {bandwidthDownBytes} /  {bandwidthUpBytes}", "tooltip-format": "speed:  {bandwidthDownBytes} /  {bandwidthUpBytes}",
"on-click": "kitty --class nmnet --single-instance -e nmtui", "on-click": "kitty --class nmnet --single-instance -e nmtui",
@ -164,8 +197,16 @@
"icon-size": 20, "icon-size": 20,
"spacing": 6 "spacing": 6
}, },
"group/status": {
"orientation": "inherit",
"modules": [
"clock",
"custom/weather",
"idle_inhibitor"
]
},
"clock": { "clock": {
"format": "<span color=\"#FF92DF\">󱑏</span> {:%I:%M:%OS}", "format": "<span color=\"#FF92DF\">󱑏</span> {:%I:%M:%OS} ",
"interval": 1, "interval": 1,
"tooltip-format": "<big> {:%d/%m/%y}</big>", "tooltip-format": "<big> {:%d/%m/%y}</big>",
// "format-alt": "{:%Y-%m-%d}" // "format-alt": "{:%Y-%m-%d}"
@ -173,19 +214,19 @@
}, },
"cpu": { "cpu": {
"interval": 10, "interval": 10,
"format": "<span color=\"#cf7cac\">{icon}</span> {usage}%", "format": "<span color=\"#cf7cac\">{icon}</span> {usage}% ",
"format-icons": [""] "format-icons": [""]
}, },
"memory": { "memory": {
"format": "<span color=\"#8BE9FD\">{icon}</span> {percentage}%", "format": "<span color=\"#8BE9FD\">{icon}</span> {percentage}% ",
"format-icons": [""] "format-icons": [""]
}, },
"temperature": { "temperature": {
// "thermal-zone": 2, // "thermal-zone": 2,
"hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
"critical-threshold": 80, "critical-threshold": 80,
"format-critical": "<span color=\"#ff5555\"></span> {temperatureC}°C", "format-critical": " <span color=\"#ff5555\"></span> {temperatureC}°C",
"format": "<span color=\"#f1fa8c\"></span> {temperatureC}°C", "format": " <span color=\"#f1fa8c\"></span> {temperatureC}°C",
"tooltip": false, "tooltip": false,
}, },
"group/disks": { "group/disks": {
@ -205,27 +246,27 @@
}, },
"disk": { "disk": {
"interval": 30, "interval": 30,
"format": "<span color=\"#8694c0\"></span><span color=\"#50FA7B\">󰋊 </span>/: {percentage_used}%", "format": " <span color=\"#8694c0\"></span><span color=\"#50FA7B\">󰋊 </span>/: {percentage_used}% ",
"path": "/" "path": "/"
}, },
"disk#disk2": { "disk#disk2": {
"interval": 30, "interval": 30,
"format": "<span color=\"#ba89ff\">󰋊 </span>M2: {percentage_used}%", "format": " <span color=\"#ba89ff\">󰋊 </span>M2: {percentage_used}% ",
"path": "/mnt/M2" "path": "/mnt/M2"
}, },
"disk#disk3": { "disk#disk3": {
"interval": 30, "interval": 30,
"format": "<span color=\"#ff79c6\">󰋊 </span>SSD: {percentage_used}%", "format": " <span color=\"#ff79c6\">󰋊 </span>SSD: {percentage_used}% ",
"path": "/mnt/SSD" "path": "/mnt/SSD"
}, },
"disk#disk4": { "disk#disk4": {
"interval": 30, "interval": 30,
"format": "<span color=\"#8BE9FD\">󰋊 </span>Games: {percentage_used}%", "format": " <span color=\"#8BE9FD\">󰋊 </span>Games: {percentage_used}% ",
"path": "/media/Games" "path": "/media/Games"
}, },
"disk#disk5": { "disk#disk5": {
"interval": 30, "interval": 30,
"format": "<span color=\"#ffb86c\">󰋊 </span>Backups: {percentage_used}%", "format": " <span color=\"#ffb86c\">󰋊 </span>Backups: {percentage_used}% ",
"path": "/mnt/Backups" "path": "/mnt/Backups"
},"pulseaudio": { },"pulseaudio": {
"format": "{volume}% {icon}", "format": "{volume}% {icon}",
@ -250,9 +291,9 @@
"on-scroll-down": "exec ~/.bin/sh/dunstaudio.sh volume_down" "on-scroll-down": "exec ~/.bin/sh/dunstaudio.sh volume_down"
}, },
"bluetooth": { "bluetooth": {
"format": "<span color=\"#6272a4\"></span> {status}", "format": " <span color=\"#6272a4\"></span> {status}",
"format-connected": "<span color=\"#6272a4\"></span> on", "format-connected": " <span color=\"#6272a4\"></span> on",
"format-connected-battery": "<span color=\"#6272a4\"></span> on", "format-connected-battery": " <span color=\"#6272a4\"></span> on",
"on-click": "blueman-manager", "on-click": "blueman-manager",
// "format-device-preference": [ "device1", "device2" ], // preference list deciding the displayed device // "format-device-preference": [ "device1", "device2" ], // preference list deciding the displayed device
"tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected", "tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected",
@ -261,9 +302,9 @@
"tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%" "tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%"
}, },
"custom/vpn": { "custom/vpn": {
"format": "<span color=\"#ff5555\"> </span>", "format": "<span color=\"#ff5555\">  </span>",
"tooltip": true, "tooltip": true,
"tooltip-format": "Connected", "tooltip-format": "Connected to VPN",
"exec": "echo '{\"class\": \"connected\"}'", "exec": "echo '{\"class\": \"connected\"}'",
"exec-if": "test -d /proc/sys/net/ipv4/conf/tun0", "exec-if": "test -d /proc/sys/net/ipv4/conf/tun0",
"return-type": "json", "return-type": "json",
@ -273,14 +314,14 @@
"custom/weather": { "custom/weather": {
"exec": "python ~/.config/waybar/scripts/weather.py", "exec": "python ~/.config/waybar/scripts/weather.py",
"restart-interval": 300, "restart-interval": 300,
"format": "{}", "format": "{} ",
"return-type": "json", "return-type": "json",
"on-click": "xdg-open https://weather.com/en-IN/weather/today/l/e42bb25a58c2e689ec85e632d82e69d7e46c82defb9ad7a5551b6c3a70fbc282" "on-click": "xdg-open https://weather.com/en-IN/weather/today/l/e42bb25a58c2e689ec85e632d82e69d7e46c82defb9ad7a5551b6c3a70fbc282"
// "format-alt": "{alt}", // "format-alt": "{alt}",
}, },
"custom/gpu-usage": { "custom/gpu-usage": {
"exec": "cat /sys/class/hwmon/hwmon1/device/gpu_busy_percent", "exec": "cat /sys/class/hwmon/hwmon1/device/gpu_busy_percent",
"format": "<span color=\"#8694c0\"></span><span color=\"#bd93f9\">󰍹 </span>{}%", "format": "<span color=\"#8694c0\"></span><span color=\"#bd93f9\">󰍹 </span>{}% ",
"return-type": "", "return-type": "",
"interval": 1, "interval": 1,
"tooltip": false "tooltip": false

92
.config/waybar/style.css
View file

@ -69,15 +69,7 @@ window#waybar.hidden {
} }
#bluetooth { #bluetooth {
margin-top: 6px;
margin-left: 8px;
padding-left: 10px;
padding-right: 10px;
margin-bottom: 0px;
border-radius: 10px;
transition: none;
color: #f8f8f2; color: #f8f8f2;
background: #282a36;
} }
#battery { #battery {
@ -125,40 +117,40 @@ window#waybar.hidden {
color: #f8f8f2; color: #f8f8f2;
background: #282a36; background: #282a36;
} }
#clock { #status {
margin-top: 6px; margin-top: 6px;
margin-left: 6px; margin-left: 8px;
padding-left: 8px; padding-left: 10px;
padding-right: 3px; padding-right: 10px;
padding-top: 2px;
padding-bottom: 2px;
margin-bottom: 0px; margin-bottom: 0px;
border-radius: 10px; border-radius: 10px;
transition: none; transition: none;
color: #f8f8f2; color: #f8f8f2;
background: transparent; background: transparent;
/*background: #1A1826;*/
} }
#clock {
#memory { color: #f8f8f2;
}
#statistics {
margin-top: 6px; margin-top: 6px;
margin-left: 8px; margin-left: 8px;
padding-left: 10px; padding-left: 10px;
margin-bottom: 0px;
padding-right: 10px; padding-right: 10px;
padding-top: 2px;
padding-bottom: 2px;
margin-bottom: 0px;
border-radius: 10px; border-radius: 10px;
transition: none; transition: none;
color: #f8f8f2; color: #f8f8f2;
background: #282a36; background: #282a36;
} }
#memory {
color: #f8f8f2;
}
#cpu { #cpu {
margin-top: 6px;
margin-left: 8px;
padding-left: 10px;
margin-bottom: 0px;
padding-right: 10px;
border-radius: 10px;
transition: none;
color: #f8f8f2; color: #f8f8f2;
background: #282a36;
} }
#taskbar { #taskbar {
@ -170,44 +162,23 @@ window#waybar.hidden {
border-radius: 10px; border-radius: 10px;
transition: none; transition: none;
color: #f8f8f2; color: #f8f8f2;
background: #5d4185; background: #282a36;
} }
#disk { #disk {
margin-top: 6px;
margin-left: 8px;
padding-left: 10px;
padding-right: 10px;
margin-bottom: 0px;
border-radius: 10px;
transition: none;
color: #f8f8f2; color: #f8f8f2;
background: #282a36;
} }
#temperature { #temperature {
margin-top: 6px;
margin-left: 8px;
padding-left: 10px;
padding-right: 10px;
margin-bottom: 0px;
border-radius: 10px;
transition: none;
color: #f8f8f2; color: #f8f8f2;
background: #282a36;
} }
#idle_inhibitor { #idle_inhibitor {
margin-top: 6px; color: #f8f8f2;
margin-left: 1px;
padding-left: 1px;
padding-right: 6px;
margin-bottom: 0px;
border-radius: 10px;
} }
#idle_inhibitor.activated { #idle_inhibitor.activated {
color: #50fa7b; color: #50fa7b;
} }
#custom-vpn { #custom-vpn {
@ -215,15 +186,7 @@ window#waybar.hidden {
} }
#custom-weather { #custom-weather {
margin-top: 6px;
margin-left: 3px;
padding-left: 3px;
padding-right: 6px;
margin-bottom: 0px;
border-radius: 10px;
transition: none;
color: #f8f8f2; color: #f8f8f2;
background: transparent;
} }
#custom-weather.severe { #custom-weather.severe {
@ -268,15 +231,7 @@ window#waybar.hidden {
} }
#custom-gpu-usage { #custom-gpu-usage {
margin-top: 6px;
margin-left: 8px;
padding-left: 10px;
padding-right: 10px;
margin-bottom: 0px;
border-radius: 10px;
transition: none;
color: #f8f8f2; color: #f8f8f2;
background: #282a36;
} }
#audio-player { #audio-player {
margin-top: 6px; margin-top: 6px;
@ -324,15 +279,6 @@ window#waybar.hidden {
background: #8BE9FD; background: #8BE9FD;
} }
#custom-pacman { #custom-pacman {
margin-top: 6px;
margin-left: 2px;
padding-left: 5px;
padding-right: 5px;
margin-right: 2px;
margin-bottom: 0px;
border-radius: 10px;
transition: none;
color: #f8f2f2; color: #f8f2f2;
background: transparent;
} }

27
.zshrc
View file

@ -19,6 +19,7 @@ autoload -Uz compinit history-substring-search-up history-substring-search-down
zstyle ':completion:*' menu select # Auto completion zstyle ':completion:*' menu select # Auto completion
zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
zle -N bracketed-paste bracketed-paste-url-magic # autoquote urls zle -N bracketed-paste bracketed-paste-url-magic # autoquote urls
export EDITOR=nvim
# 2. Auto correction # 2. Auto correction
@ -47,24 +48,22 @@ alias config='/usr/bin/git --git-dir=$HOME/.dotfiles/.git/ --work-tree=$HOME'
eval "$(starship init zsh)" eval "$(starship init zsh)"
# 7. nnn variables # 7. yazi wrapper
function y() {
local tmp="$(mktemp -t "yazi-cwd.XXXXXX")" cwd
yazi "$@" --cwd-file="$tmp"
if cwd="$(command cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then
builtin cd -- "$cwd"
fi
rm -f -- "$tmp"
}
BLK="04" CHR="04" DIR="04" EXE="00" REG="00" HARDLINK="00" SYMLINK="06" MISSING="00" ORPHAN="01" FIFO="0F" SOCK="0F" OTHER="02"
export NNN_FCOLORS="$BLK$CHR$DIR$EXE$REG$HARDLINK$SYMLINK$MISSING$ORPHAN$FIFO$SOCK$OTHER" NNN_COLORS="2345"
export NNN_TRASH=1
export NNN_ARCHIVE="\\.(7z|a|ace|alz|arc|arj|bz|bz2|cab|cpio|deb|gz|jar|lha|lz|lzh|lzma|lzo|rar|rpm|rz|t7z|tar|tbz|tbz2|tgz|tlz|txz|tZ|tzo|war|xpi|xz|Z|zip)$"
export NNN_PLUG='p:preview-tui;c:x2sel'
export SPLIT='h'
export NNN_FIFO='/tmp/nnn.fifo'
export NNN_BMS='d:/mnt/M2/Downloads/;u:~/;b:/mnt/Backups;g:/media/Games;s:/mnt/SSD;m:/mnt/M2;n:/mnt/M2/Nextcloud;w:/mnt/M2/Nextcloud/Notes;c:~/.config;r:/run/media;a:/mnt/M2/Downloads/AUR;!:~/.bin/sh;t:~/.local/share/Trash/files;y:/home/peter/Sync'
export VISUAL='vim'
# If not running interactively, don't do anything
[[ $- != *i* ]] && return
# 8. Aliases # 8. Aliases
# 8.1 zsh aliases # 8.1 zsh aliases
alias ls='nnn -deUxH' alias ls='yazi'
alias aurdir='cd /mnt/M2/Downloads/AUR' alias aurdir='cd /mnt/M2/Downloads/AUR'
alias gitdir='cd /mnt/M2/Downloads/git' alias gitdir='cd /mnt/M2/Downloads/git'
alias notesdir='cd /mnt/M2/Nextcloud/Notes' alias notesdir='cd /mnt/M2/Nextcloud/Notes'
@ -73,7 +72,7 @@ alias cp='cp -i'
alias rm='rm -i' alias rm='rm -i'
alias ..='cd ..' alias ..='cd ..'
alias ...='cd ../..' alias ...='cd ../..'
alias visudo='sudo EDITOR=vim visudo' alias visudo='sudo EDITOR=nvim visudo'
# 8.2 Hyprland aliases # 8.2 Hyprland aliases