mirror of https://github.com/deuill/dotfiles.git
Fixes all around the place
This commit is contained in:
parent
8e0d49fe9f
commit
9e81e6ff7f
|
|
@ -24,6 +24,10 @@ module stdio.so
|
|||
# Audio codec modules
|
||||
module g711.so
|
||||
|
||||
# Audio filter modules
|
||||
module auconv.so
|
||||
module auresamp.so
|
||||
|
||||
# Audio driver Modules
|
||||
module pipewire.so
|
||||
|
||||
|
|
@ -40,6 +44,7 @@ module ice.so
|
|||
# -------------------------------------
|
||||
|
||||
module_app account.so
|
||||
module_app contact.so
|
||||
module_app gtk.so
|
||||
module_app menu.so
|
||||
module_app netroam.so
|
||||
|
|
|
|||
|
|
@ -83,9 +83,12 @@
|
|||
;;;
|
||||
|
||||
(set-popup-rule! "^\\*doom:scratch" :side 'right :select t :quit 'other :slot 0 :width (+ fill-column 4))
|
||||
(set-popup-rule! "^ ?\\*Treemacs" :ignore t)
|
||||
|
||||
(setq-default shell-file-name "/usr/bin/fish"
|
||||
doom-scratch-initial-major-mode 'text-mode)
|
||||
(setq-default auth-sources '(default)
|
||||
browse-url-browser-function 'eww-browse-url
|
||||
doom-scratch-initial-major-mode 'text-mode
|
||||
shell-file-name "/usr/bin/fish")
|
||||
|
||||
(after! dash-docs
|
||||
(setq dash-docs-docsets-path "~/.local/share/docsets"
|
||||
|
|
@ -151,7 +154,8 @@
|
|||
|
||||
(after! magit
|
||||
(setq magit-diff-refine-hunk t
|
||||
magit-display-buffer-function #'magit-display-buffer-traditional))
|
||||
magit-display-buffer-function #'magit-display-buffer-traditional)
|
||||
magit-revision-show-gravatars '("^Author: " . "^Commit: "))
|
||||
|
||||
(after! (magit evil)
|
||||
(evil-define-key* 'normal magit-status-mode-map (kbd "<escape>") #'magit-mode-bury-buffer))
|
||||
|
|
@ -257,14 +261,16 @@
|
|||
(display-fill-column-indicator-mode 0))
|
||||
|
||||
(add-hook! 'evil-visual-state-entry-hook
|
||||
(setq-local whitespace-style '(face tabs tab-mark spaces space-mark trailing))
|
||||
(whitespace-turn-off)
|
||||
(whitespace-turn-on-if-enabled))
|
||||
(when (funcall whitespace-enable-predicate)
|
||||
(setq-local whitespace-style '(face tabs tab-mark spaces space-mark trailing))
|
||||
(whitespace-turn-off)
|
||||
(whitespace-turn-on)))
|
||||
|
||||
(add-hook! 'evil-visual-state-exit-hook
|
||||
(kill-local-variable 'whitespace-style)
|
||||
(whitespace-turn-off)
|
||||
(whitespace-turn-on-if-enabled))
|
||||
(when (funcall whitespace-enable-predicate)
|
||||
(kill-local-variable 'whitespace-style)
|
||||
(whitespace-turn-off)
|
||||
(whitespace-turn-on)))
|
||||
|
||||
(add-hook! git-commit-mode
|
||||
(setq indent-tabs-mode nil))
|
||||
|
|
@ -396,21 +402,15 @@
|
|||
|
||||
(:prefix "g"
|
||||
(:when (modulep! :ui vc-gutter)
|
||||
"]" nil
|
||||
"[" nil
|
||||
"." nil
|
||||
:desc "Jump to next hunk" "n" #'git-gutter:next-hunk
|
||||
:desc "Jump to previous hunk" "p" #'git-gutter:previous-hunk
|
||||
:desc "Revert hunk" "r" #'git-gutter:revert-hunk
|
||||
:desc "Git stage hunk" "s" #'git-gutter:stage-hunk
|
||||
:desc "Git time machine" "t" #'git-timemachine-toggle)
|
||||
(:when (modulep! :tools magit)
|
||||
"/" nil
|
||||
"'" nil
|
||||
"D" nil
|
||||
:desc "Git fetch" "f" #'magit-fetch
|
||||
:desc "Git pull" "F" #'magit-pull
|
||||
"f" nil))
|
||||
:desc "Git pull" "F" #'magit-pull))
|
||||
|
||||
"i" nil
|
||||
"n" nil
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
ophints
|
||||
(popup +all +defaults)
|
||||
(treemacs +lsp)
|
||||
vc-gutter
|
||||
(vc-gutter +diff-hl +pretty)
|
||||
(window-select +numbers +switch-window)
|
||||
workspaces
|
||||
zen
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
(eval +overlay)
|
||||
(lookup +dictionary +docsets +offline)
|
||||
(lsp +peek)
|
||||
magit
|
||||
(magit +forge)
|
||||
pdf
|
||||
rgb
|
||||
|
||||
|
|
|
|||
|
|
@ -46,9 +46,9 @@ show_age_threshold = 300 # Show age of message if message is older than show_age
|
|||
word_wrap = yes # Split notifications into multiple lines if they don't fit into geometry.
|
||||
ignore_newline = no # Ignore newlines ('\n') in notifications.
|
||||
|
||||
stack_duplicates = true # Stack together notifications with the same content.
|
||||
hide_duplicate_count = true # Hide the count of stacked notifications with the same content.
|
||||
show_indicators = no # Display indicators for URLs (U) and actions (A).
|
||||
stack_duplicates = yes # Stack together notifications with the same content.
|
||||
hide_duplicate_count = yes # Hide the count of stacked notifications with the same content.
|
||||
show_indicators = no # Display indicators for URLs (U) and actions (A).
|
||||
|
||||
# Icon settings.
|
||||
icon_path = /usr/share/icons/Adwaita/scalable/status/:/usr/share/icons/Adwaita/scalable/devices/
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
PATH="$PATH:$HOME/.local/bin:$HOME/.go/bin"
|
||||
GOPATH="$HOME/.go"
|
||||
DOCKER_HOST="unix://$XDG_RUNTIME_DIR/podman/podman.sock"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
[Default Applications]
|
||||
application/pdf=org.pwmt.zathura-pdf-poppler.desktop;
|
||||
x-scheme-handler/mailto=thunderbird.desktop;
|
||||
application/pdf=org.pwmt.zathura-pdf-mupdf.desktop;
|
||||
application/vnd.comicbook+zip=org.pwmt.zathura-pdf-mupdf.desktop;
|
||||
application/vnd.comicbook-rar=org.pwmt.zathura-pdf-mupdf.desktop;
|
||||
|
|
|
|||
|
|
@ -90,6 +90,7 @@ floating_modifier $mod
|
|||
bindsym --to-code {
|
||||
# Application launching
|
||||
$mod+Return exec sensible-terminal
|
||||
XF86LaunchA exec $launcher -show drun -show-icons
|
||||
$mod+d exec $launcher -show drun -show-icons
|
||||
$mod+Shift+d exec $launcher -show run
|
||||
$mod+o exec $launcher -show filebrowser -show-icons
|
||||
|
|
@ -138,7 +139,7 @@ bindsym --to-code {
|
|||
$mod+e layout toggle split
|
||||
|
||||
# Toggle tiling/floating
|
||||
$mod+t floating toggle
|
||||
$mod+t floating toggle; [tiling con_id=__focused__] border none; [floating con_id=__focused__] border pixel 3
|
||||
$mod+Shift+t sticky toggle
|
||||
|
||||
# Focus the parent/child container.
|
||||
|
|
|
|||
|
|
@ -1,114 +1,152 @@
|
|||
{
|
||||
"layer": "top",
|
||||
"height": 32,
|
||||
"modules-left": ["sway/window", "mpd", "sway/mode"],
|
||||
"modules-center": ["sway/workspaces"],
|
||||
"modules-right": ["pulseaudio", "network", "battery", "cpu", "memory", "temperature", "sway/language", "clock", "tray"],
|
||||
"battery": {
|
||||
"interval": 60,
|
||||
"states": {
|
||||
"warning": 30,
|
||||
"critical": 15
|
||||
},
|
||||
"format": "<span color='#585858' size='smaller'>bat</span> {capacity}%",
|
||||
"max-length": 25
|
||||
"layer": "top",
|
||||
"height": 32,
|
||||
"modules-left": [
|
||||
"sway/window",
|
||||
"mpd",
|
||||
"sway/mode"
|
||||
],
|
||||
"modules-center": [
|
||||
"sway/workspaces"
|
||||
],
|
||||
"modules-right": [
|
||||
"pulseaudio",
|
||||
"network",
|
||||
"battery",
|
||||
"cpu",
|
||||
"memory",
|
||||
"temperature",
|
||||
"sway/language",
|
||||
"clock",
|
||||
"tray"
|
||||
],
|
||||
"battery": {
|
||||
"interval": 60,
|
||||
"states": {
|
||||
"warning": 30,
|
||||
"critical": 15
|
||||
},
|
||||
"format": "<span color='#585858' size='smaller'>bat</span> {capacity}%",
|
||||
"max-length": 25
|
||||
},
|
||||
"clock": {
|
||||
"format": "<span color='#585858' size='smaller'>time</span> {:%H:%M %Z}",
|
||||
"format-alt": "<span color='#585858' size='smaller'>date</span> {:%A, %d %B %H:%M %Z}",
|
||||
"calendar": {
|
||||
"mode": "year",
|
||||
"mode-mon-col": 3,
|
||||
"on-scroll": 1,
|
||||
"on-click-right": "mode",
|
||||
"format": {
|
||||
"months": "<span color='#d8d8d8'><b>{}</b></span>",
|
||||
"days": "<span color='#f7ca88'>{}</span>",
|
||||
"weekdays": "<span color='#86c1b9'><b>{}</b></span>",
|
||||
"today": "<span color='#ab4642'><b>{}</b></span>"
|
||||
}
|
||||
},
|
||||
"actions": {
|
||||
"on-click-right": "mode",
|
||||
"on-click-middle": "tz_up",
|
||||
"on-scroll-up": "shift_up",
|
||||
"on-scroll-down": "shift_down"
|
||||
},
|
||||
"tooltip-format": "<tt><small>{calendar}</small></tt>",
|
||||
"today-format": "<span color='#ab4642'>{}</span>",
|
||||
"timezones": [
|
||||
"Europe/London",
|
||||
"America/New_York",
|
||||
"America/Los_Angeles"
|
||||
],
|
||||
"smooth-scrolling-threshold": 20
|
||||
},
|
||||
"cpu": {
|
||||
"interval": 10,
|
||||
"format": "<span color='#585858' size='smaller'>cpu</span> {usage}%",
|
||||
"max-length": 10,
|
||||
"on-click": "sensible-terminal -e btop"
|
||||
},
|
||||
"custom/mpris": {
|
||||
"format": "{} <span color='#585858' size='smaller'>{icon}</span>",
|
||||
"return-type": "json",
|
||||
"format-icons": {
|
||||
"playing": "play",
|
||||
"paused": "paus",
|
||||
"stopped": "stop"
|
||||
},
|
||||
"max-length": 60,
|
||||
"exec": "playerctl --follow metadata --format '{\"text\": \"{{markup_escape(artist)}} - {{markup_escape(title)}}\", \"tooltip\": \"{{markup_escape(artist)}} - {{markup_escape(album)}} - {{markup_escape(title)}} ({{playerName}})\", \"alt\": \"{{lc(status)}}\", \"class\": \"{{lc(status)}}\"}'",
|
||||
"smooth-scrolling-threshold": 20,
|
||||
"on-click": "playerctl play-pause",
|
||||
"on-click-right": "cantata",
|
||||
"on-scroll-up": "playerctl previous",
|
||||
"on-scroll-down": "playerctl next"
|
||||
},
|
||||
"mpd": {
|
||||
"format": "{artist} - {title} <span color='#585858' size='smaller'>{stateIcon}</span>",
|
||||
"format-stopped": "",
|
||||
"format-disconnected": "",
|
||||
"interval": 5,
|
||||
"max-length": 60,
|
||||
"artist-len": 40,
|
||||
"title-len": 40,
|
||||
"state-icons": {
|
||||
"paused": "paus",
|
||||
"playing": "play"
|
||||
},
|
||||
"tooltip-format": "{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})",
|
||||
"tooltip-format-disconnected": "MPD (Disconnected)",
|
||||
"smooth-scrolling-threshold": 20,
|
||||
"on-click": "mpc toggle",
|
||||
"on-click-right": "sensible-terminal -e ncmpcpp",
|
||||
"on-scroll-up": "mpc prev",
|
||||
"on-scroll-down": "mpc next"
|
||||
},
|
||||
"memory": {
|
||||
"interval": 30,
|
||||
"format": "<span color='#585858' size='smaller'>mem</span> {}%",
|
||||
"on-click": "sensible-terminal -e htop"
|
||||
},
|
||||
"network": {
|
||||
"format": "<span color='#585858' size='smaller'>net</span> {ifname}",
|
||||
"format-wifi": "<span color='#585858' size='smaller'>wifi</span> {essid}",
|
||||
"format-disconnected": "",
|
||||
"tooltip-format-wifi": "{essid} ({signalStrength}%)",
|
||||
"tooltip-format-ethernet": "{ifname}",
|
||||
"tooltip-format-disconnected": "Disconnected",
|
||||
"max-length": 50
|
||||
},
|
||||
"pulseaudio": {
|
||||
"format": "<span color='#585858' size='smaller'>vol</span> {volume}%",
|
||||
"format-bluetooth": "<span color='#585858' size='smaller'>btvol</span> {volume}%",
|
||||
"format-muted": "<span color='#585858' size='smaller'>vol</span> <span color='#ab4642'>{volume}%</span>",
|
||||
"tooltip-format": "{desc}",
|
||||
"scroll-step": 1,
|
||||
"on-click": "sensible-terminal -e pulsemixer"
|
||||
},
|
||||
"sway/language": {
|
||||
"format": "<span color='#585858' size='smaller'>key</span> {}",
|
||||
"max-length": 50,
|
||||
"tooltip": false,
|
||||
"on-click": "swaymsg input 'type:keyboard' xkb_switch_layout next"
|
||||
},
|
||||
"sway/workspaces": {
|
||||
"format": "{name}",
|
||||
"smooth-scrolling-threshold": 5
|
||||
},
|
||||
"sway/window": {
|
||||
"align": 0,
|
||||
"format": "<span color='#585858' size='smaller'>⋮</span>",
|
||||
"icon": false,
|
||||
"max-length": 50,
|
||||
"on-click": "rofi -show drun -show-icons"
|
||||
},
|
||||
"clock": {
|
||||
"format": "<span color='#585858' size='smaller'>time</span> {:%H:%M %Z}",
|
||||
"format-alt": "<span color='#585858' size='smaller'>date</span> {:%A, %d %B %H:%M %Z}",
|
||||
"tooltip-format": " <big>{:%d %B %Y}</big>\n{calendar}",
|
||||
"today-format": "<span color='#ab4642'>{}</span>",
|
||||
"timezones": ["Europe/London", "America/New_York", "America/Los_Angeles"],
|
||||
"smooth-scrolling-threshold": 20
|
||||
},
|
||||
"cpu": {
|
||||
"interval": 10,
|
||||
"format": "<span color='#585858' size='smaller'>cpu</span> {usage}%",
|
||||
"max-length": 10,
|
||||
"on-click": "sensible-terminal -e btop"
|
||||
},
|
||||
"custom/mpris": {
|
||||
"format": "{} {icon}",
|
||||
"return-type": "json",
|
||||
"format-icons": {
|
||||
"playing": "<span color='#585858' size='smaller'>play</span>",
|
||||
"paused": "<span color='#585858' size='smaller'>paus</span>",
|
||||
"stopped": "<span color='#585858' size='smaller'>stop</span>"
|
||||
},
|
||||
"max-length": 60,
|
||||
"exec": "playerctl --follow metadata --format '{\"text\": \"{{markup_escape(artist)}} - {{markup_escape(title)}}\", \"tooltip\": \"{{markup_escape(artist)}} - {{markup_escape(album)}} - {{markup_escape(title)}} ({{playerName}})\", \"alt\": \"{{lc(status)}}\", \"class\": \"{{lc(status)}}\"}'",
|
||||
"smooth-scrolling-threshold": 20,
|
||||
"on-click": "playerctl play-pause",
|
||||
"on-click-right": "cantata",
|
||||
"on-scroll-up": "playerctl previous",
|
||||
"on-scroll-down": "playerctl next"
|
||||
},
|
||||
"mpd": {
|
||||
"format": "{artist} - {title} {stateIcon}",
|
||||
"format-stopped": "",
|
||||
"format-disconnected": "",
|
||||
"interval": 5,
|
||||
"max-length": 60,
|
||||
"artist-len": 40,
|
||||
"title-len": 40,
|
||||
"state-icons": {
|
||||
"paused": "<span color='#585858' size='smaller'>paus</span>",
|
||||
"playing": "<span color='#585858' size='smaller'>play</span>"
|
||||
},
|
||||
"tooltip-format": "{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})",
|
||||
"tooltip-format-disconnected": "MPD (Disconnected)",
|
||||
"smooth-scrolling-threshold": 20,
|
||||
"on-click": "mpc toggle",
|
||||
"on-click-right": "sensible-terminal -e ncmpcpp",
|
||||
"on-scroll-up": "mpc prev",
|
||||
"on-scroll-down": "mpc next"
|
||||
},
|
||||
"memory": {
|
||||
"interval": 30,
|
||||
"format": "<span color='#585858' size='smaller'>mem</span> {}%",
|
||||
"on-click": "sensible-terminal -e htop"
|
||||
},
|
||||
"network": {
|
||||
"format": "<span color='#585858' size='smaller'>net</span> {ifname}",
|
||||
"format-wifi": "<span color='#585858' size='smaller'>wifi</span> {essid}",
|
||||
"format-disconnected": "",
|
||||
"tooltip-format-wifi": "{essid} ({signalStrength}%)",
|
||||
"tooltip-format-ethernet": "{ifname}",
|
||||
"tooltip-format-disconnected": "Disconnected",
|
||||
"max-length": 50
|
||||
},
|
||||
"pulseaudio": {
|
||||
"format": "<span color='#585858' size='smaller'>vol</span> {volume}%",
|
||||
"format-bluetooth": "<span color='#585858' size='smaller'>btvol</span> {volume}%",
|
||||
"format-muted": "<span color='#585858' size='smaller'>vol</span> <span color='#ab4642'>{volume}%</span>",
|
||||
"tooltip-format": "{desc}",
|
||||
"scroll-step": 1,
|
||||
"on-click": "sensible-terminal -e pulsemixer"
|
||||
},
|
||||
"sway/language": {
|
||||
"format": "<span color='#585858' size='smaller'>key</span> {}",
|
||||
"max-length": 50,
|
||||
"tooltip": false,
|
||||
"on-click": "swaymsg input 'type:keyboard' xkb_switch_layout next"
|
||||
},
|
||||
"sway/workspaces": {
|
||||
"format": "{name}",
|
||||
"smooth-scrolling-threshold": 5
|
||||
},
|
||||
"sway/window": {
|
||||
"format": "<span color='#585858' size='smaller'>⋮</span>",
|
||||
"on-click": "rofi -show drun -show-icons",
|
||||
"icon": false,
|
||||
"align": 0,
|
||||
"max-length": 50
|
||||
},
|
||||
"temperature": {
|
||||
"thermal-zone": 1,
|
||||
"format": "<span color='#585858' size='smaller'>temp</span> {temperatureC}°C",
|
||||
"tooltip": false
|
||||
},
|
||||
"tray": {
|
||||
"icon-size": 32,
|
||||
"spacing": 15
|
||||
}
|
||||
"temperature": {
|
||||
"thermal-zone": 1,
|
||||
"format": "<span color='#585858' size='smaller'>temp</span> {temperatureC}°C",
|
||||
"tooltip": false
|
||||
},
|
||||
"tray": {
|
||||
"icon-size": 32,
|
||||
"spacing": 15
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ tooltip {
|
|||
transition: background-color 0.1s ease;
|
||||
}
|
||||
|
||||
#waybar.empty {
|
||||
#waybar.empty, #waybar.floating {
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
|
|
@ -55,7 +55,8 @@ tooltip {
|
|||
}
|
||||
|
||||
#window {
|
||||
padding-left: 0.5rem;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
#mode {
|
||||
|
|
|
|||
Loading…
Reference in New Issue