Browse Source

config updates

master
Tim 5 months ago
parent
commit
cc01a236ef
  1. 2
      config/rofi/config.rasi
  2. 2
      config/sway/config
  3. 52
      config/waybar/config
  4. 7
      config/waybar/scripts/dunst.sh
  5. 5
      vimrc.sym

2
config/rofi/config.rasi

@ -48,7 +48,6 @@ configuration {
/* window-format: "{w} {i}{c} {t}";*/
/* click-to-exit: true;*/
/* show-match: true;*/
theme: "../rofi/themes/autumn";
color-normal: "argb:d0282828, #ebdbb2, argb:d032302f, #665c54, #fbf1c7";
color-urgent: "argb:d0cc241d, #282828, argb:d0cc241d, #fb4934, #282828";
color-active: "argb:d0d79921, #282828, argb:d0d79921, #fabd2f, #282828";
@ -134,3 +133,4 @@ configuration {
/* me-accept-entry: "MouseD1";*/
/* me-accept-custom: "Control+MouseD1";*/
}
/*@ theme: "../rofi/themes/autumn";*/

2
config/sway/config

@ -276,7 +276,7 @@ exec waybar
## Environment thingies
exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
exec hash dbus-update-activation-environment 2>/dev/null && \
dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP=sway
## Starting
exec dunst -force_xwayland

52
config/waybar/config

@ -5,9 +5,9 @@
// "width": 1280, // Waybar width
"spacing": 4, // Gaps between modules (4px)
// Choose the order of the modules
"modules-left": ["sway/workspaces", "sway/mode", "custom/media", "mpd"],
"modules-left": ["sway/workspaces", "sway/mode", "custom/media", "mpd", "custom/scratchpad-indicator"],
"modules-center": ["sway/window"],
"modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "sway/language", "battery", "battery#bat2", "clock", "tray"],
"modules-right": [ "idle_inhibitor", "custom/dunst", "pulseaudio", "network", "cpu", "memory", "temperature", "temperature#GPU", "custom/blog-stats", "clock", "tray"],
// Modules configuration
// "sway/workspaces": {
// "disable-scroll": true,
@ -37,7 +37,7 @@
"format": "<span style=\"italic\">{}</span>"
},
"mpd": {
"format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) {songPosition}|{queueLength} {volume}% ",
"format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) {songPosition}|{queueLength} {volume}% ",
"format-disconnected": "Disconnected ",
"format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
"unknown-tag": "N/A",
@ -86,13 +86,21 @@
"format": "{}% "
},
"temperature": {
// "thermal-zone": 2,
// "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
"critical-threshold": 80,
"thermal-zone": 1,
"hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
"critical-threshold": 40,
// "format-critical": "{temperatureC}°C {icon}",
"format": "{temperatureC}°C {icon}",
"format-icons": ["", "", ""]
},
"temperature#GPU": {
// "thermal-zone": 2,
"hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
"critical-threshold": 60,
"format-critical": "{temperatureC}°C {icon}",
"format": "G: {temperatureC}°C {icon}",
"format-icons": ["", "", ""]
},
"backlight": {
// "device": "acpi_video1",
"format": "{percent}% {icon}",
@ -118,7 +126,7 @@
"network": {
"family": "ipv4",
"format-wifi": "{essid} ({signalStrength}%) ",
"format-ethernet": "{ipaddr} ",
"format-ethernet": "{ifname} ",
"format-linked": "{ifname} (No IP) ",
"format-disconnected": "Disconnected ⚠",
"format-alt": "{ifname}: {ipaddr}/{cidr}"
@ -126,7 +134,7 @@
"network#net6": {
"family": "ipv6",
"format-wifi": "{essid} ({signalStrength}%) ",
"format-ethernet": "{ipaddr} ",
"format-ethernet": "{ifname} ",
"format-linked": "{ifname} (No IP) ",
"format-disconnected": "Disconnected ⚠",
"format-alt": "{ifname}: {ipaddr}/{cidr}"
@ -161,6 +169,32 @@
"escape": true,
"exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
// "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
}
},
"custom/scratchpad-indicator": {
"interval": 3,
"return-type": "json",
"exec": "swaymsg -t get_tree | jq --unbuffered --compact-output '( select(.name == \"root\") | .nodes[] | select(.name == \"__i3\") | .nodes[] | select(.name == \"__i3_scratch\") | .focus) as $scratch_ids | [.. | (.nodes? + .floating_nodes?) // empty | .[] | select(.id |IN($scratch_ids[]))] as $scratch_nodes | { text: \"\\($scratch_nodes | length)\", tooltip: $scratch_nodes | map(\"\\(.app_id // .window_properties.class) (\\(.id)): \\(.name)\") | join(\"\\n\") }'",
"format": "{} 🗗",
"on-click": "exec swaymsg 'scratchpad show'",
"on-click-right": "exec swaymsg 'move scratchpad'"
},
"custom/dunst": {
"exec": "~/.config/waybar/scripts/dunst.sh",
"on-click": "dunstctl set-paused toggle",
"format": " {} ",
"restart-interval": 1
},
"custom/gpu-usage": {
"exec": "cat /sys/class/hwmon/hwmon2/device/gpu_busy_percent",
"format": "GPU: {}%",
"return-type": "",
"interval": 1
},
"custom/blog-stats": {
"exec": "~/.config/waybar/scripts/blog-stats.py | jq --unbuffered --compact-output",
"format": " {} ",
"return-type": "json",
"interval": 3600
}
}

7
config/waybar/scripts/dunst.sh

@ -0,0 +1,7 @@
#!/bin/bash
COUNT=$(dunstctl count waiting)
ENABLED=
DISABLED=
if [ $COUNT != 0 ]; then DISABLED=" $COUNT"; fi
if dunstctl is-paused | grep -q "false" ; then echo $ENABLED; else echo $DISABLED; fi

5
vimrc.sym

@ -135,6 +135,11 @@ autocmd BufRead,BufNewFile *.yml set softtabstop=2
" Call spellcheck on write for markdown
autocmd BufWritePre *.md :SpellCheck
autocmd FileType markdown setlocal complete+=kspell
autocmd FileType markdown setlocal spell
" awe
autocmd FileType gitcommit setlocal complete+=kspell
autocmd FileType gitcommit setlocal spell
"set spell spelllang=en_au
" Theming

Loading…
Cancel
Save