From 07ffb6c7470096e01c11590104b6c5adc57c5d47 Mon Sep 17 00:00:00 2001 From: Never Gude Date: Tue, 17 Feb 2026 14:00:48 +0100 Subject: [PATCH] update various stuff --- .config/fish/config.fish | 14 ++- .config/fish/fish_variables | 2 +- .config/waybar/config.jsonc | 162 ++++++++++++++------------------- .local/scripts/actionmenu.fish | 2 +- 4 files changed, 81 insertions(+), 99 deletions(-) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index d695cf0..28f4ef9 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -6,10 +6,22 @@ if status is-interactive abbr --add tr gio trash abbr --add --set-cursor tldr curl cheat.sh/% - function alacritty + function copy --description 'Copy to clipboard' + fish_clipboard_copy + end + + function paste --description 'Paste from clipboard' + fish_clipboard_paste + end + + function alacritty --description 'Create new Alacritty window' command alacritty msg create-window $argv end + function vman --description 'Uses Neovim as a manpager' + man $argv | nvim +Man! + end + function mvi --description 'Launches \d mpv with mvi configuration' mpv --config-dir=$HOME/.config/mvi/ $argv end diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index 294d23b..1f80e09 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -1,7 +1,7 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 SETUVAR --export EDITOR:nvim -SETUVAR LESS:\x1d +SETUVAR LESS:RAW\x2dCONTROL\x2dCHARS SETUVAR --export QT_QPA_PLATFORMTHEME:qt6ct SETUVAR __fish_initialized:3800 SETUVAR fish_color_autosuggestion:white diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc index 3793a05..11b919b 100644 --- a/.config/waybar/config.jsonc +++ b/.config/waybar/config.jsonc @@ -1,104 +1,74 @@ { - "layer": "top", - - "modules-left": ["niri/workspaces"], - "modules-center": ["niri/window"], - "modules-right": ["bluetooth", "network", "wireplumber#source", "wireplumber#sink", "battery", "clock"], - - "niri/window": { - "max-length": 100 - }, + "layer": "top", + "modules-left": ["niri/workspaces"], + "modules-center": ["niri/window"], + "modules-right": ["bluetooth", "network", "wireplumber#source", "wireplumber#sink", "battery", "clock"], - "idle_inhibitor": { - "format": "{icon}", - "format-icons": { - "activated": "󰅶", - "deactivated": "󰾪" - }, - "min-length": 2, - "tooltip": false - }, + "niri/window": { + "max-length": 100 + }, - "mpris": { - "format": "{player_icon} {dynamic}", - "format-paused": "{status_icon} {dynamic}", - "player-icons": { - "default": "󰐊" - }, - "status-icons": { - "paused": "󰏤" - }, - "ignored-players": ["firefox"] - }, - - "bluetooth": { - // "controller": "controller1", // specify the alias of the controller if there are more than 1 on the system - "format": "", - "format-disabled": "󰂲", // an empty format will hide the module - "format-connected": "󰂯", - "tooltip-format": "{controller_alias}\t{controller_address}", - "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{device_enumerate}", - "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}", - "min-length": 2 - }, - - "network": { - "interface": "wlp2s0", - "format": "{ifname}", - "format-icons": ["󰤟", "󰤢", "󰤥", "󰤨"], - "format-wifi": "{icon}", - "format-ethernet": "󰈁", - "format-disconnected": "", //An empty format will hide the module. - "tooltip-format": "{ifname}", - "tooltip-format-wifi": "󰖩 {essid} ({signalStrength}%)", - "tooltip-format-ethernet": "󰈁 {ifname}", - "tooltip-format-disconnected": "Disconnected", - "min-length": 2 - }, + "bluetooth": { + // "controller": "controller1", // specify the alias of the controller if there are more than 1 on the system + "format": "", + "format-disabled": "󰂲", // an empty format will hide the module + "format-connected": "󰂯", + "tooltip-format": "{controller_alias}\t{controller_address}", + "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{device_enumerate}", + "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}" + }, + + "network": { + "interface": "wlp2s0", + "format": "{ifname}", + "format-icons": ["󰤟", "󰤢", "󰤥", "󰤨"], + "format-wifi": "{icon}", + "format-ethernet": "󰈁", + "format-disconnected": "", //An empty format will hide the module. + "tooltip-format": "{ifname}", + "tooltip-format-wifi": "󰖩 {essid} ({signalStrength}%)", + "tooltip-format-ethernet": "󰈁 {ifname}", + "tooltip-format-disconnected": "Disconnected" + }, - "wireplumber#sink": { - "format": "{icon}", - "format-muted": "󰖁", - "format-icons": ["󰕿", "󰖀", "󰕾"], - "tooltip-format": "{node_name} ({volume}%)", - "on-click-right": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle", - "scroll-step": 5, - "min-length": 2 - }, - - "wireplumber#source": { - "node-type": "Audio/Source", - "format": "󰍬", - "format-muted": "󰍭", - "tooltip-format": "{node_name} ({volume}%)", - "on-click-right": "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle", - "scroll-step": 5, - "min-length": 2 - }, - - "battery": { - "interval": 60, - "states": { - "warning": 30, - "critical": 15 - }, - "events": { - "on-discharging-warning": "notify-send -u normal 'Low Battery'", - "on-discharging-critical": "notify-send -u critical 'Very Low Battery'" - }, - "format": "{icon}", - "format-icons": ["󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"], - "format-charging": "󰂄", - "tooltip-format": "{time} ({capacity}%)", - "min-length": 2 - }, + "wireplumber#sink": { + "format": "{icon}", + "format-muted": "󰖁", + "format-icons": ["󰕿", "󰖀", "󰕾"], + "tooltip-format": "{node_name} ({volume}%)", + "on-click-right": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle", + "scroll-step": 5 + }, + + "wireplumber#source": { + "node-type": "Audio/Source", + "format": "󰍬", + "format-muted": "󰍭", + "tooltip-format": "{node_name} ({volume}%)", + "on-click-right": "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle", + "scroll-step": 5 + }, + + "battery": { + "interval": 60, + "states": { + "warning": 30, + "critical": 15 + }, + "events": { + "on-discharging-warning": "notify-send -u normal 'Low Battery'", + "on-discharging-critical": "notify-send -u critical 'Very Low Battery'" + }, + "format": "{icon}", + "format-icons": ["󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"], + "format-charging": "󰂄", + "tooltip-format": "{time} ({capacity}%)" + }, - "clock": { - "format-alt": "{:%a, %d. %b %H:%M}", - "tooltip": false - } + "clock": { + "format-alt": "{:%a, %d. %b %H:%M}", + "tooltip": false + } } - - diff --git a/.local/scripts/actionmenu.fish b/.local/scripts/actionmenu.fish index 46672f0..1fae241 100755 --- a/.local/scripts/actionmenu.fish +++ b/.local/scripts/actionmenu.fish @@ -83,7 +83,7 @@ function audio_sink end function network_connection - set options (nmcli --terse --mode multiline connection show | grep "NAME:" | string replace "NAME:" "" | string split "\n") + set options (nmcli --terse --fields name connection show) set input (menu $options) notify-send "Connect to network $input" (nmcli connection up $input)