diff --git a/.config/aerc/accounts.conf b/.config/aerc/accounts.conf new file mode 100644 index 0000000..7330c90 --- /dev/null +++ b/.config/aerc/accounts.conf @@ -0,0 +1,23 @@ +[yw5n] +source = imaps://ange@yw5n.com@ssl0.ovh.net +source-cred-cmd = pass show email/ange@yw5n.com | head -n1 +outgoing = smtps://ange@yw5n.com@ssl0.ovh.net +outgoing-cred-cmd = pass show email/ange@yw5n.com | head -n1 +default = INBOX +from = "Ange DUHAYON" +cache-headers = true +copy-to = Sent +signature-file = ~/.config/aerc/signature.txt +pgp-auto-sign = true +pgp-opportunistic-encrypt = true + +[duhayon] +source = imaps://ange@duhayon.com@ssl0.ovh.net +source-cred-cmd = pass show email/ange@duhayon.com | head -n1 +outgoing = smtps://ange@duhayon.com@ssl0.ovh.net +outgoing-cred-cmd = pass show email/ange@duhayon.com | head -n1 +default = INBOX +from = "Ange DUHAYON" +cache-headers = true +copy-to = INBOX.INBOX.Sent +signature-file = ~/.config/aerc/signature.txt diff --git a/.config/aerc/aerc.conf b/.config/aerc/aerc.conf new file mode 100644 index 0000000..82ec6dc --- /dev/null +++ b/.config/aerc/aerc.conf @@ -0,0 +1,10 @@ +[general] +pgp-provider = gpg + +[filters] +.headers = colorize +message/delivery-status = colorize +message/rfc822 = colorize +text/calendar = calendar +text/html = w3m -T text/html -o display_link_number=1 +text/plain = colorize diff --git a/.config/aerc/binds.conf b/.config/aerc/binds.conf new file mode 100644 index 0000000..862e60b --- /dev/null +++ b/.config/aerc/binds.conf @@ -0,0 +1,162 @@ +# Binds are of the form = +# To use '=' in a key sequence, substitute it with "Eq": "" +# If you wish to bind #, you can wrap the key sequence in quotes: "#" = quit + = :prev-tab + = :prev-tab + = :next-tab + = :next-tab + = :term +? = :help keys + = :prompt 'Quit?' quit + = :prompt 'Quit?' quit + +[messages] +q = :prompt 'Quit?' quit + +j = :next + = :next + = :next 50% + = :next 100% + = :next 100% + +k = :prev + = :prev + = :prev 50% + = :prev 100% + = :prev 100% +g = :select 0 +G = :select -1 + +J = :next-folder + = :next-folder +K = :prev-folder + = :prev-folder +H = :collapse-folder + = :collapse-folder +L = :expand-folder + = :expand-folder + +v = :mark -t + = :mark -t:next +V = :mark -v + +T = :toggle-threads +zc = :fold +zo = :unfold + + = :view +d = :prompt 'Really delete this message?' 'delete-message' +D = :delete +a = :archive flat +A = :unmark -a:mark -T:archive flat + +C = :compose +m = :compose + +rr = :reply -a +rq = :reply -aq +Rr = :reply +Rq = :reply -q + +c = :cf +$ = :term +! = :term +| = :pipe + +/ = :search +\ = :filter +n = :next-result +N = :prev-result + = :clear + +s = :split +S = :vsplit + +[messages:folder=Drafts] + = :recall + +[view] +/ = :toggle-key-passthrough/ +q = :close +O = :open +o = :open +S = :save +| = :pipe +D = :delete +A = :archive flat + + = :open-link + +f = :forward +rr = :reply -a +rq = :reply -aq +Rr = :reply +Rq = :reply -q + +H = :toggle-headers + = :prev-part + = :prev-part + = :next-part + = :next-part +J = :next + = :next +K = :prev + = :prev + +[view::passthrough] +$noinherit = true +$ex = + = :toggle-key-passthrough + +[compose] +# Keybindings used when the embedded terminal is not selected in the compose +# view +$noinherit = true +$ex = + = :prev-field + = :prev-field + = :next-field + = :next-field + = :switch-account -p + = :switch-account -p + = :switch-account -n + = :switch-account -n + = :next-field + = :prev-field + = :prev-tab + = :prev-tab + = :next-tab + = :next-tab + +[compose::editor] +# Keybindings used when the embedded terminal is selected in the compose view +$noinherit = true +$ex = + = :prev-field + = :prev-field + = :next-field + = :next-field + = :prev-tab + = :prev-tab + = :next-tab + = :next-tab + +[compose::review] +# Keybindings used when reviewing a message to be sent +y = :send +n = :abort +v = :preview +p = :postpone +q = :choose -o d discard abort -o p postpone postpone +e = :edit +a = :attach +d = :detach + +[terminal] +$noinherit = true +$ex = + + = :prev-tab + = :next-tab + = :prev-tab + = :next-tab diff --git a/.config/aerc/signature.txt b/.config/aerc/signature.txt new file mode 100644 index 0000000..83e3fbb --- /dev/null +++ b/.config/aerc/signature.txt @@ -0,0 +1 @@ +ange diff --git a/.config/hypr/apps.conf b/.config/hypr/apps.conf new file mode 100644 index 0000000..d8e9b32 --- /dev/null +++ b/.config/hypr/apps.conf @@ -0,0 +1,34 @@ +$menu = dmenu_run +$terminal = alacritty +$screensaver = feh --fullscreen "$XDG_CONFIG_HOME/wallpapers/lock.png" +$lock = swaylock -Fti "$XDG_CONFIG_HOME/wallpapers/lock.png" +$browser = firefox +$privateBrowser = firefox --private-window +$calc = $terminal -epython +$fileManager = pcmanfm +$screenshot = flameshot full -c +$screenshotRect = flameshot gui +$volDown = set-vol -5 +$volUp = set-vol +5 +$mute = set-vol m +$muteMic = wpctl set-mute '@DEFAULT_AUDIO_SOURCE@' toggle +$pause = playerctl play-pause +$prev = playerctl previous +$next = playerctl next +$stop = playerctl stop +$brightnessDown = set-light -5 +$brightnessUp = set-light +5 +$passselect = passselect +$passopen = passopen +$passuser = passuser +$passpass = passpass +$passotp = passotp + +exec-once=swayidle -w \ + timeout 300 '$screensaver' \ + timeout 315 'swaymsg "output * dpms off"' \ + resume 'swaymsg "output * dpms on"' \ + before-sleep '$lock' +exec-once=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 +exec-once=gammastep +exec-once=hybrid-bar diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 02c13bd..c752ab5 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -1,8 +1,8 @@ # See https://wiki.hyprland.org/Configuring/ # See https://wiki.hyprland.org/Configuring/Monitors/ -monitor=eDP, 1920x1080, 0x0, auto -monitor=HDMI-A-0, 1920x1080, 1920x0, auto +monitor=eDP-1, 1920x1080, 1920x0, auto +monitor=HDMI-A-1, 1920x1080, 0x0, auto monitor=, preferred, auto, 1 # new monitors on the right # See https://wiki.hyprland.org/Configuring/Keywords/ @@ -13,10 +13,7 @@ monitor=, preferred, auto, 1 # new monitors on the right # Source a file (multi-file configs) # source = ~/.config/hypr/myColors.conf -# Set programs that you use -$terminal = alacritty -$fileManager = pcmanfm -$menu = dmenu_run +source = ~/.config/hypr/apps.conf # Some default env vars. env = MOZ_ENABLE_WAYLAND,1 @@ -31,7 +28,6 @@ input { follow_mouse = 1 touchpad { - accel_profile = adaptative clickfinger_behavior = true natural_scroll = true } @@ -77,12 +73,12 @@ animations { bezier = myBezier, 0.05, 0.9, 0.1, 1.05 - animation = windows, 1, 7, myBezier - animation = windowsOut, 1, 7, default, popin 80% - animation = border, 1, 10, default - animation = borderangle, 1, 8, default - animation = fade, 1, 7, default - animation = workspaces, 1, 6, default + animation = windows, 1, 3, myBezier + animation = windowsOut, 1, 3, default, popin 80% + animation = border, 1, 3, default + animation = borderangle, 1, 3, default + animation = fade, 1, 3, default + animation = workspaces, 1, 3, default } master { @@ -109,18 +105,43 @@ windowrulev2 = nomaximizerequest, class:.* # You'll probably like this. $mainMod = SUPER # See https://wiki.hyprland.org/Configuring/Binds/ -bind = $mainMod, Q, exec, $terminal -bind = $mainMod, C, killactive, -bind = $mainMod, M, exit, -bind = $mainMod, E, exec, $fileManager -bind = $mainMod, V, togglefloating, -bind = $mainMod, R, exec, $menu +bind = $mainMod SHIFT, C, killactive, +bind = $mainMod SHIFT, Q, exit, +bind = $mainMod, Space, togglefloating, + +bind = $mainMod, R, exec, $menu +bind = $mainMod, Return, exec, $terminal +bind = $mainMod, L, exec, $lock +bind = $mainMod, B, exec, $browser +bind = $mainMod SHIFT, B, exec, $private_browser +bind =, XF86Calculator, exec, $calc +bind = $mainMod, E, exec, $fileManager +bind =, XF86Print, exec, $screenshot +bind = SHIFT, XF86Print, exec, $screenshotRect +bind =, XF86AudioLowerVolume, exec, $volDown +bind =, XF86AudioRaiseVolume, exec, $volUp +bind =, XF86AudioMute, exec, $mute +bind =, XF86AudioMicMute, exec, $muteMic +bind = SHIFT, XF86AudioMute, exec, $muteMic +bind =, XF86AudioPlay, exec, $pause +bind =, XF86AudioPrev, exec, $prev +bind =, XF86AudioNext, exec, $next +bind =, XF86AudioStop, exec, $stop +bind =, XF86MonBrightnessDown, exec, $brightnessDown +bind =, XF86MonBrightnessUp, exec, $brightnessUp +bind = $mainMod, P, exec, $passselect +bind = $mainMod SHIFT, P, exec, $passopen +bind = $mainMod, U, exec, $passuser +bind = $mainMod, I, exec, $passpass +bind = $mainMod, O, exec, $passotp + +bind = $mainMod, T, fullscreen +bind = $mainMod, F, fullscreen, 0 +bind = $mainMod, M, fullscreen, 1 # Move focus with mainMod + hjkl -bind = $mainMod, l, movefocus, l -bind = $mainMod, h, movefocus, r -bind = $mainMod, k, movefocus, u -bind = $mainMod, j, movefocus, d +bind = $mainMod, K, layoutmsg, cycleprev +bind = $mainMod, J, layoutmsg, cyclenext # Switch workspaces with mainMod + [0-9] bind = $mainMod, 1, workspace, 1 @@ -135,15 +156,15 @@ bind = $mainMod, 9, workspace, 9 bind = $mainMod, 0, workspace, 10 # Move active window to a workspace with mainMod + SHIFT + [1-9] -bind = $mainMod SHIFT, 1, movetoworkspace, 1 -bind = $mainMod SHIFT, 2, movetoworkspace, 2 -bind = $mainMod SHIFT, 3, movetoworkspace, 3 -bind = $mainMod SHIFT, 4, movetoworkspace, 4 -bind = $mainMod SHIFT, 5, movetoworkspace, 5 -bind = $mainMod SHIFT, 6, movetoworkspace, 6 -bind = $mainMod SHIFT, 7, movetoworkspace, 7 -bind = $mainMod SHIFT, 8, movetoworkspace, 8 -bind = $mainMod SHIFT, 9, movetoworkspace, 9 +bind = $mainMod SHIFT, 1, movetoworkspacesilent, 1 +bind = $mainMod SHIFT, 2, movetoworkspacesilent, 2 +bind = $mainMod SHIFT, 3, movetoworkspacesilent, 3 +bind = $mainMod SHIFT, 4, movetoworkspacesilent, 4 +bind = $mainMod SHIFT, 5, movetoworkspacesilent, 5 +bind = $mainMod SHIFT, 6, movetoworkspacesilent, 6 +bind = $mainMod SHIFT, 7, movetoworkspacesilent, 7 +bind = $mainMod SHIFT, 8, movetoworkspacesilent, 8 +bind = $mainMod SHIFT, 9, movetoworkspacesilent, 9 # Move/resize windows with mainMod + LMB/RMB and dragging bindm = $mainMod, mouse:272, movewindow diff --git a/.config/neomutt/ange@duhayon.com b/.config/neomutt/ange@duhayon.com deleted file mode 100644 index fe2ba93..0000000 --- a/.config/neomutt/ange@duhayon.com +++ /dev/null @@ -1,14 +0,0 @@ -source global - -set imap_user = 'ange@duhayon.com' -set folder = "~/.mail/$imap_user" -set spoolfile = '+INBOX' -set postponed = '+Drafts' -set record = '+Sent' -set trash = '+Deleted Items' - -set smtp_url = "smtps://$imap_user@ssl0.ovh.net" -set smtp_pass = "`pass show email/$imap_user`" -set from = "$imap_user" - -# vim: ft=neomuttrc diff --git a/.config/neomutt/ange@yw5n.com b/.config/neomutt/ange@yw5n.com deleted file mode 100644 index 1ff5477..0000000 --- a/.config/neomutt/ange@yw5n.com +++ /dev/null @@ -1,14 +0,0 @@ -source global - -set imap_user = 'ange@yw5n.com' -set folder = "~/.mail/$imap_user" -set spoolfile = '+INBOX' -set postponed = '+Drafts' -set record = '+Sent' -set trash = '+Trash' - -set smtp_url = "smtps://$imap_user@ssl0.ovh.net" -set smtp_pass = "`pass show email/$imap_user`" -set from = "$imap_user" - -# vim: ft=neomuttrc diff --git a/.config/neomutt/global b/.config/neomutt/global deleted file mode 100644 index d957ca4..0000000 --- a/.config/neomutt/global +++ /dev/null @@ -1,5 +0,0 @@ -set mailcap_path = "$XDG_CONFIG_HOME/neomutt/mailcap" -auto_view text/html - -set realname = 'Ange DUHAYON' -set signature = "$XDG_CONFIG_HOME/neomutt/signature.txt" diff --git a/.config/neomutt/mailcap b/.config/neomutt/mailcap deleted file mode 100644 index f93be9a..0000000 --- a/.config/neomutt/mailcap +++ /dev/null @@ -1 +0,0 @@ -text/html; lynx -assume_charset=%{charset} -display_charset=utf-8 -collapse_br_tags -dump %s; nametemplate=%s.html; copiousoutput diff --git a/.config/neomutt/signature.txt b/.config/neomutt/signature.txt deleted file mode 100644 index acdb285..0000000 --- a/.config/neomutt/signature.txt +++ /dev/null @@ -1 +0,0 @@ -Ange DUHAYON diff --git a/.config/newsboat/config b/.config/newsboat/config deleted file mode 100644 index c8a60af..0000000 --- a/.config/newsboat/config +++ /dev/null @@ -1,7 +0,0 @@ -refresh-on-startup yes -reload-threads 8 - -feed-sort-order unreadarticlecount-asc -article-sort-order date-asc - -run-on-startup goto-title "Unread" ; open diff --git a/.config/newsboat/urls b/.config/newsboat/urls deleted file mode 100644 index 76572ef..0000000 --- a/.config/newsboat/urls +++ /dev/null @@ -1,27 +0,0 @@ -https://www.youtube.com/feeds/videos.xml?channel_id=UCI4W-ck8ZLA_YljxMhlpg2g Entertainment "~ChessSimp" -https://www.youtube.com/feeds/videos.xml?channel_id=UCkOSNfdRmKcg4sHHcfrpOcQ Entertainment "~Floydson" -https://www.youtube.com/feeds/videos.xml?channel_id=UCto7D1L-MiRoOziCXK9uT5Q Entertainment "~LetsGameItOut" -https://www.youtube.com/feeds/videos.xml?channel_id=UCRlEFn0L2G_DktbyvN0AZ5A Entertainment "~WadZee" -https://archlinux.org/feeds/news/ Linux "~ArchLinux" -https://odysee.com/$/rss/@BrodieRobertson:5 Linux "~BrodieRobertson" -https://www.debian.org/News/news Linux "~Debian" -https://odysee.com/$/rss/@AlphaNerd:8 Linux "~MentalOutlaw" -https://www.youtube.com/feeds/videos.xml?channel_id=UC5UAwBUum7CPN5buc-_N1Fw Linux "~TheLinuxExperiment" -https://github.com/morpheus65535/bazarr/releases.atom Updates "~Bazarr" -https://github.com/vector-im/element-web/releases.atom Updates "~Element-web" -https://github.com/go-gitea/gitea/releases.atom Updates "~Gitea" -https://github.com/jellyfin/jellyfin/releases.atom Updates "~Jellyfin" -https://github.com/kubernetes/kubernetes/releases.atom Updates "~Kubernetes" -https://github.com/modoboa/modoboa/releases.atom Updates "~Modoboa" -https://www.getmonero.org/feed.xml Updates "~Monero" -https://github.com/nextcloud/server/releases.atom Updates "~Nextcloud" -https://github.com/Prowlarr/Prowlarr/releases.atom Updates "~Prowlarr" -https://github.com/Radarr/Radarr/releases.atom Updates "~Radarr" -https://github.com/Readarr/Readarr/releases.atom Updates "~Readarr" -https://github.com/searxng/searxng/commits/master.atom Updates "~SearXNG" -https://github.com/Sonarr/Sonarr/tags.atom Updates "~Sonarr" -https://github.com/LizardByte/Sunshine/releases.atom Updates "~Sunshine" -https://github.com/element-hq/synapse/releases.atom Updates "~Synapse" -https://github.com/qbittorrent/qBittorrent/tags.atom Updates "~qBittorrent" - -"query:Unread:unread = \"yes\"" diff --git a/.config/newsraft/config b/.config/newsraft/config new file mode 100644 index 0000000..6328908 --- /dev/null +++ b/.config/newsraft/config @@ -0,0 +1,4 @@ +set menu-feed-sorting unread-desc +set menu-item-sorting unread-desc + +bind v exec mpv "%l" diff --git a/.config/newsraft/feeds b/.config/newsraft/feeds new file mode 100644 index 0000000..fa85eca --- /dev/null +++ b/.config/newsraft/feeds @@ -0,0 +1,29 @@ +@ Global [1440] {100} + +@ Entertainment +https://www.youtube.com/feeds/videos.xml?channel_id=UCI4W-ck8ZLA_YljxMhlpg2g "ChessSimp" +https://www.youtube.com/feeds/videos.xml?channel_id=UCkOSNfdRmKcg4sHHcfrpOcQ "Floydson" +https://www.youtube.com/feeds/videos.xml?channel_id=UCto7D1L-MiRoOziCXK9uT5Q "LetsGameItOut" +https://www.youtube.com/feeds/videos.xml?channel_id=UCRlEFn0L2G_DktbyvN0AZ5A "WadZee" + +@ Linux +https://archlinux.org/feeds/news/ "ArchLinux" +https://odysee.com/$/rss/@BrodieRobertson:5 "BrodieRobertson" +https://www.debian.org/News/news "Debian" +https://odysee.com/$/rss/@AlphaNerd:8 "MentalOutlaw" +https://suckless.org/atom.xml "suckless.org" +https://tails.net/news/index.en.rss "Tails" +https://www.youtube.com/feeds/videos.xml?channel_id=UC5UAwBUum7CPN5buc-_N1Fw "TheLinuxExperiment" + +@ Updates +https://github.com/vector-im/element-web/releases.atom "element-web" +https://github.com/go-gitea/gitea/releases.atom "Gitea" +https://github.com/jellyfin/jellyfin/releases.atom "Jellyfin" +https://github.com/kubernetes/kubernetes/releases.atom "Kubernetes" +https://github.com/modoboa/modoboa/releases.atom "Modoboa" +https://www.getmonero.org/feed.xml "Monero" +https://github.com/nextcloud/server/releases.atom "Nextcloud" +https://github.com/searxng/searxng/commits/master.atom "SearXNG" +https://github.com/element-hq/synapse/releases.atom "Synapse" +https://github.com/qbittorrent/qBittorrent/tags.atom "qBittorrent" +https://github.com/ventoy/Ventoy/releases.atom "Ventoy" diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index e177890..7630539 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -12,11 +12,11 @@ vim.opt.cino = "(s" vim.g.python_indent = { open_paren = "shiftwidth()" } vim.opt.list = true ---vim.opt.listchars = { --- tab = "> ", --- trail = "-", --- nbsp = "+", ---} +vim.opt.listchars = { + tab = "> ", + trail = "-", + nbsp = "+", +} vim.opt.number = true vim.opt.relativenumber = true diff --git a/.config/nvim/pack/plugins/opt/telescope b/.config/nvim/pack/plugins/opt/telescope index 7b5c5f5..aa83606 160000 --- a/.config/nvim/pack/plugins/opt/telescope +++ b/.config/nvim/pack/plugins/opt/telescope @@ -1 +1 @@ -Subproject commit 7b5c5f56a21e82fdcfe5b250278b8dfc4b1cbab4 +Subproject commit aa83606299c5beeaf80e656efbf07bde258db7be diff --git a/.config/nvim/pack/plugins/opt/treesitter b/.config/nvim/pack/plugins/opt/treesitter index 1cda981..a47540f 160000 --- a/.config/nvim/pack/plugins/opt/treesitter +++ b/.config/nvim/pack/plugins/opt/treesitter @@ -1 +1 @@ -Subproject commit 1cda98132abfde758c1778096960f9b2c0bd78c1 +Subproject commit a47540fd737eb5c03ee21ee69eb8134ce5568fb6 diff --git a/.config/picom.conf b/.config/picom.conf index 0bf5162..c890908 100644 --- a/.config/picom.conf +++ b/.config/picom.conf @@ -215,6 +215,7 @@ blur-background-exclude = [ # # backend = "glx" backend = "glx"; + # Use higher precision during rendering, and apply dither when presenting the # rendered screen. Reduces banding artifacts, but might cause performance # degradation. Only works with OpenGL. diff --git a/.config/suckless/dmenu-5.2/.gitignore b/.config/suckless/dmenu-5.2/.gitignore deleted file mode 100644 index 28199c1..0000000 --- a/.config/suckless/dmenu-5.2/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -dmenu -stest diff --git a/.config/suckless/dmenu-5.2/LICENSE b/.config/suckless/dmenu-5.2/LICENSE deleted file mode 100644 index 2a64b28..0000000 --- a/.config/suckless/dmenu-5.2/LICENSE +++ /dev/null @@ -1,30 +0,0 @@ -MIT/X Consortium License - -© 2006-2019 Anselm R Garbe -© 2006-2008 Sander van Dijk -© 2006-2007 Michał Janeczek -© 2007 Kris Maglione -© 2009 Gottox -© 2009 Markus Schnalke -© 2009 Evan Gates -© 2010-2012 Connor Lane Smith -© 2014-2022 Hiltjo Posthuma -© 2015-2019 Quentin Rameau - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. diff --git a/.config/suckless/dmenu-5.2/Makefile b/.config/suckless/dmenu-5.2/Makefile deleted file mode 100644 index a03a95c..0000000 --- a/.config/suckless/dmenu-5.2/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# dmenu - dynamic menu -# See LICENSE file for copyright and license details. - -include config.mk - -SRC = drw.c dmenu.c stest.c util.c -OBJ = $(SRC:.c=.o) - -all: options dmenu stest - -options: - @echo dmenu build options: - @echo "CFLAGS = $(CFLAGS)" - @echo "LDFLAGS = $(LDFLAGS)" - @echo "CC = $(CC)" - -.c.o: - $(CC) -c $(CFLAGS) $< - -config.h: - cp config.def.h $@ - -$(OBJ): arg.h config.h config.mk drw.h - -dmenu: dmenu.o drw.o util.o - $(CC) -o $@ dmenu.o drw.o util.o $(LDFLAGS) - -stest: stest.o - $(CC) -o $@ stest.o $(LDFLAGS) - -clean: - rm -f dmenu stest $(OBJ) dmenu-$(VERSION).tar.gz - -dist: clean - mkdir -p dmenu-$(VERSION) - cp LICENSE Makefile README arg.h config.def.h config.mk dmenu.1\ - drw.h util.h dmenu_path dmenu_run stest.1 $(SRC)\ - dmenu-$(VERSION) - tar -cf dmenu-$(VERSION).tar dmenu-$(VERSION) - gzip dmenu-$(VERSION).tar - rm -rf dmenu-$(VERSION) - -install: all - mkdir -p $(DESTDIR)$(PREFIX)/bin - cp -f dmenu dmenu_path dmenu_run stest $(DESTDIR)$(PREFIX)/bin - chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu - chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_path - chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_run - chmod 755 $(DESTDIR)$(PREFIX)/bin/stest - mkdir -p $(DESTDIR)$(MANPREFIX)/man1 - sed "s/VERSION/$(VERSION)/g" < dmenu.1 > $(DESTDIR)$(MANPREFIX)/man1/dmenu.1 - sed "s/VERSION/$(VERSION)/g" < stest.1 > $(DESTDIR)$(MANPREFIX)/man1/stest.1 - chmod 644 $(DESTDIR)$(MANPREFIX)/man1/dmenu.1 - chmod 644 $(DESTDIR)$(MANPREFIX)/man1/stest.1 - -uninstall: - rm -f $(DESTDIR)$(PREFIX)/bin/dmenu\ - $(DESTDIR)$(PREFIX)/bin/dmenu_path\ - $(DESTDIR)$(PREFIX)/bin/dmenu_run\ - $(DESTDIR)$(PREFIX)/bin/stest\ - $(DESTDIR)$(MANPREFIX)/man1/dmenu.1\ - $(DESTDIR)$(MANPREFIX)/man1/stest.1 - -.PHONY: all options clean dist install uninstall diff --git a/.config/suckless/dmenu-5.2/README b/.config/suckless/dmenu-5.2/README deleted file mode 100644 index a8fcdfe..0000000 --- a/.config/suckless/dmenu-5.2/README +++ /dev/null @@ -1,24 +0,0 @@ -dmenu - dynamic menu -==================== -dmenu is an efficient dynamic menu for X. - - -Requirements ------------- -In order to build dmenu you need the Xlib header files. - - -Installation ------------- -Edit config.mk to match your local setup (dmenu is installed into -the /usr/local namespace by default). - -Afterwards enter the following command to build and install dmenu -(if necessary as root): - - make clean install - - -Running dmenu -------------- -See the man page for details. diff --git a/.config/suckless/dmenu-5.2/arg.h b/.config/suckless/dmenu-5.2/arg.h deleted file mode 100644 index e94e02b..0000000 --- a/.config/suckless/dmenu-5.2/arg.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copy me if you can. - * by 20h - */ - -#ifndef ARG_H__ -#define ARG_H__ - -extern char *argv0; - -/* use main(int argc, char *argv[]) */ -#define ARGBEGIN for (argv0 = *argv, argv++, argc--;\ - argv[0] && argv[0][0] == '-'\ - && argv[0][1];\ - argc--, argv++) {\ - char argc_;\ - char **argv_;\ - int brk_;\ - if (argv[0][1] == '-' && argv[0][2] == '\0') {\ - argv++;\ - argc--;\ - break;\ - }\ - for (brk_ = 0, argv[0]++, argv_ = argv;\ - argv[0][0] && !brk_;\ - argv[0]++) {\ - if (argv_ != argv)\ - break;\ - argc_ = argv[0][0];\ - switch (argc_) - -#define ARGEND }\ - } - -#define ARGC() argc_ - -#define EARGF(x) ((argv[0][1] == '\0' && argv[1] == NULL)?\ - ((x), abort(), (char *)0) :\ - (brk_ = 1, (argv[0][1] != '\0')?\ - (&argv[0][1]) :\ - (argc--, argv++, argv[0]))) - -#define ARGF() ((argv[0][1] == '\0' && argv[1] == NULL)?\ - (char *)0 :\ - (brk_ = 1, (argv[0][1] != '\0')?\ - (&argv[0][1]) :\ - (argc--, argv++, argv[0]))) - -#endif diff --git a/.config/suckless/dmenu-5.2/config.def.h b/.config/suckless/dmenu-5.2/config.def.h deleted file mode 100644 index 1edb647..0000000 --- a/.config/suckless/dmenu-5.2/config.def.h +++ /dev/null @@ -1,23 +0,0 @@ -/* See LICENSE file for copyright and license details. */ -/* Default settings; can be overriden by command line. */ - -static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */ -/* -fn option overrides fonts[0]; default X11 font or font set */ -static const char *fonts[] = { - "monospace:size=10" -}; -static const char *prompt = NULL; /* -p option; prompt to the left of input field */ -static const char *colors[SchemeLast][2] = { - /* fg bg */ - [SchemeNorm] = { "#bbbbbb", "#222222" }, - [SchemeSel] = { "#eeeeee", "#005577" }, - [SchemeOut] = { "#000000", "#00ffff" }, -}; -/* -l option; if nonzero, dmenu uses vertical list with given number of lines */ -static unsigned int lines = 0; - -/* - * Characters not considered part of a word while deleting words - * for example: " /?\"&[]" - */ -static const char worddelimiters[] = " "; diff --git a/.config/suckless/dmenu-5.2/config.h b/.config/suckless/dmenu-5.2/config.h deleted file mode 100644 index 1edb647..0000000 --- a/.config/suckless/dmenu-5.2/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* See LICENSE file for copyright and license details. */ -/* Default settings; can be overriden by command line. */ - -static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */ -/* -fn option overrides fonts[0]; default X11 font or font set */ -static const char *fonts[] = { - "monospace:size=10" -}; -static const char *prompt = NULL; /* -p option; prompt to the left of input field */ -static const char *colors[SchemeLast][2] = { - /* fg bg */ - [SchemeNorm] = { "#bbbbbb", "#222222" }, - [SchemeSel] = { "#eeeeee", "#005577" }, - [SchemeOut] = { "#000000", "#00ffff" }, -}; -/* -l option; if nonzero, dmenu uses vertical list with given number of lines */ -static unsigned int lines = 0; - -/* - * Characters not considered part of a word while deleting words - * for example: " /?\"&[]" - */ -static const char worddelimiters[] = " "; diff --git a/.config/suckless/dmenu-5.2/config.mk b/.config/suckless/dmenu-5.2/config.mk deleted file mode 100644 index 566348b..0000000 --- a/.config/suckless/dmenu-5.2/config.mk +++ /dev/null @@ -1,32 +0,0 @@ -# dmenu version -VERSION = 5.2 - -# paths -PREFIX = /usr/local -MANPREFIX = $(PREFIX)/share/man - -X11INC = /usr/X11R6/include -X11LIB = /usr/X11R6/lib - -# Xinerama, comment if you don't want it -XINERAMALIBS = -lXinerama -XINERAMAFLAGS = -DXINERAMA - -# freetype -FREETYPELIBS = -lfontconfig -lXft -FREETYPEINC = /usr/include/freetype2 -# OpenBSD (uncomment) -#FREETYPEINC = $(X11INC)/freetype2 -#MANPREFIX = ${PREFIX}/man - -# includes and libs -INCS = -I$(X11INC) -I$(FREETYPEINC) -LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) - -# flags -CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS) -CFLAGS = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS) -LDFLAGS = $(LIBS) - -# compiler and linker -CC = cc diff --git a/.config/suckless/dmenu-5.2/dmenu.1 b/.config/suckless/dmenu-5.2/dmenu.1 deleted file mode 100644 index 323f93c..0000000 --- a/.config/suckless/dmenu-5.2/dmenu.1 +++ /dev/null @@ -1,194 +0,0 @@ -.TH DMENU 1 dmenu\-VERSION -.SH NAME -dmenu \- dynamic menu -.SH SYNOPSIS -.B dmenu -.RB [ \-bfiv ] -.RB [ \-l -.IR lines ] -.RB [ \-m -.IR monitor ] -.RB [ \-p -.IR prompt ] -.RB [ \-fn -.IR font ] -.RB [ \-nb -.IR color ] -.RB [ \-nf -.IR color ] -.RB [ \-sb -.IR color ] -.RB [ \-sf -.IR color ] -.RB [ \-w -.IR windowid ] -.P -.BR dmenu_run " ..." -.SH DESCRIPTION -.B dmenu -is a dynamic menu for X, which reads a list of newline\-separated items from -stdin. When the user selects an item and presses Return, their choice is printed -to stdout and dmenu terminates. Entering text will narrow the items to those -matching the tokens in the input. -.P -.B dmenu_run -is a script used by -.IR dwm (1) -which lists programs in the user's $PATH and runs the result in their $SHELL. -.SH OPTIONS -.TP -.B \-b -dmenu appears at the bottom of the screen. -.TP -.B \-f -dmenu grabs the keyboard before reading stdin if not reading from a tty. This -is faster, but will lock up X until stdin reaches end\-of\-file. -.TP -.B \-i -dmenu matches menu items case insensitively. -.TP -.BI \-l " lines" -dmenu lists items vertically, with the given number of lines. -.TP -.BI \-m " monitor" -dmenu is displayed on the monitor number supplied. Monitor numbers are starting -from 0. -.TP -.BI \-p " prompt" -defines the prompt to be displayed to the left of the input field. -.TP -.BI \-fn " font" -defines the font or font set used. -.TP -.BI \-nb " color" -defines the normal background color. -.IR #RGB , -.IR #RRGGBB , -and X color names are supported. -.TP -.BI \-nf " color" -defines the normal foreground color. -.TP -.BI \-sb " color" -defines the selected background color. -.TP -.BI \-sf " color" -defines the selected foreground color. -.TP -.B \-v -prints version information to stdout, then exits. -.TP -.BI \-w " windowid" -embed into windowid. -.SH USAGE -dmenu is completely controlled by the keyboard. Items are selected using the -arrow keys, page up, page down, home, and end. -.TP -.B Tab -Copy the selected item to the input field. -.TP -.B Return -Confirm selection. Prints the selected item to stdout and exits, returning -success. -.TP -.B Ctrl-Return -Confirm selection. Prints the selected item to stdout and continues. -.TP -.B Shift\-Return -Confirm input. Prints the input text to stdout and exits, returning success. -.TP -.B Escape -Exit without selecting an item, returning failure. -.TP -.B Ctrl-Left -Move cursor to the start of the current word -.TP -.B Ctrl-Right -Move cursor to the end of the current word -.TP -.B C\-a -Home -.TP -.B C\-b -Left -.TP -.B C\-c -Escape -.TP -.B C\-d -Delete -.TP -.B C\-e -End -.TP -.B C\-f -Right -.TP -.B C\-g -Escape -.TP -.B C\-h -Backspace -.TP -.B C\-i -Tab -.TP -.B C\-j -Return -.TP -.B C\-J -Shift-Return -.TP -.B C\-k -Delete line right -.TP -.B C\-m -Return -.TP -.B C\-M -Shift-Return -.TP -.B C\-n -Down -.TP -.B C\-p -Up -.TP -.B C\-u -Delete line left -.TP -.B C\-w -Delete word left -.TP -.B C\-y -Paste from primary X selection -.TP -.B C\-Y -Paste from X clipboard -.TP -.B M\-b -Move cursor to the start of the current word -.TP -.B M\-f -Move cursor to the end of the current word -.TP -.B M\-g -Home -.TP -.B M\-G -End -.TP -.B M\-h -Up -.TP -.B M\-j -Page down -.TP -.B M\-k -Page up -.TP -.B M\-l -Down -.SH SEE ALSO -.IR dwm (1), -.IR stest (1) diff --git a/.config/suckless/dmenu-5.2/dmenu.c b/.config/suckless/dmenu-5.2/dmenu.c deleted file mode 100644 index 7cf253b..0000000 --- a/.config/suckless/dmenu-5.2/dmenu.c +++ /dev/null @@ -1,791 +0,0 @@ -/* See LICENSE file for copyright and license details. */ -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#ifdef XINERAMA -#include -#endif -#include - -#include "drw.h" -#include "util.h" - -/* macros */ -#define INTERSECT(x,y,w,h,r) (MAX(0, MIN((x)+(w),(r).x_org+(r).width) - MAX((x),(r).x_org)) \ - * MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org))) -#define LENGTH(X) (sizeof X / sizeof X[0]) -#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) - -/* enums */ -enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */ - -struct item { - char *text; - struct item *left, *right; - int out; -}; - -static char text[BUFSIZ] = ""; -static char *embed; -static int bh, mw, mh; -static int inputw = 0, promptw; -static int lrpad; /* sum of left and right padding */ -static size_t cursor; -static struct item *items = NULL; -static struct item *matches, *matchend; -static struct item *prev, *curr, *next, *sel; -static int mon = -1, screen; - -static Atom clip, utf8; -static Display *dpy; -static Window root, parentwin, win; -static XIC xic; - -static Drw *drw; -static Clr *scheme[SchemeLast]; - -#include "config.h" - -static int (*fstrncmp)(const char *, const char *, size_t) = strncmp; -static char *(*fstrstr)(const char *, const char *) = strstr; - -static unsigned int -textw_clamp(const char *str, unsigned int n) -{ - unsigned int w = drw_fontset_getwidth_clamp(drw, str, n) + lrpad; - return MIN(w, n); -} - -static void -appenditem(struct item *item, struct item **list, struct item **last) -{ - if (*last) - (*last)->right = item; - else - *list = item; - - item->left = *last; - item->right = NULL; - *last = item; -} - -static void -calcoffsets(void) -{ - int i, n; - - if (lines > 0) - n = lines * bh; - else - n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">")); - /* calculate which items will begin the next page and previous page */ - for (i = 0, next = curr; next; next = next->right) - if ((i += (lines > 0) ? bh : textw_clamp(next->text, n)) > n) - break; - for (i = 0, prev = curr; prev && prev->left; prev = prev->left) - if ((i += (lines > 0) ? bh : textw_clamp(prev->left->text, n)) > n) - break; -} - -static void -cleanup(void) -{ - size_t i; - - XUngrabKey(dpy, AnyKey, AnyModifier, root); - for (i = 0; i < SchemeLast; i++) - free(scheme[i]); - for (i = 0; items && items[i].text; ++i) - free(items[i].text); - free(items); - drw_free(drw); - XSync(dpy, False); - XCloseDisplay(dpy); -} - -static char * -cistrstr(const char *h, const char *n) -{ - size_t i; - - if (!n[0]) - return (char *)h; - - for (; *h; ++h) { - for (i = 0; n[i] && tolower((unsigned char)n[i]) == - tolower((unsigned char)h[i]); ++i) - ; - if (n[i] == '\0') - return (char *)h; - } - return NULL; -} - -static int -drawitem(struct item *item, int x, int y, int w) -{ - if (item == sel) - drw_setscheme(drw, scheme[SchemeSel]); - else if (item->out) - drw_setscheme(drw, scheme[SchemeOut]); - else - drw_setscheme(drw, scheme[SchemeNorm]); - - return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0); -} - -static void -drawmenu(void) -{ - unsigned int curpos; - struct item *item; - int x = 0, y = 0, w; - - drw_setscheme(drw, scheme[SchemeNorm]); - drw_rect(drw, 0, 0, mw, mh, 1, 1); - - if (prompt && *prompt) { - drw_setscheme(drw, scheme[SchemeSel]); - x = drw_text(drw, x, 0, promptw, bh, lrpad / 2, prompt, 0); - } - /* draw input field */ - w = (lines > 0 || !matches) ? mw - x : inputw; - drw_setscheme(drw, scheme[SchemeNorm]); - drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0); - - curpos = TEXTW(text) - TEXTW(&text[cursor]); - if ((curpos += lrpad / 2 - 1) < w) { - drw_setscheme(drw, scheme[SchemeNorm]); - drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0); - } - - if (lines > 0) { - /* draw vertical list */ - for (item = curr; item != next; item = item->right) - drawitem(item, x, y += bh, mw - x); - } else if (matches) { - /* draw horizontal list */ - x += inputw; - w = TEXTW("<"); - if (curr->left) { - drw_setscheme(drw, scheme[SchemeNorm]); - drw_text(drw, x, 0, w, bh, lrpad / 2, "<", 0); - } - x += w; - for (item = curr; item != next; item = item->right) - x = drawitem(item, x, 0, textw_clamp(item->text, mw - x - TEXTW(">"))); - if (next) { - w = TEXTW(">"); - drw_setscheme(drw, scheme[SchemeNorm]); - drw_text(drw, mw - w, 0, w, bh, lrpad / 2, ">", 0); - } - } - drw_map(drw, win, 0, 0, mw, mh); -} - -static void -grabfocus(void) -{ - struct timespec ts = { .tv_sec = 0, .tv_nsec = 10000000 }; - Window focuswin; - int i, revertwin; - - for (i = 0; i < 100; ++i) { - XGetInputFocus(dpy, &focuswin, &revertwin); - if (focuswin == win) - return; - XSetInputFocus(dpy, win, RevertToParent, CurrentTime); - nanosleep(&ts, NULL); - } - die("cannot grab focus"); -} - -static void -grabkeyboard(void) -{ - struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000 }; - int i; - - if (embed) - return; - /* try to grab keyboard, we may have to wait for another process to ungrab */ - for (i = 0; i < 1000; i++) { - if (XGrabKeyboard(dpy, DefaultRootWindow(dpy), True, GrabModeAsync, - GrabModeAsync, CurrentTime) == GrabSuccess) - return; - nanosleep(&ts, NULL); - } - die("cannot grab keyboard"); -} - -static void -match(void) -{ - static char **tokv = NULL; - static int tokn = 0; - - char buf[sizeof text], *s; - int i, tokc = 0; - size_t len, textsize; - struct item *item, *lprefix, *lsubstr, *prefixend, *substrend; - - strcpy(buf, text); - /* separate input text into tokens to be matched individually */ - for (s = strtok(buf, " "); s; tokv[tokc - 1] = s, s = strtok(NULL, " ")) - if (++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv))) - die("cannot realloc %zu bytes:", tokn * sizeof *tokv); - len = tokc ? strlen(tokv[0]) : 0; - - matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL; - textsize = strlen(text) + 1; - for (item = items; item && item->text; item++) { - for (i = 0; i < tokc; i++) - if (!fstrstr(item->text, tokv[i])) - break; - if (i != tokc) /* not all tokens match */ - continue; - /* exact matches go first, then prefixes, then substrings */ - if (!tokc || !fstrncmp(text, item->text, textsize)) - appenditem(item, &matches, &matchend); - else if (!fstrncmp(tokv[0], item->text, len)) - appenditem(item, &lprefix, &prefixend); - else - appenditem(item, &lsubstr, &substrend); - } - if (lprefix) { - if (matches) { - matchend->right = lprefix; - lprefix->left = matchend; - } else - matches = lprefix; - matchend = prefixend; - } - if (lsubstr) { - if (matches) { - matchend->right = lsubstr; - lsubstr->left = matchend; - } else - matches = lsubstr; - matchend = substrend; - } - curr = sel = matches; - calcoffsets(); -} - -static void -insert(const char *str, ssize_t n) -{ - if (strlen(text) + n > sizeof text - 1) - return; - /* move existing text out of the way, insert new text, and update cursor */ - memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0)); - if (n > 0) - memcpy(&text[cursor], str, n); - cursor += n; - match(); -} - -static size_t -nextrune(int inc) -{ - ssize_t n; - - /* return location of next utf8 rune in the given direction (+1 or -1) */ - for (n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc) - ; - return n; -} - -static void -movewordedge(int dir) -{ - if (dir < 0) { /* move cursor to the start of the word*/ - while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)])) - cursor = nextrune(-1); - while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)])) - cursor = nextrune(-1); - } else { /* move cursor to the end of the word */ - while (text[cursor] && strchr(worddelimiters, text[cursor])) - cursor = nextrune(+1); - while (text[cursor] && !strchr(worddelimiters, text[cursor])) - cursor = nextrune(+1); - } -} - -static void -keypress(XKeyEvent *ev) -{ - char buf[32]; - int len; - KeySym ksym; - Status status; - - len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status); - switch (status) { - default: /* XLookupNone, XBufferOverflow */ - return; - case XLookupChars: - goto insert; - case XLookupKeySym: - case XLookupBoth: - break; - } - - if (ev->state & ControlMask) { - switch(ksym) { - case XK_a: ksym = XK_Home; break; - case XK_b: ksym = XK_Left; break; - case XK_c: ksym = XK_Escape; break; - case XK_d: ksym = XK_Delete; break; - case XK_e: ksym = XK_End; break; - case XK_f: ksym = XK_Right; break; - case XK_g: ksym = XK_Escape; break; - case XK_h: ksym = XK_BackSpace; break; - case XK_i: ksym = XK_Tab; break; - case XK_j: /* fallthrough */ - case XK_J: /* fallthrough */ - case XK_m: /* fallthrough */ - case XK_M: ksym = XK_Return; ev->state &= ~ControlMask; break; - case XK_n: ksym = XK_Down; break; - case XK_p: ksym = XK_Up; break; - - case XK_k: /* delete right */ - text[cursor] = '\0'; - match(); - break; - case XK_u: /* delete left */ - insert(NULL, 0 - cursor); - break; - case XK_w: /* delete word */ - while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)])) - insert(NULL, nextrune(-1) - cursor); - while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)])) - insert(NULL, nextrune(-1) - cursor); - break; - case XK_y: /* paste selection */ - case XK_Y: - XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY, - utf8, utf8, win, CurrentTime); - return; - case XK_Left: - case XK_KP_Left: - movewordedge(-1); - goto draw; - case XK_Right: - case XK_KP_Right: - movewordedge(+1); - goto draw; - case XK_Return: - case XK_KP_Enter: - break; - case XK_bracketleft: - cleanup(); - exit(1); - default: - return; - } - } else if (ev->state & Mod1Mask) { - switch(ksym) { - case XK_b: - movewordedge(-1); - goto draw; - case XK_f: - movewordedge(+1); - goto draw; - case XK_g: ksym = XK_Home; break; - case XK_G: ksym = XK_End; break; - case XK_h: ksym = XK_Up; break; - case XK_j: ksym = XK_Next; break; - case XK_k: ksym = XK_Prior; break; - case XK_l: ksym = XK_Down; break; - default: - return; - } - } - - switch(ksym) { - default: -insert: - if (!iscntrl((unsigned char)*buf)) - insert(buf, len); - break; - case XK_Delete: - case XK_KP_Delete: - if (text[cursor] == '\0') - return; - cursor = nextrune(+1); - /* fallthrough */ - case XK_BackSpace: - if (cursor == 0) - return; - insert(NULL, nextrune(-1) - cursor); - break; - case XK_End: - case XK_KP_End: - if (text[cursor] != '\0') { - cursor = strlen(text); - break; - } - if (next) { - /* jump to end of list and position items in reverse */ - curr = matchend; - calcoffsets(); - curr = prev; - calcoffsets(); - while (next && (curr = curr->right)) - calcoffsets(); - } - sel = matchend; - break; - case XK_Escape: - cleanup(); - exit(1); - case XK_Home: - case XK_KP_Home: - if (sel == matches) { - cursor = 0; - break; - } - sel = curr = matches; - calcoffsets(); - break; - case XK_Left: - case XK_KP_Left: - if (cursor > 0 && (!sel || !sel->left || lines > 0)) { - cursor = nextrune(-1); - break; - } - if (lines > 0) - return; - /* fallthrough */ - case XK_Up: - case XK_KP_Up: - if (sel && sel->left && (sel = sel->left)->right == curr) { - curr = prev; - calcoffsets(); - } - break; - case XK_Next: - case XK_KP_Next: - if (!next) - return; - sel = curr = next; - calcoffsets(); - break; - case XK_Prior: - case XK_KP_Prior: - if (!prev) - return; - sel = curr = prev; - calcoffsets(); - break; - case XK_Return: - case XK_KP_Enter: - puts((sel && !(ev->state & ShiftMask)) ? sel->text : text); - if (!(ev->state & ControlMask)) { - cleanup(); - exit(0); - } - if (sel) - sel->out = 1; - break; - case XK_Right: - case XK_KP_Right: - if (text[cursor] != '\0') { - cursor = nextrune(+1); - break; - } - if (lines > 0) - return; - /* fallthrough */ - case XK_Down: - case XK_KP_Down: - if (sel && sel->right && (sel = sel->right) == next) { - curr = next; - calcoffsets(); - } - break; - case XK_Tab: - if (!sel) - return; - cursor = strnlen(sel->text, sizeof text - 1); - memcpy(text, sel->text, cursor); - text[cursor] = '\0'; - match(); - break; - } - -draw: - drawmenu(); -} - -static void -paste(void) -{ - char *p, *q; - int di; - unsigned long dl; - Atom da; - - /* we have been given the current selection, now insert it into input */ - if (XGetWindowProperty(dpy, win, utf8, 0, (sizeof text / 4) + 1, False, - utf8, &da, &di, &dl, &dl, (unsigned char **)&p) - == Success && p) { - insert(p, (q = strchr(p, '\n')) ? q - p : (ssize_t)strlen(p)); - XFree(p); - } - drawmenu(); -} - -static void -readstdin(void) -{ - char *line = NULL; - size_t i, junk, size = 0; - ssize_t len; - - /* read each line from stdin and add it to the item list */ - for (i = 0; (len = getline(&line, &junk, stdin)) != -1; i++, line = NULL) { - if (i + 1 >= size / sizeof *items) - if (!(items = realloc(items, (size += BUFSIZ)))) - die("cannot realloc %zu bytes:", size); - if (line[len - 1] == '\n') - line[len - 1] = '\0'; - items[i].text = line; - items[i].out = 0; - } - if (items) - items[i].text = NULL; - lines = MIN(lines, i); -} - -static void -run(void) -{ - XEvent ev; - - while (!XNextEvent(dpy, &ev)) { - if (XFilterEvent(&ev, win)) - continue; - switch(ev.type) { - case DestroyNotify: - if (ev.xdestroywindow.window != win) - break; - cleanup(); - exit(1); - case Expose: - if (ev.xexpose.count == 0) - drw_map(drw, win, 0, 0, mw, mh); - break; - case FocusIn: - /* regrab focus from parent window */ - if (ev.xfocus.window != win) - grabfocus(); - break; - case KeyPress: - keypress(&ev.xkey); - break; - case SelectionNotify: - if (ev.xselection.property == utf8) - paste(); - break; - case VisibilityNotify: - if (ev.xvisibility.state != VisibilityUnobscured) - XRaiseWindow(dpy, win); - break; - } - } -} - -static void -setup(void) -{ - int x, y, i, j; - unsigned int du; - XSetWindowAttributes swa; - XIM xim; - Window w, dw, *dws; - XWindowAttributes wa; - XClassHint ch = {"dmenu", "dmenu"}; -#ifdef XINERAMA - XineramaScreenInfo *info; - Window pw; - int a, di, n, area = 0; -#endif - /* init appearance */ - for (j = 0; j < SchemeLast; j++) - scheme[j] = drw_scm_create(drw, colors[j], 2); - - clip = XInternAtom(dpy, "CLIPBOARD", False); - utf8 = XInternAtom(dpy, "UTF8_STRING", False); - - /* calculate menu geometry */ - bh = drw->fonts->h + 2; - lines = MAX(lines, 0); - mh = (lines + 1) * bh; -#ifdef XINERAMA - i = 0; - if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) { - XGetInputFocus(dpy, &w, &di); - if (mon >= 0 && mon < n) - i = mon; - else if (w != root && w != PointerRoot && w != None) { - /* find top-level window containing current input focus */ - do { - if (XQueryTree(dpy, (pw = w), &dw, &w, &dws, &du) && dws) - XFree(dws); - } while (w != root && w != pw); - /* find xinerama screen with which the window intersects most */ - if (XGetWindowAttributes(dpy, pw, &wa)) - for (j = 0; j < n; j++) - if ((a = INTERSECT(wa.x, wa.y, wa.width, wa.height, info[j])) > area) { - area = a; - i = j; - } - } - /* no focused window is on screen, so use pointer location instead */ - if (mon < 0 && !area && XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du)) - for (i = 0; i < n; i++) - if (INTERSECT(x, y, 1, 1, info[i]) != 0) - break; - - x = info[i].x_org; - y = info[i].y_org + (topbar ? 0 : info[i].height - mh); - mw = info[i].width; - XFree(info); - } else -#endif - { - if (!XGetWindowAttributes(dpy, parentwin, &wa)) - die("could not get embedding window attributes: 0x%lx", - parentwin); - x = 0; - y = topbar ? 0 : wa.height - mh; - mw = wa.width; - } - promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0; - inputw = mw / 3; /* input width: ~33% of monitor width */ - match(); - - /* create menu window */ - swa.override_redirect = True; - swa.background_pixel = scheme[SchemeNorm][ColBg].pixel; - swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask; - win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0, - CopyFromParent, CopyFromParent, CopyFromParent, - CWOverrideRedirect | CWBackPixel | CWEventMask, &swa); - XSetClassHint(dpy, win, &ch); - - - /* input methods */ - if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL) - die("XOpenIM failed: could not open input device"); - - xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing, - XNClientWindow, win, XNFocusWindow, win, NULL); - - XMapRaised(dpy, win); - if (embed) { - XSelectInput(dpy, parentwin, FocusChangeMask | SubstructureNotifyMask); - if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) { - for (i = 0; i < du && dws[i] != win; ++i) - XSelectInput(dpy, dws[i], FocusChangeMask); - XFree(dws); - } - grabfocus(); - } - drw_resize(drw, mw, mh); - drawmenu(); -} - -static void -usage(void) -{ - die("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" - " [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]"); -} - -int -main(int argc, char *argv[]) -{ - XWindowAttributes wa; - int i, fast = 0; - - for (i = 1; i < argc; i++) - /* these options take no arguments */ - if (!strcmp(argv[i], "-v")) { /* prints version information */ - puts("dmenu-"VERSION); - exit(0); - } else if (!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */ - topbar = 0; - else if (!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */ - fast = 1; - else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */ - fstrncmp = strncasecmp; - fstrstr = cistrstr; - } else if (i + 1 == argc) - usage(); - /* these options take one argument */ - else if (!strcmp(argv[i], "-l")) /* number of lines in vertical list */ - lines = atoi(argv[++i]); - else if (!strcmp(argv[i], "-m")) - mon = atoi(argv[++i]); - else if (!strcmp(argv[i], "-p")) /* adds prompt to left of input field */ - prompt = argv[++i]; - else if (!strcmp(argv[i], "-fn")) /* font or font set */ - fonts[0] = argv[++i]; - else if (!strcmp(argv[i], "-nb")) /* normal background color */ - colors[SchemeNorm][ColBg] = argv[++i]; - else if (!strcmp(argv[i], "-nf")) /* normal foreground color */ - colors[SchemeNorm][ColFg] = argv[++i]; - else if (!strcmp(argv[i], "-sb")) /* selected background color */ - colors[SchemeSel][ColBg] = argv[++i]; - else if (!strcmp(argv[i], "-sf")) /* selected foreground color */ - colors[SchemeSel][ColFg] = argv[++i]; - else if (!strcmp(argv[i], "-w")) /* embedding window id */ - embed = argv[++i]; - else - usage(); - - if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) - fputs("warning: no locale support\n", stderr); - if (!(dpy = XOpenDisplay(NULL))) - die("cannot open display"); - screen = DefaultScreen(dpy); - root = RootWindow(dpy, screen); - if (!embed || !(parentwin = strtol(embed, NULL, 0))) - parentwin = root; - if (!XGetWindowAttributes(dpy, parentwin, &wa)) - die("could not get embedding window attributes: 0x%lx", - parentwin); - drw = drw_create(dpy, screen, root, wa.width, wa.height); - if (!drw_fontset_create(drw, fonts, LENGTH(fonts))) - die("no fonts could be loaded."); - lrpad = drw->fonts->h; - -#ifdef __OpenBSD__ - if (pledge("stdio rpath", NULL) == -1) - die("pledge"); -#endif - - if (fast && !isatty(0)) { - grabkeyboard(); - readstdin(); - } else { - readstdin(); - grabkeyboard(); - } - setup(); - run(); - - return 1; /* unreachable */ -} diff --git a/.config/suckless/dmenu-5.2/dmenu_path b/.config/suckless/dmenu-5.2/dmenu_path deleted file mode 100755 index 3a7cda7..0000000 --- a/.config/suckless/dmenu-5.2/dmenu_path +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -cachedir="${XDG_CACHE_HOME:-"$HOME/.cache"}" -cache="$cachedir/dmenu_run" - -[ ! -e "$cachedir" ] && mkdir -p "$cachedir" - -IFS=: -if stest -dqr -n "$cache" $PATH; then - stest -flx $PATH | sort -u | tee "$cache" -else - cat "$cache" -fi diff --git a/.config/suckless/dmenu-5.2/dmenu_run b/.config/suckless/dmenu-5.2/dmenu_run deleted file mode 100755 index 834ede5..0000000 --- a/.config/suckless/dmenu-5.2/dmenu_run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -dmenu_path | dmenu "$@" | ${SHELL:-"/bin/sh"} & diff --git a/.config/suckless/dmenu-5.2/drw.c b/.config/suckless/dmenu-5.2/drw.c deleted file mode 100644 index a58a2b4..0000000 --- a/.config/suckless/dmenu-5.2/drw.c +++ /dev/null @@ -1,450 +0,0 @@ -/* See LICENSE file for copyright and license details. */ -#include -#include -#include -#include -#include - -#include "drw.h" -#include "util.h" - -#define UTF_INVALID 0xFFFD -#define UTF_SIZ 4 - -static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0}; -static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8}; -static const long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000}; -static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF}; - -static long -utf8decodebyte(const char c, size_t *i) -{ - for (*i = 0; *i < (UTF_SIZ + 1); ++(*i)) - if (((unsigned char)c & utfmask[*i]) == utfbyte[*i]) - return (unsigned char)c & ~utfmask[*i]; - return 0; -} - -static size_t -utf8validate(long *u, size_t i) -{ - if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF)) - *u = UTF_INVALID; - for (i = 1; *u > utfmax[i]; ++i) - ; - return i; -} - -static size_t -utf8decode(const char *c, long *u, size_t clen) -{ - size_t i, j, len, type; - long udecoded; - - *u = UTF_INVALID; - if (!clen) - return 0; - udecoded = utf8decodebyte(c[0], &len); - if (!BETWEEN(len, 1, UTF_SIZ)) - return 1; - for (i = 1, j = 1; i < clen && j < len; ++i, ++j) { - udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type); - if (type) - return j; - } - if (j < len) - return 0; - *u = udecoded; - utf8validate(u, len); - - return len; -} - -Drw * -drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h) -{ - Drw *drw = ecalloc(1, sizeof(Drw)); - - drw->dpy = dpy; - drw->screen = screen; - drw->root = root; - drw->w = w; - drw->h = h; - drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen)); - drw->gc = XCreateGC(dpy, root, 0, NULL); - XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter); - - return drw; -} - -void -drw_resize(Drw *drw, unsigned int w, unsigned int h) -{ - if (!drw) - return; - - drw->w = w; - drw->h = h; - if (drw->drawable) - XFreePixmap(drw->dpy, drw->drawable); - drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen)); -} - -void -drw_free(Drw *drw) -{ - XFreePixmap(drw->dpy, drw->drawable); - XFreeGC(drw->dpy, drw->gc); - drw_fontset_free(drw->fonts); - free(drw); -} - -/* This function is an implementation detail. Library users should use - * drw_fontset_create instead. - */ -static Fnt * -xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern) -{ - Fnt *font; - XftFont *xfont = NULL; - FcPattern *pattern = NULL; - - if (fontname) { - /* Using the pattern found at font->xfont->pattern does not yield the - * same substitution results as using the pattern returned by - * FcNameParse; using the latter results in the desired fallback - * behaviour whereas the former just results in missing-character - * rectangles being drawn, at least with some fonts. */ - if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) { - fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname); - return NULL; - } - if (!(pattern = FcNameParse((FcChar8 *) fontname))) { - fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname); - XftFontClose(drw->dpy, xfont); - return NULL; - } - } else if (fontpattern) { - if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) { - fprintf(stderr, "error, cannot load font from pattern.\n"); - return NULL; - } - } else { - die("no font specified."); - } - - font = ecalloc(1, sizeof(Fnt)); - font->xfont = xfont; - font->pattern = pattern; - font->h = xfont->ascent + xfont->descent; - font->dpy = drw->dpy; - - return font; -} - -static void -xfont_free(Fnt *font) -{ - if (!font) - return; - if (font->pattern) - FcPatternDestroy(font->pattern); - XftFontClose(font->dpy, font->xfont); - free(font); -} - -Fnt* -drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount) -{ - Fnt *cur, *ret = NULL; - size_t i; - - if (!drw || !fonts) - return NULL; - - for (i = 1; i <= fontcount; i++) { - if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) { - cur->next = ret; - ret = cur; - } - } - return (drw->fonts = ret); -} - -void -drw_fontset_free(Fnt *font) -{ - if (font) { - drw_fontset_free(font->next); - xfont_free(font); - } -} - -void -drw_clr_create(Drw *drw, Clr *dest, const char *clrname) -{ - if (!drw || !dest || !clrname) - return; - - if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen), - DefaultColormap(drw->dpy, drw->screen), - clrname, dest)) - die("error, cannot allocate color '%s'", clrname); -} - -/* Wrapper to create color schemes. The caller has to call free(3) on the - * returned color scheme when done using it. */ -Clr * -drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount) -{ - size_t i; - Clr *ret; - - /* need at least two colors for a scheme */ - if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor)))) - return NULL; - - for (i = 0; i < clrcount; i++) - drw_clr_create(drw, &ret[i], clrnames[i]); - return ret; -} - -void -drw_setfontset(Drw *drw, Fnt *set) -{ - if (drw) - drw->fonts = set; -} - -void -drw_setscheme(Drw *drw, Clr *scm) -{ - if (drw) - drw->scheme = scm; -} - -void -drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert) -{ - if (!drw || !drw->scheme) - return; - XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel); - if (filled) - XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); - else - XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1); -} - -int -drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert) -{ - int i, ty, ellipsis_x = 0; - unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len; - XftDraw *d = NULL; - Fnt *usedfont, *curfont, *nextfont; - int utf8strlen, utf8charlen, render = x || y || w || h; - long utf8codepoint = 0; - const char *utf8str; - FcCharSet *fccharset; - FcPattern *fcpattern; - FcPattern *match; - XftResult result; - int charexists = 0, overflow = 0; - /* keep track of a couple codepoints for which we have no match. */ - enum { nomatches_len = 64 }; - static struct { long codepoint[nomatches_len]; unsigned int idx; } nomatches; - static unsigned int ellipsis_width = 0; - - if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts) - return 0; - - if (!render) { - w = invert ? invert : ~invert; - } else { - XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel); - XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); - d = XftDrawCreate(drw->dpy, drw->drawable, - DefaultVisual(drw->dpy, drw->screen), - DefaultColormap(drw->dpy, drw->screen)); - x += lpad; - w -= lpad; - } - - usedfont = drw->fonts; - if (!ellipsis_width && render) - ellipsis_width = drw_fontset_getwidth(drw, "..."); - while (1) { - ew = ellipsis_len = utf8strlen = 0; - utf8str = text; - nextfont = NULL; - while (*text) { - utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ); - for (curfont = drw->fonts; curfont; curfont = curfont->next) { - charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint); - if (charexists) { - drw_font_getexts(curfont, text, utf8charlen, &tmpw, NULL); - if (ew + ellipsis_width <= w) { - /* keep track where the ellipsis still fits */ - ellipsis_x = x + ew; - ellipsis_w = w - ew; - ellipsis_len = utf8strlen; - } - - if (ew + tmpw > w) { - overflow = 1; - /* called from drw_fontset_getwidth_clamp(): - * it wants the width AFTER the overflow - */ - if (!render) - x += tmpw; - else - utf8strlen = ellipsis_len; - } else if (curfont == usedfont) { - utf8strlen += utf8charlen; - text += utf8charlen; - ew += tmpw; - } else { - nextfont = curfont; - } - break; - } - } - - if (overflow || !charexists || nextfont) - break; - else - charexists = 0; - } - - if (utf8strlen) { - if (render) { - ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent; - XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg], - usedfont->xfont, x, ty, (XftChar8 *)utf8str, utf8strlen); - } - x += ew; - w -= ew; - } - if (render && overflow) - drw_text(drw, ellipsis_x, y, ellipsis_w, h, 0, "...", invert); - - if (!*text || overflow) { - break; - } else if (nextfont) { - charexists = 0; - usedfont = nextfont; - } else { - /* Regardless of whether or not a fallback font is found, the - * character must be drawn. */ - charexists = 1; - - for (i = 0; i < nomatches_len; ++i) { - /* avoid calling XftFontMatch if we know we won't find a match */ - if (utf8codepoint == nomatches.codepoint[i]) - goto no_match; - } - - fccharset = FcCharSetCreate(); - FcCharSetAddChar(fccharset, utf8codepoint); - - if (!drw->fonts->pattern) { - /* Refer to the comment in xfont_create for more information. */ - die("the first font in the cache must be loaded from a font string."); - } - - fcpattern = FcPatternDuplicate(drw->fonts->pattern); - FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); - FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue); - - FcConfigSubstitute(NULL, fcpattern, FcMatchPattern); - FcDefaultSubstitute(fcpattern); - match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result); - - FcCharSetDestroy(fccharset); - FcPatternDestroy(fcpattern); - - if (match) { - usedfont = xfont_create(drw, NULL, match); - if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) { - for (curfont = drw->fonts; curfont->next; curfont = curfont->next) - ; /* NOP */ - curfont->next = usedfont; - } else { - xfont_free(usedfont); - nomatches.codepoint[++nomatches.idx % nomatches_len] = utf8codepoint; -no_match: - usedfont = drw->fonts; - } - } - } - } - if (d) - XftDrawDestroy(d); - - return x + (render ? w : 0); -} - -void -drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) -{ - if (!drw) - return; - - XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y); - XSync(drw->dpy, False); -} - -unsigned int -drw_fontset_getwidth(Drw *drw, const char *text) -{ - if (!drw || !drw->fonts || !text) - return 0; - return drw_text(drw, 0, 0, 0, 0, 0, text, 0); -} - -unsigned int -drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n) -{ - unsigned int tmp = 0; - if (drw && drw->fonts && text && n) - tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n); - return MIN(n, tmp); -} - -void -drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h) -{ - XGlyphInfo ext; - - if (!font || !text) - return; - - XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext); - if (w) - *w = ext.xOff; - if (h) - *h = font->h; -} - -Cur * -drw_cur_create(Drw *drw, int shape) -{ - Cur *cur; - - if (!drw || !(cur = ecalloc(1, sizeof(Cur)))) - return NULL; - - cur->cursor = XCreateFontCursor(drw->dpy, shape); - - return cur; -} - -void -drw_cur_free(Drw *drw, Cur *cursor) -{ - if (!cursor) - return; - - XFreeCursor(drw->dpy, cursor->cursor); - free(cursor); -} diff --git a/.config/suckless/dmenu-5.2/drw.h b/.config/suckless/dmenu-5.2/drw.h deleted file mode 100644 index fd7631b..0000000 --- a/.config/suckless/dmenu-5.2/drw.h +++ /dev/null @@ -1,58 +0,0 @@ -/* See LICENSE file for copyright and license details. */ - -typedef struct { - Cursor cursor; -} Cur; - -typedef struct Fnt { - Display *dpy; - unsigned int h; - XftFont *xfont; - FcPattern *pattern; - struct Fnt *next; -} Fnt; - -enum { ColFg, ColBg }; /* Clr scheme index */ -typedef XftColor Clr; - -typedef struct { - unsigned int w, h; - Display *dpy; - int screen; - Window root; - Drawable drawable; - GC gc; - Clr *scheme; - Fnt *fonts; -} Drw; - -/* Drawable abstraction */ -Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h); -void drw_resize(Drw *drw, unsigned int w, unsigned int h); -void drw_free(Drw *drw); - -/* Fnt abstraction */ -Fnt *drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount); -void drw_fontset_free(Fnt* set); -unsigned int drw_fontset_getwidth(Drw *drw, const char *text); -unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n); -void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h); - -/* Colorscheme abstraction */ -void drw_clr_create(Drw *drw, Clr *dest, const char *clrname); -Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount); - -/* Cursor abstraction */ -Cur *drw_cur_create(Drw *drw, int shape); -void drw_cur_free(Drw *drw, Cur *cursor); - -/* Drawing context manipulation */ -void drw_setfontset(Drw *drw, Fnt *set); -void drw_setscheme(Drw *drw, Clr *scm); - -/* Drawing functions */ -void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert); -int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert); - -/* Map functions */ -void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h); diff --git a/.config/suckless/dmenu-5.2/stest.1 b/.config/suckless/dmenu-5.2/stest.1 deleted file mode 100644 index 2667d8a..0000000 --- a/.config/suckless/dmenu-5.2/stest.1 +++ /dev/null @@ -1,90 +0,0 @@ -.TH STEST 1 dmenu\-VERSION -.SH NAME -stest \- filter a list of files by properties -.SH SYNOPSIS -.B stest -.RB [ -abcdefghlpqrsuwx ] -.RB [ -n -.IR file ] -.RB [ -o -.IR file ] -.RI [ file ...] -.SH DESCRIPTION -.B stest -takes a list of files and filters by the files' properties, analogous to -.IR test (1). -Files which pass all tests are printed to stdout. If no files are given, stest -reads files from stdin. -.SH OPTIONS -.TP -.B \-a -Test hidden files. -.TP -.B \-b -Test that files are block specials. -.TP -.B \-c -Test that files are character specials. -.TP -.B \-d -Test that files are directories. -.TP -.B \-e -Test that files exist. -.TP -.B \-f -Test that files are regular files. -.TP -.B \-g -Test that files have their set-group-ID flag set. -.TP -.B \-h -Test that files are symbolic links. -.TP -.B \-l -Test the contents of a directory given as an argument. -.TP -.BI \-n " file" -Test that files are newer than -.IR file . -.TP -.BI \-o " file" -Test that files are older than -.IR file . -.TP -.B \-p -Test that files are named pipes. -.TP -.B \-q -No files are printed, only the exit status is returned. -.TP -.B \-r -Test that files are readable. -.TP -.B \-s -Test that files are not empty. -.TP -.B \-u -Test that files have their set-user-ID flag set. -.TP -.B \-v -Invert the sense of tests, only failing files pass. -.TP -.B \-w -Test that files are writable. -.TP -.B \-x -Test that files are executable. -.SH EXIT STATUS -.TP -.B 0 -At least one file passed all tests. -.TP -.B 1 -No files passed all tests. -.TP -.B 2 -An error occurred. -.SH SEE ALSO -.IR dmenu (1), -.IR test (1) diff --git a/.config/suckless/dmenu-5.2/stest.c b/.config/suckless/dmenu-5.2/stest.c deleted file mode 100644 index e27d3a5..0000000 --- a/.config/suckless/dmenu-5.2/stest.c +++ /dev/null @@ -1,109 +0,0 @@ -/* See LICENSE file for copyright and license details. */ -#include - -#include -#include -#include -#include -#include -#include - -#include "arg.h" -char *argv0; - -#define FLAG(x) (flag[(x)-'a']) - -static void test(const char *, const char *); -static void usage(void); - -static int match = 0; -static int flag[26]; -static struct stat old, new; - -static void -test(const char *path, const char *name) -{ - struct stat st, ln; - - if ((!stat(path, &st) && (FLAG('a') || name[0] != '.') /* hidden files */ - && (!FLAG('b') || S_ISBLK(st.st_mode)) /* block special */ - && (!FLAG('c') || S_ISCHR(st.st_mode)) /* character special */ - && (!FLAG('d') || S_ISDIR(st.st_mode)) /* directory */ - && (!FLAG('e') || access(path, F_OK) == 0) /* exists */ - && (!FLAG('f') || S_ISREG(st.st_mode)) /* regular file */ - && (!FLAG('g') || st.st_mode & S_ISGID) /* set-group-id flag */ - && (!FLAG('h') || (!lstat(path, &ln) && S_ISLNK(ln.st_mode))) /* symbolic link */ - && (!FLAG('n') || st.st_mtime > new.st_mtime) /* newer than file */ - && (!FLAG('o') || st.st_mtime < old.st_mtime) /* older than file */ - && (!FLAG('p') || S_ISFIFO(st.st_mode)) /* named pipe */ - && (!FLAG('r') || access(path, R_OK) == 0) /* readable */ - && (!FLAG('s') || st.st_size > 0) /* not empty */ - && (!FLAG('u') || st.st_mode & S_ISUID) /* set-user-id flag */ - && (!FLAG('w') || access(path, W_OK) == 0) /* writable */ - && (!FLAG('x') || access(path, X_OK) == 0)) != FLAG('v')) { /* executable */ - if (FLAG('q')) - exit(0); - match = 1; - puts(name); - } -} - -static void -usage(void) -{ - fprintf(stderr, "usage: %s [-abcdefghlpqrsuvwx] " - "[-n file] [-o file] [file...]\n", argv0); - exit(2); /* like test(1) return > 1 on error */ -} - -int -main(int argc, char *argv[]) -{ - struct dirent *d; - char path[PATH_MAX], *line = NULL, *file; - size_t linesiz = 0; - ssize_t n; - DIR *dir; - int r; - - ARGBEGIN { - case 'n': /* newer than file */ - case 'o': /* older than file */ - file = EARGF(usage()); - if (!(FLAG(ARGC()) = !stat(file, (ARGC() == 'n' ? &new : &old)))) - perror(file); - break; - default: - /* miscellaneous operators */ - if (strchr("abcdefghlpqrsuvwx", ARGC())) - FLAG(ARGC()) = 1; - else - usage(); /* unknown flag */ - } ARGEND; - - if (!argc) { - /* read list from stdin */ - while ((n = getline(&line, &linesiz, stdin)) > 0) { - if (line[n - 1] == '\n') - line[n - 1] = '\0'; - test(line, line); - } - free(line); - } else { - for (; argc; argc--, argv++) { - if (FLAG('l') && (dir = opendir(*argv))) { - /* test directory contents */ - while ((d = readdir(dir))) { - r = snprintf(path, sizeof path, "%s/%s", - *argv, d->d_name); - if (r >= 0 && (size_t)r < sizeof path) - test(path, d->d_name); - } - closedir(dir); - } else { - test(*argv, *argv); - } - } - } - return match ? 0 : 1; -} diff --git a/.config/suckless/dwm-6.4/.gitignore b/.config/suckless/dwm-6.4-6-g9f88553/.gitignore similarity index 100% rename from .config/suckless/dwm-6.4/.gitignore rename to .config/suckless/dwm-6.4-6-g9f88553/.gitignore diff --git a/.config/suckless/dwm-6.4/LICENSE b/.config/suckless/dwm-6.4-6-g9f88553/LICENSE similarity index 100% rename from .config/suckless/dwm-6.4/LICENSE rename to .config/suckless/dwm-6.4-6-g9f88553/LICENSE diff --git a/.config/suckless/dwm-6.4/Makefile b/.config/suckless/dwm-6.4-6-g9f88553/Makefile similarity index 83% rename from .config/suckless/dwm-6.4/Makefile rename to .config/suckless/dwm-6.4-6-g9f88553/Makefile index 77bcbc0..ffa69b4 100644 --- a/.config/suckless/dwm-6.4/Makefile +++ b/.config/suckless/dwm-6.4-6-g9f88553/Makefile @@ -6,13 +6,7 @@ include config.mk SRC = drw.c dwm.c util.c OBJ = ${SRC:.c=.o} -all: options dwm - -options: - @echo dwm build options: - @echo "CFLAGS = ${CFLAGS}" - @echo "LDFLAGS = ${LDFLAGS}" - @echo "CC = ${CC}" +all: dwm .c.o: ${CC} -c ${CFLAGS} $< @@ -48,4 +42,4 @@ uninstall: rm -f ${DESTDIR}${PREFIX}/bin/dwm\ ${DESTDIR}${MANPREFIX}/man1/dwm.1 -.PHONY: all options clean dist install uninstall +.PHONY: all clean dist install uninstall diff --git a/.config/suckless/dwm-6.4/README b/.config/suckless/dwm-6.4-6-g9f88553/README similarity index 100% rename from .config/suckless/dwm-6.4/README rename to .config/suckless/dwm-6.4-6-g9f88553/README diff --git a/.config/suckless/dwm-6.4/config.def.h b/.config/suckless/dwm-6.4-6-g9f88553/config.def.h similarity index 96% rename from .config/suckless/dwm-6.4/config.def.h rename to .config/suckless/dwm-6.4-6-g9f88553/config.def.h index 4766e91..d674ef5 100644 --- a/.config/suckless/dwm-6.4/config.def.h +++ b/.config/suckless/dwm-6.4-6-g9f88553/config.def.h @@ -56,7 +56,8 @@ static const Layout layouts[] = { #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } /* commands */ -static const char *dmenucmd[] = { "dmenu_run", "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; +static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ +static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; static const char *termcmd[] = { "st", NULL }; static const Key keys[] = { diff --git a/.config/suckless/dwm-6.4/config.h b/.config/suckless/dwm-6.4-6-g9f88553/config.h similarity index 98% rename from .config/suckless/dwm-6.4/config.h rename to .config/suckless/dwm-6.4-6-g9f88553/config.h index 0cf63a4..cbfc5ad 100644 --- a/.config/suckless/dwm-6.4/config.h +++ b/.config/suckless/dwm-6.4-6-g9f88553/config.h @@ -49,13 +49,14 @@ static const Layout layouts[] = { { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ /* commands */ +static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ static const char *dmenucmd[] = { "dmenu_run", "-i", "-fn", dmenufont, NULL }; static const char *termcmd[] = { "alacritty", NULL }; -static const char *calccmd[] = { "alacritty", "-epython", NULL }; +static const char *lockcmd[] = { "lock", NULL }; static const char *wwwcmd[] = { "firefox", NULL }; static const char *pwwwcmd[] = { "firefox", "--private-window", NULL }; +static const char *calccmd[] = { "alacritty", "-epython", NULL }; static const char *fmcmd[] = { "pcmanfm", NULL }; -static const char *lockcmd[] = { "lock", NULL }; static const char *prtsccmd[] = { "flameshot", "full", "-c", NULL }; static const char *prtscrectcmd[] = { "flameshot", "gui", NULL }; static const char *lvolcmd[] = { "set-vol", "-5", NULL }; @@ -78,24 +79,24 @@ static const Key keys[] = { /* modifier key function argument */ { MODKEY, XK_r, spawn, {.v = dmenucmd } }, { MODKEY, XK_Return, spawn, {.v = termcmd } }, + { MODKEY, XK_l, spawn, {.v = lockcmd } }, { MODKEY, XK_b, spawn, {.v = wwwcmd } }, { MODKEY|ShiftMask, XK_b, spawn, {.v = pwwwcmd } }, + { 0, XF86XK_Calculator, spawn, {.v = calccmd } }, { MODKEY, XK_e, spawn, {.v = fmcmd } }, - { MODKEY, XK_l, spawn, {.v = lockcmd } }, { 0, XK_Print, spawn, {.v = prtsccmd } }, { ShiftMask, XK_Print, spawn, {.v = prtscrectcmd } }, { 0, XF86XK_AudioLowerVolume, spawn, {.v = lvolcmd } }, { 0, XF86XK_AudioRaiseVolume, spawn, {.v = rvolcmd } }, { 0, XF86XK_AudioMute, spawn, {.v = mutecmd } }, { 0, XF86XK_AudioMicMute, spawn, {.v = micmutecmd } }, - { ControlMask, XF86XK_AudioMute, spawn, {.v = micmutecmd } }, + { ShiftMask, XF86XK_AudioMute, spawn, {.v = micmutecmd } }, { 0, XF86XK_AudioPlay, spawn, {.v = pausecmd } }, { 0, XF86XK_AudioPrev, spawn, {.v = prevcmd } }, { 0, XF86XK_AudioNext, spawn, {.v = nextcmd } }, { 0, XF86XK_AudioStop, spawn, {.v = stopcmd } }, { 0, XF86XK_MonBrightnessDown, spawn, {.v = lbrtcmd } }, { 0, XF86XK_MonBrightnessUp, spawn, {.v = rbrtcmd } }, - { 0, XF86XK_Calculator, spawn, {.v = calccmd } }, { MODKEY, XK_p, spawn, {.v = passselectcmd } }, { MODKEY|ShiftMask, XK_p, spawn, {.v = passopencmd } }, { MODKEY, XK_u, spawn, {.v = passusercmd } }, diff --git a/.config/suckless/dwm-6.4/config.mk b/.config/suckless/dwm-6.4-6-g9f88553/config.mk similarity index 88% rename from .config/suckless/dwm-6.4/config.mk rename to .config/suckless/dwm-6.4-6-g9f88553/config.mk index ef8acf7..ba64d3d 100644 --- a/.config/suckless/dwm-6.4/config.mk +++ b/.config/suckless/dwm-6.4-6-g9f88553/config.mk @@ -26,7 +26,7 @@ INCS = -I${X11INC} -I${FREETYPEINC} LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} # flags -CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} +CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} #CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} LDFLAGS = ${LIBS} diff --git a/.config/suckless/dwm-6.4/drw.c b/.config/suckless/dwm-6.4-6-g9f88553/drw.c similarity index 100% rename from .config/suckless/dwm-6.4/drw.c rename to .config/suckless/dwm-6.4-6-g9f88553/drw.c diff --git a/.config/suckless/dwm-6.4/drw.h b/.config/suckless/dwm-6.4-6-g9f88553/drw.h similarity index 100% rename from .config/suckless/dwm-6.4/drw.h rename to .config/suckless/dwm-6.4-6-g9f88553/drw.h diff --git a/.config/suckless/dwm-6.4/dwm.1 b/.config/suckless/dwm-6.4-6-g9f88553/dwm.1 similarity index 100% rename from .config/suckless/dwm-6.4/dwm.1 rename to .config/suckless/dwm-6.4-6-g9f88553/dwm.1 diff --git a/.config/suckless/dwm-6.4/dwm.c b/.config/suckless/dwm-6.4-6-g9f88553/dwm.c similarity index 97% rename from .config/suckless/dwm-6.4/dwm.c rename to .config/suckless/dwm-6.4-6-g9f88553/dwm.c index e1401d4..87acccf 100644 --- a/.config/suckless/dwm-6.4/dwm.c +++ b/.config/suckless/dwm-6.4-6-g9f88553/dwm.c @@ -204,7 +204,6 @@ static void setmfact(const Arg *arg); static void setup(void); static void seturgent(Client *c, int urg); static void showhide(Client *c); -static void sigchld(int unused); static void spawn(const Arg *arg); static void tag(const Arg *arg); static void tagmon(const Arg *arg); @@ -949,16 +948,26 @@ grabkeys(void) { updatenumlockmask(); { - unsigned int i, j; + unsigned int i, j, k; unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask }; - KeyCode code; + int start, end, skip; + KeySym *syms; XUngrabKey(dpy, AnyKey, AnyModifier, root); - for (i = 0; i < LENGTH(keys); i++) - if ((code = XKeysymToKeycode(dpy, keys[i].keysym))) - for (j = 0; j < LENGTH(modifiers); j++) - XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, - True, GrabModeAsync, GrabModeAsync); + XDisplayKeycodes(dpy, &start, &end); + syms = XGetKeyboardMapping(dpy, start, end - start + 1, &skip); + if (!syms) + return; + for (k = start; k <= end; k++) + for (i = 0; i < LENGTH(keys); i++) + /* skip modifier codes, we do that ourselves */ + if (keys[i].keysym == syms[(k - start) * skip]) + for (j = 0; j < LENGTH(modifiers); j++) + XGrabKey(dpy, k, + keys[i].mod | modifiers[j], + root, True, + GrabModeAsync, GrabModeAsync); + XFree(syms); } } @@ -1329,7 +1338,7 @@ resizemouse(const Arg *arg) c->sfw = c->w; c->sfh = c->h; togglefloating(NULL); - } + } } if (!selmon->lt[selmon->sellt]->arrange || c->isfloating) resize(c, c->x, c->y, nw, nh, 1); @@ -1533,9 +1542,16 @@ setup(void) int i; XSetWindowAttributes wa; Atom utf8string; + struct sigaction sa; - /* clean up any zombies immediately */ - sigchld(0); + /* do not transform children into zombies when they terminate */ + sigemptyset(&sa.sa_mask); + sa.sa_flags = SA_NOCLDSTOP | SA_NOCLDWAIT | SA_RESTART; + sa.sa_handler = SIG_IGN; + sigaction(SIGCHLD, &sa, NULL); + + /* clean up any zombies (inherited from .xinitrc etc) immediately */ + while (waitpid(-1, NULL, WNOHANG) > 0); /* init screen */ screen = DefaultScreen(dpy); @@ -1628,21 +1644,23 @@ showhide(Client *c) } } -void -sigchld(int unused) -{ - if (signal(SIGCHLD, sigchld) == SIG_ERR) - die("can't install SIGCHLD handler:"); - while (0 < waitpid(-1, NULL, WNOHANG)); -} - void spawn(const Arg *arg) { + struct sigaction sa; + + if (arg->v == dmenucmd) + dmenumon[0] = '0' + selmon->num; if (fork() == 0) { if (dpy) close(ConnectionNumber(dpy)); setsid(); + + sigemptyset(&sa.sa_mask); + sa.sa_flags = 0; + sa.sa_handler = SIG_DFL; + sigaction(SIGCHLD, &sa, NULL); + execvp(((char **)arg->v)[0], (char **)arg->v); die("dwm: execvp '%s' failed:", ((char **)arg->v)[0]); } diff --git a/.config/suckless/dwm-6.4/dwm.png b/.config/suckless/dwm-6.4-6-g9f88553/dwm.png similarity index 100% rename from .config/suckless/dwm-6.4/dwm.png rename to .config/suckless/dwm-6.4-6-g9f88553/dwm.png diff --git a/.config/suckless/dwm-6.4/patches/allmonbar.diff b/.config/suckless/dwm-6.4-6-g9f88553/patches/allmonbar.diff similarity index 86% rename from .config/suckless/dwm-6.4/patches/allmonbar.diff rename to .config/suckless/dwm-6.4-6-g9f88553/patches/allmonbar.diff index 1e39877..01f83b5 100644 --- a/.config/suckless/dwm-6.4/patches/allmonbar.diff +++ b/.config/suckless/dwm-6.4-6-g9f88553/patches/allmonbar.diff @@ -1,8 +1,8 @@ diff --git a/dwm.c b/dwm.c -index e5efb6a..cf5e8fc 100644 +index f1d86b2..ea21758 100644 --- a/dwm.c +++ b/dwm.c -@@ -709,11 +709,9 @@ drawbar(Monitor *m) +@@ -708,11 +708,9 @@ drawbar(Monitor *m) return; /* draw status first so it can be overdrawn by tags later */ @@ -17,7 +17,7 @@ index e5efb6a..cf5e8fc 100644 for (c = m->clients; c; c = c->next) { occ |= c->tags; -@@ -1989,7 +1987,7 @@ updatestatus(void) +@@ -2007,7 +2005,7 @@ updatestatus(void) { if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext))) strcpy(stext, "dwm-"VERSION); diff --git a/.config/suckless/dwm-6.4/patches/fullscreen.diff b/.config/suckless/dwm-6.4-6-g9f88553/patches/fullscreen.diff similarity index 87% rename from .config/suckless/dwm-6.4/patches/fullscreen.diff rename to .config/suckless/dwm-6.4-6-g9f88553/patches/fullscreen.diff index 77fd963..a8bfa18 100644 --- a/.config/suckless/dwm-6.4/patches/fullscreen.diff +++ b/.config/suckless/dwm-6.4-6-g9f88553/patches/fullscreen.diff @@ -1,8 +1,8 @@ diff --git a/config.def.h b/config.def.h -index 061ad66..3cac2f9 100644 +index 9efa774..5150c08 100644 --- a/config.def.h +++ b/config.def.h -@@ -78,6 +78,7 @@ static const Key keys[] = { +@@ -79,6 +79,7 @@ static const Key keys[] = { { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, { MODKEY, XK_space, setlayout, {0} }, { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, @@ -25,10 +25,10 @@ index ddc8321..3d310ac 100644 Toggle focused window between tiled and floating state. .TP diff --git a/dwm.c b/dwm.c -index e5efb6a..8d4acd7 100644 +index f1d86b2..affb0cc 100644 --- a/dwm.c +++ b/dwm.c -@@ -212,6 +212,7 @@ static void tagmon(const Arg *arg); +@@ -211,6 +211,7 @@ static void tagmon(const Arg *arg); static void tile(Monitor *m); static void togglebar(const Arg *arg); static void togglefloating(const Arg *arg); @@ -36,7 +36,7 @@ index e5efb6a..8d4acd7 100644 static void toggletag(const Arg *arg); static void toggleview(const Arg *arg); static void unfocus(Client *c, int setfocus); -@@ -1717,6 +1718,13 @@ togglefloating(const Arg *arg) +@@ -1735,6 +1736,13 @@ togglefloating(const Arg *arg) arrange(selmon); } diff --git a/.config/suckless/dwm-6.4/patches/ltsymbol.diff b/.config/suckless/dwm-6.4-6-g9f88553/patches/ltsymbol.diff similarity index 90% rename from .config/suckless/dwm-6.4/patches/ltsymbol.diff rename to .config/suckless/dwm-6.4-6-g9f88553/patches/ltsymbol.diff index de1717a..440f474 100644 --- a/.config/suckless/dwm-6.4/patches/ltsymbol.diff +++ b/.config/suckless/dwm-6.4-6-g9f88553/patches/ltsymbol.diff @@ -1,5 +1,5 @@ diff --git a/config.def.h b/config.def.h -index 061ad66..5820b62 100644 +index 9efa774..eeb0457 100644 --- a/config.def.h +++ b/config.def.h @@ -38,10 +38,10 @@ static const int resizehints = 1; /* 1 means respect size hints in tiled resi @@ -17,7 +17,7 @@ index 061ad66..5820b62 100644 }; /* key definitions */ -@@ -97,11 +97,9 @@ static const Key keys[] = { +@@ -98,11 +98,9 @@ static const Key keys[] = { }; /* button definitions */ @@ -31,7 +31,7 @@ index 061ad66..5820b62 100644 { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, { ClkClientWin, MODKEY, Button1, movemouse, {0} }, diff --git a/dwm.c b/dwm.c -index e5efb6a..1109862 100644 +index f1d86b2..e5daa38 100644 --- a/dwm.c +++ b/dwm.c @@ -64,7 +64,7 @@ enum { NetSupported, NetWMName, NetWMState, NetWMCheck, @@ -56,7 +56,7 @@ index e5efb6a..1109862 100644 float mfact; int nmaster; int num; -@@ -397,7 +395,6 @@ arrange(Monitor *m) +@@ -396,7 +394,6 @@ arrange(Monitor *m) void arrangemon(Monitor *m) { @@ -64,7 +64,7 @@ index e5efb6a..1109862 100644 if (m->lt[m->sellt]->arrange) m->lt[m->sellt]->arrange(m); } -@@ -440,9 +437,7 @@ buttonpress(XEvent *e) +@@ -439,9 +436,7 @@ buttonpress(XEvent *e) if (i < LENGTH(tags)) { click = ClkTagBar; arg.ui = 1 << i; @@ -75,7 +75,7 @@ index e5efb6a..1109862 100644 click = ClkStatusText; else click = ClkWinTitle; -@@ -473,7 +468,7 @@ void +@@ -472,7 +467,7 @@ void cleanup(void) { Arg a = {.ui = ~0}; @@ -84,7 +84,7 @@ index e5efb6a..1109862 100644 Monitor *m; size_t i; -@@ -644,7 +639,6 @@ createmon(void) +@@ -643,7 +638,6 @@ createmon(void) m->topbar = topbar; m->lt[0] = &layouts[0]; m->lt[1] = &layouts[1 % LENGTH(layouts)]; @@ -92,7 +92,7 @@ index e5efb6a..1109862 100644 return m; } -@@ -731,9 +725,7 @@ drawbar(Monitor *m) +@@ -730,9 +724,7 @@ drawbar(Monitor *m) urg & 1 << i); x += w; } @@ -102,7 +102,7 @@ index e5efb6a..1109862 100644 if ((w = m->ww - tw - x) > bh) { if (m->sel) { -@@ -1110,8 +1102,6 @@ monocle(Monitor *m) +@@ -1119,8 +1111,6 @@ monocle(Monitor *m) for (c = m->clients; c; c = c->next) if (ISVISIBLE(c)) n++; @@ -111,7 +111,7 @@ index e5efb6a..1109862 100644 for (c = nexttiled(m->clients); c; c = nexttiled(c->next)) resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0); } -@@ -1505,7 +1495,6 @@ setlayout(const Arg *arg) +@@ -1514,7 +1504,6 @@ setlayout(const Arg *arg) selmon->sellt ^= 1; if (arg && arg->v) selmon->lt[selmon->sellt] = (Layout *)arg->v; diff --git a/.config/suckless/dwm-6.4/patches/restorefloat.diff b/.config/suckless/dwm-6.4-6-g9f88553/patches/restorefloat.diff similarity index 89% rename from .config/suckless/dwm-6.4/patches/restorefloat.diff rename to .config/suckless/dwm-6.4-6-g9f88553/patches/restorefloat.diff index f96f1d9..c192092 100644 --- a/.config/suckless/dwm-6.4/patches/restorefloat.diff +++ b/.config/suckless/dwm-6.4-6-g9f88553/patches/restorefloat.diff @@ -1,5 +1,5 @@ diff --git a/dwm.c b/dwm.c -index e5efb6a..3c9b734 100644 +index f1d86b2..70be57b 100644 --- a/dwm.c +++ b/dwm.c @@ -88,6 +88,7 @@ struct Client { @@ -10,7 +10,7 @@ index e5efb6a..3c9b734 100644 int oldx, oldy, oldw, oldh; int basew, baseh, incw, inch, maxw, maxh, minw, minh, hintsvalid; int bw, oldbw; -@@ -1059,6 +1060,10 @@ manage(Window w, XWindowAttributes *wa) +@@ -1068,6 +1069,10 @@ manage(Window w, XWindowAttributes *wa) updatewindowtype(c); updatesizehints(c); updatewmhints(c); @@ -21,7 +21,7 @@ index e5efb6a..3c9b734 100644 XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask); grabbuttons(c, 0); if (!c->isfloating) -@@ -1327,8 +1332,13 @@ resizemouse(const Arg *arg) +@@ -1336,8 +1341,13 @@ resizemouse(const Arg *arg) && c->mon->wy + nh >= selmon->wy && c->mon->wy + nh <= selmon->wy + selmon->wh) { if (!c->isfloating && selmon->lt[selmon->sellt]->arrange @@ -36,7 +36,7 @@ index e5efb6a..3c9b734 100644 } if (!selmon->lt[selmon->sellt]->arrange || c->isfloating) resize(c, c->x, c->y, nw, nh, 1); -@@ -1712,8 +1722,14 @@ togglefloating(const Arg *arg) +@@ -1730,8 +1740,14 @@ togglefloating(const Arg *arg) return; selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed; if (selmon->sel->isfloating) diff --git a/.config/suckless/dwm-6.4/patches/transparentborder.diff b/.config/suckless/dwm-6.4-6-g9f88553/patches/transparentborder.diff similarity index 100% rename from .config/suckless/dwm-6.4/patches/transparentborder.diff rename to .config/suckless/dwm-6.4-6-g9f88553/patches/transparentborder.diff diff --git a/.config/suckless/dwm-6.4/patches/warpcursor.diff b/.config/suckless/dwm-6.4-6-g9f88553/patches/warpcursor.diff similarity index 74% rename from .config/suckless/dwm-6.4/patches/warpcursor.diff rename to .config/suckless/dwm-6.4-6-g9f88553/patches/warpcursor.diff index 4bff9c0..aa98e9a 100644 --- a/.config/suckless/dwm-6.4/patches/warpcursor.diff +++ b/.config/suckless/dwm-6.4-6-g9f88553/patches/warpcursor.diff @@ -1,8 +1,8 @@ diff --git a/dwm.c b/dwm.c -index e5efb6a..a126648 100644 +index f1d86b2..dbe8a5d 100644 --- a/dwm.c +++ b/dwm.c -@@ -834,6 +834,8 @@ focusmon(const Arg *arg) +@@ -833,6 +833,8 @@ focusmon(const Arg *arg) unfocus(selmon->sel, 0); selmon = m; focus(NULL); diff --git a/.config/suckless/dwm-6.4/transient.c b/.config/suckless/dwm-6.4-6-g9f88553/transient.c similarity index 100% rename from .config/suckless/dwm-6.4/transient.c rename to .config/suckless/dwm-6.4-6-g9f88553/transient.c diff --git a/.config/suckless/dmenu-5.2/util.c b/.config/suckless/dwm-6.4-6-g9f88553/util.c similarity index 100% rename from .config/suckless/dmenu-5.2/util.c rename to .config/suckless/dwm-6.4-6-g9f88553/util.c diff --git a/.config/suckless/dmenu-5.2/util.h b/.config/suckless/dwm-6.4-6-g9f88553/util.h similarity index 100% rename from .config/suckless/dmenu-5.2/util.h rename to .config/suckless/dwm-6.4-6-g9f88553/util.h diff --git a/.config/suckless/dwm-6.4/util.c b/.config/suckless/dwm-6.4/util.c deleted file mode 100644 index 96b82c9..0000000 --- a/.config/suckless/dwm-6.4/util.c +++ /dev/null @@ -1,36 +0,0 @@ -/* See LICENSE file for copyright and license details. */ -#include -#include -#include -#include - -#include "util.h" - -void -die(const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); - - if (fmt[0] && fmt[strlen(fmt)-1] == ':') { - fputc(' ', stderr); - perror(NULL); - } else { - fputc('\n', stderr); - } - - exit(1); -} - -void * -ecalloc(size_t nmemb, size_t size) -{ - void *p; - - if (!(p = calloc(nmemb, size))) - die("calloc:"); - return p; -} diff --git a/.config/suckless/dwm-6.4/util.h b/.config/suckless/dwm-6.4/util.h deleted file mode 100644 index f633b51..0000000 --- a/.config/suckless/dwm-6.4/util.h +++ /dev/null @@ -1,8 +0,0 @@ -/* See LICENSE file for copyright and license details. */ - -#define MAX(A, B) ((A) > (B) ? (A) : (B)) -#define MIN(A, B) ((A) < (B) ? (A) : (B)) -#define BETWEEN(X, A, B) ((A) <= (X) && (X) <= (B)) - -void die(const char *fmt, ...); -void *ecalloc(size_t nmemb, size_t size); diff --git a/.config/systemd/user/mbsync.service b/.config/systemd/user/mbsync.service deleted file mode 100644 index 03beacf..0000000 --- a/.config/systemd/user/mbsync.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Mailbox synchronization service - -[Service] -Type=oneshot -ExecStart=/usr/bin/mbsync -Va - -[Install] -WantedBy=default.target diff --git a/.config/systemd/user/mbsync.timer b/.config/systemd/user/mbsync.timer deleted file mode 100644 index 1ed5471..0000000 --- a/.config/systemd/user/mbsync.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Mailbox synchronization timer - -[Timer] -OnCalendar=*:00/15 -Unit=mbsync.service - -[Install] -WantedBy=timers.target diff --git a/.config/systemd/user/timers.target.wants/mbsync.timer b/.config/systemd/user/timers.target.wants/mbsync.timer deleted file mode 120000 index fa56ef4..0000000 --- a/.config/systemd/user/timers.target.wants/mbsync.timer +++ /dev/null @@ -1 +0,0 @@ -../mbsync.timer \ No newline at end of file diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile index bfdec45..2ad9d40 100644 --- a/.config/zsh/.zprofile +++ b/.config/zsh/.zprofile @@ -10,4 +10,6 @@ export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" exec startx > "$GUILOG" 2>&1 } +#[ "$XDG_VTNR" = 1 ] && exec Hyprland + # vim: ft=zsh diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 58a6e4b..467e134 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -42,8 +42,6 @@ export LESS_TERMCAP_us="${fg_bold[green]}" export LESS_TERMCAP_ue="${reset_color}" export GROFF_NO_SGR=1 -export GPG_TTY="$(tty)" - . <(dircolors) zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}" diff --git a/.config/zsh/aliases/docker.zsh b/.config/zsh/aliases/docker.zsh index f58978a..8a0e7d1 100644 --- a/.config/zsh/aliases/docker.zsh +++ b/.config/zsh/aliases/docker.zsh @@ -68,8 +68,10 @@ alias dksysp='docker system prune' # compose alias dc='docker-compose' alias dcd='docker-compose down' -alias dcup='docker-compose up -d' -alias dcupb='docker-compose up -d --build' +alias dcup='docker-compose up' +alias dcupb='docker-compose up --build' +alias dcupd='docker-compose up -d' +alias dcupdb='docker-compose up -d --build' ## container alias dccls='docker-compose ps' diff --git a/.config/zsh/aliases/general.zsh b/.config/zsh/aliases/general.zsh index be7ecc0..13e86cb 100644 --- a/.config/zsh/aliases/general.zsh +++ b/.config/zsh/aliases/general.zsh @@ -49,7 +49,7 @@ function j() { } function tmp() { - cd "$(mktemp -dt "$1"XXX)" + cd "$(mktemp -d --tmpdir "$1"XXX)" } alias -g ...='../..' \ diff --git a/.config/zsh/aliases/kubectl.zsh b/.config/zsh/aliases/kubectl.zsh index e7500bb..dcdc432 100644 --- a/.config/zsh/aliases/kubectl.zsh +++ b/.config/zsh/aliases/kubectl.zsh @@ -21,7 +21,9 @@ function kxn() { [ -n "$ns" ] && kubens "$ns" } +alias kga='kubectl get "$(kubectl api-resources --verbs=list --namespaced -oname | grep -v event | paste -sd,)"' alias kns='kubens' + alias k='kubectl' alias ksys='kubectl --namespace=kube-system' alias ka='kubectl apply --recursive -f' @@ -234,24 +236,6 @@ alias kgingalloyaml='kubectl get ingress --all-namespaces -o=yaml' alias kgcmalloyaml='kubectl get configmap --all-namespaces -o=yaml' alias kgsecalloyaml='kubectl get secret --all-namespaces -o=yaml' alias kgnsalloyaml='kubectl get namespaces --all-namespaces -o=yaml' -alias kgwoyaml='kubectl get --watch -o=yaml' -alias ksysgwoyaml='kubectl --namespace=kube-system get --watch -o=yaml' -alias kgpowoyaml='kubectl get pods --watch -o=yaml' -alias ksysgpowoyaml='kubectl --namespace=kube-system get pods --watch -o=yaml' -alias kgdepwoyaml='kubectl get deployment --watch -o=yaml' -alias ksysgdepwoyaml='kubectl --namespace=kube-system get deployment --watch -o=yaml' -alias kgstswoyaml='kubectl get statefulset --watch -o=yaml' -alias ksysgstswoyaml='kubectl --namespace=kube-system get statefulset --watch -o=yaml' -alias kgsvcwoyaml='kubectl get service --watch -o=yaml' -alias ksysgsvcwoyaml='kubectl --namespace=kube-system get service --watch -o=yaml' -alias kgingwoyaml='kubectl get ingress --watch -o=yaml' -alias ksysgingwoyaml='kubectl --namespace=kube-system get ingress --watch -o=yaml' -alias kgcmwoyaml='kubectl get configmap --watch -o=yaml' -alias ksysgcmwoyaml='kubectl --namespace=kube-system get configmap --watch -o=yaml' -alias kgsecwoyaml='kubectl get secret --watch -o=yaml' -alias ksysgsecwoyaml='kubectl --namespace=kube-system get secret --watch -o=yaml' -alias kgnowoyaml='kubectl get nodes --watch -o=yaml' -alias kgnswoyaml='kubectl get namespaces --watch -o=yaml' alias kgowideall='kubectl get -o=wide --all-namespaces' alias kgpoowideall='kubectl get pods -o=wide --all-namespaces' alias kgdepowideall='kubectl get deployment -o=wide --all-namespaces' @@ -306,24 +290,6 @@ alias kgsecslowide='kubectl get secret --show-labels -o=wide' alias ksysgsecslowide='kubectl --namespace=kube-system get secret --show-labels -o=wide' alias kgnoslowide='kubectl get nodes --show-labels -o=wide' alias kgnsslowide='kubectl get namespaces --show-labels -o=wide' -alias kgwowide='kubectl get --watch -o=wide' -alias ksysgwowide='kubectl --namespace=kube-system get --watch -o=wide' -alias kgpowowide='kubectl get pods --watch -o=wide' -alias ksysgpowowide='kubectl --namespace=kube-system get pods --watch -o=wide' -alias kgdepwowide='kubectl get deployment --watch -o=wide' -alias ksysgdepwowide='kubectl --namespace=kube-system get deployment --watch -o=wide' -alias kgstswowide='kubectl get statefulset --watch -o=wide' -alias ksysgstswowide='kubectl --namespace=kube-system get statefulset --watch -o=wide' -alias kgsvcwowide='kubectl get service --watch -o=wide' -alias ksysgsvcwowide='kubectl --namespace=kube-system get service --watch -o=wide' -alias kgingwowide='kubectl get ingress --watch -o=wide' -alias ksysgingwowide='kubectl --namespace=kube-system get ingress --watch -o=wide' -alias kgcmwowide='kubectl get configmap --watch -o=wide' -alias ksysgcmwowide='kubectl --namespace=kube-system get configmap --watch -o=wide' -alias kgsecwowide='kubectl get secret --watch -o=wide' -alias ksysgsecwowide='kubectl --namespace=kube-system get secret --watch -o=wide' -alias kgnowowide='kubectl get nodes --watch -o=wide' -alias kgnswowide='kubectl get namespaces --watch -o=wide' alias kgojsonall='kubectl get -o=json --all-namespaces' alias kgpoojsonall='kubectl get pods -o=json --all-namespaces' alias kgdepojsonall='kubectl get deployment -o=json --all-namespaces' @@ -342,24 +308,6 @@ alias kgingallojson='kubectl get ingress --all-namespaces -o=json' alias kgcmallojson='kubectl get configmap --all-namespaces -o=json' alias kgsecallojson='kubectl get secret --all-namespaces -o=json' alias kgnsallojson='kubectl get namespaces --all-namespaces -o=json' -alias kgwojson='kubectl get --watch -o=json' -alias ksysgwojson='kubectl --namespace=kube-system get --watch -o=json' -alias kgpowojson='kubectl get pods --watch -o=json' -alias ksysgpowojson='kubectl --namespace=kube-system get pods --watch -o=json' -alias kgdepwojson='kubectl get deployment --watch -o=json' -alias ksysgdepwojson='kubectl --namespace=kube-system get deployment --watch -o=json' -alias kgstswojson='kubectl get statefulset --watch -o=json' -alias ksysgstswojson='kubectl --namespace=kube-system get statefulset --watch -o=json' -alias kgsvcwojson='kubectl get service --watch -o=json' -alias ksysgsvcwojson='kubectl --namespace=kube-system get service --watch -o=json' -alias kgingwojson='kubectl get ingress --watch -o=json' -alias ksysgingwojson='kubectl --namespace=kube-system get ingress --watch -o=json' -alias kgcmwojson='kubectl get configmap --watch -o=json' -alias ksysgcmwojson='kubectl --namespace=kube-system get configmap --watch -o=json' -alias kgsecwojson='kubectl get secret --watch -o=json' -alias ksysgsecwojson='kubectl --namespace=kube-system get secret --watch -o=json' -alias kgnowojson='kubectl get nodes --watch -o=json' -alias kgnswojson='kubectl get namespaces --watch -o=json' alias kgallsl='kubectl get --all-namespaces --show-labels' alias kgpoallsl='kubectl get pods --all-namespaces --show-labels' alias kgdepallsl='kubectl get deployment --all-namespaces --show-labels' @@ -432,33 +380,6 @@ alias kgsecwsl='kubectl get secret --watch --show-labels' alias ksysgsecwsl='kubectl --namespace=kube-system get secret --watch --show-labels' alias kgnowsl='kubectl get nodes --watch --show-labels' alias kgnswsl='kubectl get namespaces --watch --show-labels' -alias kgallwoyaml='kubectl get --all-namespaces --watch -o=yaml' -alias kgpoallwoyaml='kubectl get pods --all-namespaces --watch -o=yaml' -alias kgdepallwoyaml='kubectl get deployment --all-namespaces --watch -o=yaml' -alias kgstsallwoyaml='kubectl get statefulset --all-namespaces --watch -o=yaml' -alias kgsvcallwoyaml='kubectl get service --all-namespaces --watch -o=yaml' -alias kgingallwoyaml='kubectl get ingress --all-namespaces --watch -o=yaml' -alias kgcmallwoyaml='kubectl get configmap --all-namespaces --watch -o=yaml' -alias kgsecallwoyaml='kubectl get secret --all-namespaces --watch -o=yaml' -alias kgnsallwoyaml='kubectl get namespaces --all-namespaces --watch -o=yaml' -alias kgwoyamlall='kubectl get --watch -o=yaml --all-namespaces' -alias kgpowoyamlall='kubectl get pods --watch -o=yaml --all-namespaces' -alias kgdepwoyamlall='kubectl get deployment --watch -o=yaml --all-namespaces' -alias kgstswoyamlall='kubectl get statefulset --watch -o=yaml --all-namespaces' -alias kgsvcwoyamlall='kubectl get service --watch -o=yaml --all-namespaces' -alias kgingwoyamlall='kubectl get ingress --watch -o=yaml --all-namespaces' -alias kgcmwoyamlall='kubectl get configmap --watch -o=yaml --all-namespaces' -alias kgsecwoyamlall='kubectl get secret --watch -o=yaml --all-namespaces' -alias kgnswoyamlall='kubectl get namespaces --watch -o=yaml --all-namespaces' -alias kgwalloyaml='kubectl get --watch --all-namespaces -o=yaml' -alias kgpowalloyaml='kubectl get pods --watch --all-namespaces -o=yaml' -alias kgdepwalloyaml='kubectl get deployment --watch --all-namespaces -o=yaml' -alias kgstswalloyaml='kubectl get statefulset --watch --all-namespaces -o=yaml' -alias kgsvcwalloyaml='kubectl get service --watch --all-namespaces -o=yaml' -alias kgingwalloyaml='kubectl get ingress --watch --all-namespaces -o=yaml' -alias kgcmwalloyaml='kubectl get configmap --watch --all-namespaces -o=yaml' -alias kgsecwalloyaml='kubectl get secret --watch --all-namespaces -o=yaml' -alias kgnswalloyaml='kubectl get namespaces --watch --all-namespaces -o=yaml' alias kgowideallsl='kubectl get -o=wide --all-namespaces --show-labels' alias kgpoowideallsl='kubectl get pods -o=wide --all-namespaces --show-labels' alias kgdepowideallsl='kubectl get deployment -o=wide --all-namespaces --show-labels' @@ -513,114 +434,6 @@ alias kgingslallowide='kubectl get ingress --show-labels --all-namespaces -o=wid alias kgcmslallowide='kubectl get configmap --show-labels --all-namespaces -o=wide' alias kgsecslallowide='kubectl get secret --show-labels --all-namespaces -o=wide' alias kgnsslallowide='kubectl get namespaces --show-labels --all-namespaces -o=wide' -alias kgallwowide='kubectl get --all-namespaces --watch -o=wide' -alias kgpoallwowide='kubectl get pods --all-namespaces --watch -o=wide' -alias kgdepallwowide='kubectl get deployment --all-namespaces --watch -o=wide' -alias kgstsallwowide='kubectl get statefulset --all-namespaces --watch -o=wide' -alias kgsvcallwowide='kubectl get service --all-namespaces --watch -o=wide' -alias kgingallwowide='kubectl get ingress --all-namespaces --watch -o=wide' -alias kgcmallwowide='kubectl get configmap --all-namespaces --watch -o=wide' -alias kgsecallwowide='kubectl get secret --all-namespaces --watch -o=wide' -alias kgnsallwowide='kubectl get namespaces --all-namespaces --watch -o=wide' -alias kgwowideall='kubectl get --watch -o=wide --all-namespaces' -alias kgpowowideall='kubectl get pods --watch -o=wide --all-namespaces' -alias kgdepwowideall='kubectl get deployment --watch -o=wide --all-namespaces' -alias kgstswowideall='kubectl get statefulset --watch -o=wide --all-namespaces' -alias kgsvcwowideall='kubectl get service --watch -o=wide --all-namespaces' -alias kgingwowideall='kubectl get ingress --watch -o=wide --all-namespaces' -alias kgcmwowideall='kubectl get configmap --watch -o=wide --all-namespaces' -alias kgsecwowideall='kubectl get secret --watch -o=wide --all-namespaces' -alias kgnswowideall='kubectl get namespaces --watch -o=wide --all-namespaces' -alias kgwallowide='kubectl get --watch --all-namespaces -o=wide' -alias kgpowallowide='kubectl get pods --watch --all-namespaces -o=wide' -alias kgdepwallowide='kubectl get deployment --watch --all-namespaces -o=wide' -alias kgstswallowide='kubectl get statefulset --watch --all-namespaces -o=wide' -alias kgsvcwallowide='kubectl get service --watch --all-namespaces -o=wide' -alias kgingwallowide='kubectl get ingress --watch --all-namespaces -o=wide' -alias kgcmwallowide='kubectl get configmap --watch --all-namespaces -o=wide' -alias kgsecwallowide='kubectl get secret --watch --all-namespaces -o=wide' -alias kgnswallowide='kubectl get namespaces --watch --all-namespaces -o=wide' -alias kgslwowide='kubectl get --show-labels --watch -o=wide' -alias ksysgslwowide='kubectl --namespace=kube-system get --show-labels --watch -o=wide' -alias kgposlwowide='kubectl get pods --show-labels --watch -o=wide' -alias ksysgposlwowide='kubectl --namespace=kube-system get pods --show-labels --watch -o=wide' -alias kgdepslwowide='kubectl get deployment --show-labels --watch -o=wide' -alias ksysgdepslwowide='kubectl --namespace=kube-system get deployment --show-labels --watch -o=wide' -alias kgstsslwowide='kubectl get statefulset --show-labels --watch -o=wide' -alias ksysgstsslwowide='kubectl --namespace=kube-system get statefulset --show-labels --watch -o=wide' -alias kgsvcslwowide='kubectl get service --show-labels --watch -o=wide' -alias ksysgsvcslwowide='kubectl --namespace=kube-system get service --show-labels --watch -o=wide' -alias kgingslwowide='kubectl get ingress --show-labels --watch -o=wide' -alias ksysgingslwowide='kubectl --namespace=kube-system get ingress --show-labels --watch -o=wide' -alias kgcmslwowide='kubectl get configmap --show-labels --watch -o=wide' -alias ksysgcmslwowide='kubectl --namespace=kube-system get configmap --show-labels --watch -o=wide' -alias kgsecslwowide='kubectl get secret --show-labels --watch -o=wide' -alias ksysgsecslwowide='kubectl --namespace=kube-system get secret --show-labels --watch -o=wide' -alias kgnoslwowide='kubectl get nodes --show-labels --watch -o=wide' -alias kgnsslwowide='kubectl get namespaces --show-labels --watch -o=wide' -alias kgwowidesl='kubectl get --watch -o=wide --show-labels' -alias ksysgwowidesl='kubectl --namespace=kube-system get --watch -o=wide --show-labels' -alias kgpowowidesl='kubectl get pods --watch -o=wide --show-labels' -alias ksysgpowowidesl='kubectl --namespace=kube-system get pods --watch -o=wide --show-labels' -alias kgdepwowidesl='kubectl get deployment --watch -o=wide --show-labels' -alias ksysgdepwowidesl='kubectl --namespace=kube-system get deployment --watch -o=wide --show-labels' -alias kgstswowidesl='kubectl get statefulset --watch -o=wide --show-labels' -alias ksysgstswowidesl='kubectl --namespace=kube-system get statefulset --watch -o=wide --show-labels' -alias kgsvcwowidesl='kubectl get service --watch -o=wide --show-labels' -alias ksysgsvcwowidesl='kubectl --namespace=kube-system get service --watch -o=wide --show-labels' -alias kgingwowidesl='kubectl get ingress --watch -o=wide --show-labels' -alias ksysgingwowidesl='kubectl --namespace=kube-system get ingress --watch -o=wide --show-labels' -alias kgcmwowidesl='kubectl get configmap --watch -o=wide --show-labels' -alias ksysgcmwowidesl='kubectl --namespace=kube-system get configmap --watch -o=wide --show-labels' -alias kgsecwowidesl='kubectl get secret --watch -o=wide --show-labels' -alias ksysgsecwowidesl='kubectl --namespace=kube-system get secret --watch -o=wide --show-labels' -alias kgnowowidesl='kubectl get nodes --watch -o=wide --show-labels' -alias kgnswowidesl='kubectl get namespaces --watch -o=wide --show-labels' -alias kgwslowide='kubectl get --watch --show-labels -o=wide' -alias ksysgwslowide='kubectl --namespace=kube-system get --watch --show-labels -o=wide' -alias kgpowslowide='kubectl get pods --watch --show-labels -o=wide' -alias ksysgpowslowide='kubectl --namespace=kube-system get pods --watch --show-labels -o=wide' -alias kgdepwslowide='kubectl get deployment --watch --show-labels -o=wide' -alias ksysgdepwslowide='kubectl --namespace=kube-system get deployment --watch --show-labels -o=wide' -alias kgstswslowide='kubectl get statefulset --watch --show-labels -o=wide' -alias ksysgstswslowide='kubectl --namespace=kube-system get statefulset --watch --show-labels -o=wide' -alias kgsvcwslowide='kubectl get service --watch --show-labels -o=wide' -alias ksysgsvcwslowide='kubectl --namespace=kube-system get service --watch --show-labels -o=wide' -alias kgingwslowide='kubectl get ingress --watch --show-labels -o=wide' -alias ksysgingwslowide='kubectl --namespace=kube-system get ingress --watch --show-labels -o=wide' -alias kgcmwslowide='kubectl get configmap --watch --show-labels -o=wide' -alias ksysgcmwslowide='kubectl --namespace=kube-system get configmap --watch --show-labels -o=wide' -alias kgsecwslowide='kubectl get secret --watch --show-labels -o=wide' -alias ksysgsecwslowide='kubectl --namespace=kube-system get secret --watch --show-labels -o=wide' -alias kgnowslowide='kubectl get nodes --watch --show-labels -o=wide' -alias kgnswslowide='kubectl get namespaces --watch --show-labels -o=wide' -alias kgallwojson='kubectl get --all-namespaces --watch -o=json' -alias kgpoallwojson='kubectl get pods --all-namespaces --watch -o=json' -alias kgdepallwojson='kubectl get deployment --all-namespaces --watch -o=json' -alias kgstsallwojson='kubectl get statefulset --all-namespaces --watch -o=json' -alias kgsvcallwojson='kubectl get service --all-namespaces --watch -o=json' -alias kgingallwojson='kubectl get ingress --all-namespaces --watch -o=json' -alias kgcmallwojson='kubectl get configmap --all-namespaces --watch -o=json' -alias kgsecallwojson='kubectl get secret --all-namespaces --watch -o=json' -alias kgnsallwojson='kubectl get namespaces --all-namespaces --watch -o=json' -alias kgwojsonall='kubectl get --watch -o=json --all-namespaces' -alias kgpowojsonall='kubectl get pods --watch -o=json --all-namespaces' -alias kgdepwojsonall='kubectl get deployment --watch -o=json --all-namespaces' -alias kgstswojsonall='kubectl get statefulset --watch -o=json --all-namespaces' -alias kgsvcwojsonall='kubectl get service --watch -o=json --all-namespaces' -alias kgingwojsonall='kubectl get ingress --watch -o=json --all-namespaces' -alias kgcmwojsonall='kubectl get configmap --watch -o=json --all-namespaces' -alias kgsecwojsonall='kubectl get secret --watch -o=json --all-namespaces' -alias kgnswojsonall='kubectl get namespaces --watch -o=json --all-namespaces' -alias kgwallojson='kubectl get --watch --all-namespaces -o=json' -alias kgpowallojson='kubectl get pods --watch --all-namespaces -o=json' -alias kgdepwallojson='kubectl get deployment --watch --all-namespaces -o=json' -alias kgstswallojson='kubectl get statefulset --watch --all-namespaces -o=json' -alias kgsvcwallojson='kubectl get service --watch --all-namespaces -o=json' -alias kgingwallojson='kubectl get ingress --watch --all-namespaces -o=json' -alias kgcmwallojson='kubectl get configmap --watch --all-namespaces -o=json' -alias kgsecwallojson='kubectl get secret --watch --all-namespaces -o=json' -alias kgnswallojson='kubectl get namespaces --watch --all-namespaces -o=json' alias kgallslw='kubectl get --all-namespaces --show-labels --watch' alias kgpoallslw='kubectl get pods --all-namespaces --show-labels --watch' alias kgdepallslw='kubectl get deployment --all-namespaces --show-labels --watch' @@ -675,114 +488,6 @@ alias kgingwslall='kubectl get ingress --watch --show-labels --all-namespaces' alias kgcmwslall='kubectl get configmap --watch --show-labels --all-namespaces' alias kgsecwslall='kubectl get secret --watch --show-labels --all-namespaces' alias kgnswslall='kubectl get namespaces --watch --show-labels --all-namespaces' -alias kgallslwowide='kubectl get --all-namespaces --show-labels --watch -o=wide' -alias kgpoallslwowide='kubectl get pods --all-namespaces --show-labels --watch -o=wide' -alias kgdepallslwowide='kubectl get deployment --all-namespaces --show-labels --watch -o=wide' -alias kgstsallslwowide='kubectl get statefulset --all-namespaces --show-labels --watch -o=wide' -alias kgsvcallslwowide='kubectl get service --all-namespaces --show-labels --watch -o=wide' -alias kgingallslwowide='kubectl get ingress --all-namespaces --show-labels --watch -o=wide' -alias kgcmallslwowide='kubectl get configmap --all-namespaces --show-labels --watch -o=wide' -alias kgsecallslwowide='kubectl get secret --all-namespaces --show-labels --watch -o=wide' -alias kgnsallslwowide='kubectl get namespaces --all-namespaces --show-labels --watch -o=wide' -alias kgallwowidesl='kubectl get --all-namespaces --watch -o=wide --show-labels' -alias kgpoallwowidesl='kubectl get pods --all-namespaces --watch -o=wide --show-labels' -alias kgdepallwowidesl='kubectl get deployment --all-namespaces --watch -o=wide --show-labels' -alias kgstsallwowidesl='kubectl get statefulset --all-namespaces --watch -o=wide --show-labels' -alias kgsvcallwowidesl='kubectl get service --all-namespaces --watch -o=wide --show-labels' -alias kgingallwowidesl='kubectl get ingress --all-namespaces --watch -o=wide --show-labels' -alias kgcmallwowidesl='kubectl get configmap --all-namespaces --watch -o=wide --show-labels' -alias kgsecallwowidesl='kubectl get secret --all-namespaces --watch -o=wide --show-labels' -alias kgnsallwowidesl='kubectl get namespaces --all-namespaces --watch -o=wide --show-labels' -alias kgallwslowide='kubectl get --all-namespaces --watch --show-labels -o=wide' -alias kgpoallwslowide='kubectl get pods --all-namespaces --watch --show-labels -o=wide' -alias kgdepallwslowide='kubectl get deployment --all-namespaces --watch --show-labels -o=wide' -alias kgstsallwslowide='kubectl get statefulset --all-namespaces --watch --show-labels -o=wide' -alias kgsvcallwslowide='kubectl get service --all-namespaces --watch --show-labels -o=wide' -alias kgingallwslowide='kubectl get ingress --all-namespaces --watch --show-labels -o=wide' -alias kgcmallwslowide='kubectl get configmap --all-namespaces --watch --show-labels -o=wide' -alias kgsecallwslowide='kubectl get secret --all-namespaces --watch --show-labels -o=wide' -alias kgnsallwslowide='kubectl get namespaces --all-namespaces --watch --show-labels -o=wide' -alias kgslallwowide='kubectl get --show-labels --all-namespaces --watch -o=wide' -alias kgposlallwowide='kubectl get pods --show-labels --all-namespaces --watch -o=wide' -alias kgdepslallwowide='kubectl get deployment --show-labels --all-namespaces --watch -o=wide' -alias kgstsslallwowide='kubectl get statefulset --show-labels --all-namespaces --watch -o=wide' -alias kgsvcslallwowide='kubectl get service --show-labels --all-namespaces --watch -o=wide' -alias kgingslallwowide='kubectl get ingress --show-labels --all-namespaces --watch -o=wide' -alias kgcmslallwowide='kubectl get configmap --show-labels --all-namespaces --watch -o=wide' -alias kgsecslallwowide='kubectl get secret --show-labels --all-namespaces --watch -o=wide' -alias kgnsslallwowide='kubectl get namespaces --show-labels --all-namespaces --watch -o=wide' -alias kgslwowideall='kubectl get --show-labels --watch -o=wide --all-namespaces' -alias kgposlwowideall='kubectl get pods --show-labels --watch -o=wide --all-namespaces' -alias kgdepslwowideall='kubectl get deployment --show-labels --watch -o=wide --all-namespaces' -alias kgstsslwowideall='kubectl get statefulset --show-labels --watch -o=wide --all-namespaces' -alias kgsvcslwowideall='kubectl get service --show-labels --watch -o=wide --all-namespaces' -alias kgingslwowideall='kubectl get ingress --show-labels --watch -o=wide --all-namespaces' -alias kgcmslwowideall='kubectl get configmap --show-labels --watch -o=wide --all-namespaces' -alias kgsecslwowideall='kubectl get secret --show-labels --watch -o=wide --all-namespaces' -alias kgnsslwowideall='kubectl get namespaces --show-labels --watch -o=wide --all-namespaces' -alias kgslwallowide='kubectl get --show-labels --watch --all-namespaces -o=wide' -alias kgposlwallowide='kubectl get pods --show-labels --watch --all-namespaces -o=wide' -alias kgdepslwallowide='kubectl get deployment --show-labels --watch --all-namespaces -o=wide' -alias kgstsslwallowide='kubectl get statefulset --show-labels --watch --all-namespaces -o=wide' -alias kgsvcslwallowide='kubectl get service --show-labels --watch --all-namespaces -o=wide' -alias kgingslwallowide='kubectl get ingress --show-labels --watch --all-namespaces -o=wide' -alias kgcmslwallowide='kubectl get configmap --show-labels --watch --all-namespaces -o=wide' -alias kgsecslwallowide='kubectl get secret --show-labels --watch --all-namespaces -o=wide' -alias kgnsslwallowide='kubectl get namespaces --show-labels --watch --all-namespaces -o=wide' -alias kgwowideallsl='kubectl get --watch -o=wide --all-namespaces --show-labels' -alias kgpowowideallsl='kubectl get pods --watch -o=wide --all-namespaces --show-labels' -alias kgdepwowideallsl='kubectl get deployment --watch -o=wide --all-namespaces --show-labels' -alias kgstswowideallsl='kubectl get statefulset --watch -o=wide --all-namespaces --show-labels' -alias kgsvcwowideallsl='kubectl get service --watch -o=wide --all-namespaces --show-labels' -alias kgingwowideallsl='kubectl get ingress --watch -o=wide --all-namespaces --show-labels' -alias kgcmwowideallsl='kubectl get configmap --watch -o=wide --all-namespaces --show-labels' -alias kgsecwowideallsl='kubectl get secret --watch -o=wide --all-namespaces --show-labels' -alias kgnswowideallsl='kubectl get namespaces --watch -o=wide --all-namespaces --show-labels' -alias kgwowideslall='kubectl get --watch -o=wide --show-labels --all-namespaces' -alias kgpowowideslall='kubectl get pods --watch -o=wide --show-labels --all-namespaces' -alias kgdepwowideslall='kubectl get deployment --watch -o=wide --show-labels --all-namespaces' -alias kgstswowideslall='kubectl get statefulset --watch -o=wide --show-labels --all-namespaces' -alias kgsvcwowideslall='kubectl get service --watch -o=wide --show-labels --all-namespaces' -alias kgingwowideslall='kubectl get ingress --watch -o=wide --show-labels --all-namespaces' -alias kgcmwowideslall='kubectl get configmap --watch -o=wide --show-labels --all-namespaces' -alias kgsecwowideslall='kubectl get secret --watch -o=wide --show-labels --all-namespaces' -alias kgnswowideslall='kubectl get namespaces --watch -o=wide --show-labels --all-namespaces' -alias kgwallowidesl='kubectl get --watch --all-namespaces -o=wide --show-labels' -alias kgpowallowidesl='kubectl get pods --watch --all-namespaces -o=wide --show-labels' -alias kgdepwallowidesl='kubectl get deployment --watch --all-namespaces -o=wide --show-labels' -alias kgstswallowidesl='kubectl get statefulset --watch --all-namespaces -o=wide --show-labels' -alias kgsvcwallowidesl='kubectl get service --watch --all-namespaces -o=wide --show-labels' -alias kgingwallowidesl='kubectl get ingress --watch --all-namespaces -o=wide --show-labels' -alias kgcmwallowidesl='kubectl get configmap --watch --all-namespaces -o=wide --show-labels' -alias kgsecwallowidesl='kubectl get secret --watch --all-namespaces -o=wide --show-labels' -alias kgnswallowidesl='kubectl get namespaces --watch --all-namespaces -o=wide --show-labels' -alias kgwallslowide='kubectl get --watch --all-namespaces --show-labels -o=wide' -alias kgpowallslowide='kubectl get pods --watch --all-namespaces --show-labels -o=wide' -alias kgdepwallslowide='kubectl get deployment --watch --all-namespaces --show-labels -o=wide' -alias kgstswallslowide='kubectl get statefulset --watch --all-namespaces --show-labels -o=wide' -alias kgsvcwallslowide='kubectl get service --watch --all-namespaces --show-labels -o=wide' -alias kgingwallslowide='kubectl get ingress --watch --all-namespaces --show-labels -o=wide' -alias kgcmwallslowide='kubectl get configmap --watch --all-namespaces --show-labels -o=wide' -alias kgsecwallslowide='kubectl get secret --watch --all-namespaces --show-labels -o=wide' -alias kgnswallslowide='kubectl get namespaces --watch --all-namespaces --show-labels -o=wide' -alias kgwslowideall='kubectl get --watch --show-labels -o=wide --all-namespaces' -alias kgpowslowideall='kubectl get pods --watch --show-labels -o=wide --all-namespaces' -alias kgdepwslowideall='kubectl get deployment --watch --show-labels -o=wide --all-namespaces' -alias kgstswslowideall='kubectl get statefulset --watch --show-labels -o=wide --all-namespaces' -alias kgsvcwslowideall='kubectl get service --watch --show-labels -o=wide --all-namespaces' -alias kgingwslowideall='kubectl get ingress --watch --show-labels -o=wide --all-namespaces' -alias kgcmwslowideall='kubectl get configmap --watch --show-labels -o=wide --all-namespaces' -alias kgsecwslowideall='kubectl get secret --watch --show-labels -o=wide --all-namespaces' -alias kgnswslowideall='kubectl get namespaces --watch --show-labels -o=wide --all-namespaces' -alias kgwslallowide='kubectl get --watch --show-labels --all-namespaces -o=wide' -alias kgpowslallowide='kubectl get pods --watch --show-labels --all-namespaces -o=wide' -alias kgdepwslallowide='kubectl get deployment --watch --show-labels --all-namespaces -o=wide' -alias kgstswslallowide='kubectl get statefulset --watch --show-labels --all-namespaces -o=wide' -alias kgsvcwslallowide='kubectl get service --watch --show-labels --all-namespaces -o=wide' -alias kgingwslallowide='kubectl get ingress --watch --show-labels --all-namespaces -o=wide' -alias kgcmwslallowide='kubectl get configmap --watch --show-labels --all-namespaces -o=wide' -alias kgsecwslallowide='kubectl get secret --watch --show-labels --all-namespaces -o=wide' -alias kgnswslallowide='kubectl get namespaces --watch --show-labels --all-namespaces -o=wide' alias kgf='kubectl get --recursive -f' alias kdf='kubectl describe --recursive -f' alias krmf='kubectl delete --recursive -f' @@ -791,16 +496,10 @@ alias kgowidef='kubectl get -o=wide --recursive -f' alias kgojsonf='kubectl get -o=json --recursive -f' alias kgslf='kubectl get --show-labels --recursive -f' alias kgwf='kubectl get --watch --recursive -f' -alias kgwoyamlf='kubectl get --watch -o=yaml --recursive -f' alias kgowideslf='kubectl get -o=wide --show-labels --recursive -f' alias kgslowidef='kubectl get --show-labels -o=wide --recursive -f' -alias kgwowidef='kubectl get --watch -o=wide --recursive -f' -alias kgwojsonf='kubectl get --watch -o=json --recursive -f' alias kgslwf='kubectl get --show-labels --watch --recursive -f' alias kgwslf='kubectl get --watch --show-labels --recursive -f' -alias kgslwowidef='kubectl get --show-labels --watch -o=wide --recursive -f' -alias kgwowideslf='kubectl get --watch -o=wide --show-labels --recursive -f' -alias kgwslowidef='kubectl get --watch --show-labels -o=wide --recursive -f' alias kgl='kubectl get -l' alias ksysgl='kubectl --namespace=kube-system get -l' alias kdl='kubectl describe -l' @@ -944,24 +643,6 @@ alias kgsecwl='kubectl get secret --watch -l' alias ksysgsecwl='kubectl --namespace=kube-system get secret --watch -l' alias kgnowl='kubectl get nodes --watch -l' alias kgnswl='kubectl get namespaces --watch -l' -alias kgwoyamll='kubectl get --watch -o=yaml -l' -alias ksysgwoyamll='kubectl --namespace=kube-system get --watch -o=yaml -l' -alias kgpowoyamll='kubectl get pods --watch -o=yaml -l' -alias ksysgpowoyamll='kubectl --namespace=kube-system get pods --watch -o=yaml -l' -alias kgdepwoyamll='kubectl get deployment --watch -o=yaml -l' -alias ksysgdepwoyamll='kubectl --namespace=kube-system get deployment --watch -o=yaml -l' -alias kgstswoyamll='kubectl get statefulset --watch -o=yaml -l' -alias ksysgstswoyamll='kubectl --namespace=kube-system get statefulset --watch -o=yaml -l' -alias kgsvcwoyamll='kubectl get service --watch -o=yaml -l' -alias ksysgsvcwoyamll='kubectl --namespace=kube-system get service --watch -o=yaml -l' -alias kgingwoyamll='kubectl get ingress --watch -o=yaml -l' -alias ksysgingwoyamll='kubectl --namespace=kube-system get ingress --watch -o=yaml -l' -alias kgcmwoyamll='kubectl get configmap --watch -o=yaml -l' -alias ksysgcmwoyamll='kubectl --namespace=kube-system get configmap --watch -o=yaml -l' -alias kgsecwoyamll='kubectl get secret --watch -o=yaml -l' -alias ksysgsecwoyamll='kubectl --namespace=kube-system get secret --watch -o=yaml -l' -alias kgnowoyamll='kubectl get nodes --watch -o=yaml -l' -alias kgnswoyamll='kubectl get namespaces --watch -o=yaml -l' alias kgowidesll='kubectl get -o=wide --show-labels -l' alias ksysgowidesll='kubectl --namespace=kube-system get -o=wide --show-labels -l' alias kgpoowidesll='kubectl get pods -o=wide --show-labels -l' @@ -998,42 +679,6 @@ alias kgsecslowidel='kubectl get secret --show-labels -o=wide -l' alias ksysgsecslowidel='kubectl --namespace=kube-system get secret --show-labels -o=wide -l' alias kgnoslowidel='kubectl get nodes --show-labels -o=wide -l' alias kgnsslowidel='kubectl get namespaces --show-labels -o=wide -l' -alias kgwowidel='kubectl get --watch -o=wide -l' -alias ksysgwowidel='kubectl --namespace=kube-system get --watch -o=wide -l' -alias kgpowowidel='kubectl get pods --watch -o=wide -l' -alias ksysgpowowidel='kubectl --namespace=kube-system get pods --watch -o=wide -l' -alias kgdepwowidel='kubectl get deployment --watch -o=wide -l' -alias ksysgdepwowidel='kubectl --namespace=kube-system get deployment --watch -o=wide -l' -alias kgstswowidel='kubectl get statefulset --watch -o=wide -l' -alias ksysgstswowidel='kubectl --namespace=kube-system get statefulset --watch -o=wide -l' -alias kgsvcwowidel='kubectl get service --watch -o=wide -l' -alias ksysgsvcwowidel='kubectl --namespace=kube-system get service --watch -o=wide -l' -alias kgingwowidel='kubectl get ingress --watch -o=wide -l' -alias ksysgingwowidel='kubectl --namespace=kube-system get ingress --watch -o=wide -l' -alias kgcmwowidel='kubectl get configmap --watch -o=wide -l' -alias ksysgcmwowidel='kubectl --namespace=kube-system get configmap --watch -o=wide -l' -alias kgsecwowidel='kubectl get secret --watch -o=wide -l' -alias ksysgsecwowidel='kubectl --namespace=kube-system get secret --watch -o=wide -l' -alias kgnowowidel='kubectl get nodes --watch -o=wide -l' -alias kgnswowidel='kubectl get namespaces --watch -o=wide -l' -alias kgwojsonl='kubectl get --watch -o=json -l' -alias ksysgwojsonl='kubectl --namespace=kube-system get --watch -o=json -l' -alias kgpowojsonl='kubectl get pods --watch -o=json -l' -alias ksysgpowojsonl='kubectl --namespace=kube-system get pods --watch -o=json -l' -alias kgdepwojsonl='kubectl get deployment --watch -o=json -l' -alias ksysgdepwojsonl='kubectl --namespace=kube-system get deployment --watch -o=json -l' -alias kgstswojsonl='kubectl get statefulset --watch -o=json -l' -alias ksysgstswojsonl='kubectl --namespace=kube-system get statefulset --watch -o=json -l' -alias kgsvcwojsonl='kubectl get service --watch -o=json -l' -alias ksysgsvcwojsonl='kubectl --namespace=kube-system get service --watch -o=json -l' -alias kgingwojsonl='kubectl get ingress --watch -o=json -l' -alias ksysgingwojsonl='kubectl --namespace=kube-system get ingress --watch -o=json -l' -alias kgcmwojsonl='kubectl get configmap --watch -o=json -l' -alias ksysgcmwojsonl='kubectl --namespace=kube-system get configmap --watch -o=json -l' -alias kgsecwojsonl='kubectl get secret --watch -o=json -l' -alias ksysgsecwojsonl='kubectl --namespace=kube-system get secret --watch -o=json -l' -alias kgnowojsonl='kubectl get nodes --watch -o=json -l' -alias kgnswojsonl='kubectl get namespaces --watch -o=json -l' alias kgslwl='kubectl get --show-labels --watch -l' alias ksysgslwl='kubectl --namespace=kube-system get --show-labels --watch -l' alias kgposlwl='kubectl get pods --show-labels --watch -l' @@ -1070,60 +715,6 @@ alias kgsecwsll='kubectl get secret --watch --show-labels -l' alias ksysgsecwsll='kubectl --namespace=kube-system get secret --watch --show-labels -l' alias kgnowsll='kubectl get nodes --watch --show-labels -l' alias kgnswsll='kubectl get namespaces --watch --show-labels -l' -alias kgslwowidel='kubectl get --show-labels --watch -o=wide -l' -alias ksysgslwowidel='kubectl --namespace=kube-system get --show-labels --watch -o=wide -l' -alias kgposlwowidel='kubectl get pods --show-labels --watch -o=wide -l' -alias ksysgposlwowidel='kubectl --namespace=kube-system get pods --show-labels --watch -o=wide -l' -alias kgdepslwowidel='kubectl get deployment --show-labels --watch -o=wide -l' -alias ksysgdepslwowidel='kubectl --namespace=kube-system get deployment --show-labels --watch -o=wide -l' -alias kgstsslwowidel='kubectl get statefulset --show-labels --watch -o=wide -l' -alias ksysgstsslwowidel='kubectl --namespace=kube-system get statefulset --show-labels --watch -o=wide -l' -alias kgsvcslwowidel='kubectl get service --show-labels --watch -o=wide -l' -alias ksysgsvcslwowidel='kubectl --namespace=kube-system get service --show-labels --watch -o=wide -l' -alias kgingslwowidel='kubectl get ingress --show-labels --watch -o=wide -l' -alias ksysgingslwowidel='kubectl --namespace=kube-system get ingress --show-labels --watch -o=wide -l' -alias kgcmslwowidel='kubectl get configmap --show-labels --watch -o=wide -l' -alias ksysgcmslwowidel='kubectl --namespace=kube-system get configmap --show-labels --watch -o=wide -l' -alias kgsecslwowidel='kubectl get secret --show-labels --watch -o=wide -l' -alias ksysgsecslwowidel='kubectl --namespace=kube-system get secret --show-labels --watch -o=wide -l' -alias kgnoslwowidel='kubectl get nodes --show-labels --watch -o=wide -l' -alias kgnsslwowidel='kubectl get namespaces --show-labels --watch -o=wide -l' -alias kgwowidesll='kubectl get --watch -o=wide --show-labels -l' -alias ksysgwowidesll='kubectl --namespace=kube-system get --watch -o=wide --show-labels -l' -alias kgpowowidesll='kubectl get pods --watch -o=wide --show-labels -l' -alias ksysgpowowidesll='kubectl --namespace=kube-system get pods --watch -o=wide --show-labels -l' -alias kgdepwowidesll='kubectl get deployment --watch -o=wide --show-labels -l' -alias ksysgdepwowidesll='kubectl --namespace=kube-system get deployment --watch -o=wide --show-labels -l' -alias kgstswowidesll='kubectl get statefulset --watch -o=wide --show-labels -l' -alias ksysgstswowidesll='kubectl --namespace=kube-system get statefulset --watch -o=wide --show-labels -l' -alias kgsvcwowidesll='kubectl get service --watch -o=wide --show-labels -l' -alias ksysgsvcwowidesll='kubectl --namespace=kube-system get service --watch -o=wide --show-labels -l' -alias kgingwowidesll='kubectl get ingress --watch -o=wide --show-labels -l' -alias ksysgingwowidesll='kubectl --namespace=kube-system get ingress --watch -o=wide --show-labels -l' -alias kgcmwowidesll='kubectl get configmap --watch -o=wide --show-labels -l' -alias ksysgcmwowidesll='kubectl --namespace=kube-system get configmap --watch -o=wide --show-labels -l' -alias kgsecwowidesll='kubectl get secret --watch -o=wide --show-labels -l' -alias ksysgsecwowidesll='kubectl --namespace=kube-system get secret --watch -o=wide --show-labels -l' -alias kgnowowidesll='kubectl get nodes --watch -o=wide --show-labels -l' -alias kgnswowidesll='kubectl get namespaces --watch -o=wide --show-labels -l' -alias kgwslowidel='kubectl get --watch --show-labels -o=wide -l' -alias ksysgwslowidel='kubectl --namespace=kube-system get --watch --show-labels -o=wide -l' -alias kgpowslowidel='kubectl get pods --watch --show-labels -o=wide -l' -alias ksysgpowslowidel='kubectl --namespace=kube-system get pods --watch --show-labels -o=wide -l' -alias kgdepwslowidel='kubectl get deployment --watch --show-labels -o=wide -l' -alias ksysgdepwslowidel='kubectl --namespace=kube-system get deployment --watch --show-labels -o=wide -l' -alias kgstswslowidel='kubectl get statefulset --watch --show-labels -o=wide -l' -alias ksysgstswslowidel='kubectl --namespace=kube-system get statefulset --watch --show-labels -o=wide -l' -alias kgsvcwslowidel='kubectl get service --watch --show-labels -o=wide -l' -alias ksysgsvcwslowidel='kubectl --namespace=kube-system get service --watch --show-labels -o=wide -l' -alias kgingwslowidel='kubectl get ingress --watch --show-labels -o=wide -l' -alias ksysgingwslowidel='kubectl --namespace=kube-system get ingress --watch --show-labels -o=wide -l' -alias kgcmwslowidel='kubectl get configmap --watch --show-labels -o=wide -l' -alias ksysgcmwslowidel='kubectl --namespace=kube-system get configmap --watch --show-labels -o=wide -l' -alias kgsecwslowidel='kubectl get secret --watch --show-labels -o=wide -l' -alias ksysgsecwslowidel='kubectl --namespace=kube-system get secret --watch --show-labels -o=wide -l' -alias kgnowslowidel='kubectl get nodes --watch --show-labels -o=wide -l' -alias kgnswslowidel='kubectl get namespaces --watch --show-labels -o=wide -l' alias kexn='kubectl exec -i -t --namespace' alias klon='kubectl logs -f --namespace' alias kpfn='kubectl port-forward --namespace' @@ -1191,14 +782,6 @@ alias kgsvcwn='kubectl get service --watch --namespace' alias kgingwn='kubectl get ingress --watch --namespace' alias kgcmwn='kubectl get configmap --watch --namespace' alias kgsecwn='kubectl get secret --watch --namespace' -alias kgwoyamln='kubectl get --watch -o=yaml --namespace' -alias kgpowoyamln='kubectl get pods --watch -o=yaml --namespace' -alias kgdepwoyamln='kubectl get deployment --watch -o=yaml --namespace' -alias kgstswoyamln='kubectl get statefulset --watch -o=yaml --namespace' -alias kgsvcwoyamln='kubectl get service --watch -o=yaml --namespace' -alias kgingwoyamln='kubectl get ingress --watch -o=yaml --namespace' -alias kgcmwoyamln='kubectl get configmap --watch -o=yaml --namespace' -alias kgsecwoyamln='kubectl get secret --watch -o=yaml --namespace' alias kgowidesln='kubectl get -o=wide --show-labels --namespace' alias kgpoowidesln='kubectl get pods -o=wide --show-labels --namespace' alias kgdepowidesln='kubectl get deployment -o=wide --show-labels --namespace' @@ -1215,22 +798,6 @@ alias kgsvcslowiden='kubectl get service --show-labels -o=wide --namespace' alias kgingslowiden='kubectl get ingress --show-labels -o=wide --namespace' alias kgcmslowiden='kubectl get configmap --show-labels -o=wide --namespace' alias kgsecslowiden='kubectl get secret --show-labels -o=wide --namespace' -alias kgwowiden='kubectl get --watch -o=wide --namespace' -alias kgpowowiden='kubectl get pods --watch -o=wide --namespace' -alias kgdepwowiden='kubectl get deployment --watch -o=wide --namespace' -alias kgstswowiden='kubectl get statefulset --watch -o=wide --namespace' -alias kgsvcwowiden='kubectl get service --watch -o=wide --namespace' -alias kgingwowiden='kubectl get ingress --watch -o=wide --namespace' -alias kgcmwowiden='kubectl get configmap --watch -o=wide --namespace' -alias kgsecwowiden='kubectl get secret --watch -o=wide --namespace' -alias kgwojsonn='kubectl get --watch -o=json --namespace' -alias kgpowojsonn='kubectl get pods --watch -o=json --namespace' -alias kgdepwojsonn='kubectl get deployment --watch -o=json --namespace' -alias kgstswojsonn='kubectl get statefulset --watch -o=json --namespace' -alias kgsvcwojsonn='kubectl get service --watch -o=json --namespace' -alias kgingwojsonn='kubectl get ingress --watch -o=json --namespace' -alias kgcmwojsonn='kubectl get configmap --watch -o=json --namespace' -alias kgsecwojsonn='kubectl get secret --watch -o=json --namespace' alias kgslwn='kubectl get --show-labels --watch --namespace' alias kgposlwn='kubectl get pods --show-labels --watch --namespace' alias kgdepslwn='kubectl get deployment --show-labels --watch --namespace' @@ -1247,29 +814,5 @@ alias kgsvcwsln='kubectl get service --watch --show-labels --namespace' alias kgingwsln='kubectl get ingress --watch --show-labels --namespace' alias kgcmwsln='kubectl get configmap --watch --show-labels --namespace' alias kgsecwsln='kubectl get secret --watch --show-labels --namespace' -alias kgslwowiden='kubectl get --show-labels --watch -o=wide --namespace' -alias kgposlwowiden='kubectl get pods --show-labels --watch -o=wide --namespace' -alias kgdepslwowiden='kubectl get deployment --show-labels --watch -o=wide --namespace' -alias kgstsslwowiden='kubectl get statefulset --show-labels --watch -o=wide --namespace' -alias kgsvcslwowiden='kubectl get service --show-labels --watch -o=wide --namespace' -alias kgingslwowiden='kubectl get ingress --show-labels --watch -o=wide --namespace' -alias kgcmslwowiden='kubectl get configmap --show-labels --watch -o=wide --namespace' -alias kgsecslwowiden='kubectl get secret --show-labels --watch -o=wide --namespace' -alias kgwowidesln='kubectl get --watch -o=wide --show-labels --namespace' -alias kgpowowidesln='kubectl get pods --watch -o=wide --show-labels --namespace' -alias kgdepwowidesln='kubectl get deployment --watch -o=wide --show-labels --namespace' -alias kgstswowidesln='kubectl get statefulset --watch -o=wide --show-labels --namespace' -alias kgsvcwowidesln='kubectl get service --watch -o=wide --show-labels --namespace' -alias kgingwowidesln='kubectl get ingress --watch -o=wide --show-labels --namespace' -alias kgcmwowidesln='kubectl get configmap --watch -o=wide --show-labels --namespace' -alias kgsecwowidesln='kubectl get secret --watch -o=wide --show-labels --namespace' -alias kgwslowiden='kubectl get --watch --show-labels -o=wide --namespace' -alias kgpowslowiden='kubectl get pods --watch --show-labels -o=wide --namespace' -alias kgdepwslowiden='kubectl get deployment --watch --show-labels -o=wide --namespace' -alias kgstswslowiden='kubectl get statefulset --watch --show-labels -o=wide --namespace' -alias kgsvcwslowiden='kubectl get service --watch --show-labels -o=wide --namespace' -alias kgingwslowiden='kubectl get ingress --watch --show-labels -o=wide --namespace' -alias kgcmwslowiden='kubectl get configmap --watch --show-labels -o=wide --namespace' -alias kgsecwslowiden='kubectl get secret --watch --show-labels -o=wide --namespace' # vim: ft=zsh diff --git a/.config/zsh/completions/_gi b/.config/zsh/completions/_gi index 492a817..bac98ac 100644 --- a/.config/zsh/completions/_gi +++ b/.config/zsh/completions/_gi @@ -1,10 +1,10 @@ #compdef gi _gitignoreio_get_command_list() { - curl -sfL https://www.toptal.com/developers/gitignore/api/list | tr "," "\n" + curl -sfL https://www.toptal.com/developers/gitignore/api/list | tr ',' '\n' } -_gi () { - compset -P '*,' - compadd -S '' `_gitignoreio_get_command_list` +_gi() { + compset -P '*,' + compadd -S '' `_gitignoreio_get_command_list` } diff --git a/.config/zsh/completions/_j b/.config/zsh/completions/_j index e49039c..7db1c50 100644 --- a/.config/zsh/completions/_j +++ b/.config/zsh/completions/_j @@ -1,3 +1,5 @@ #compdef j -_arguments "1: :($(find . -mount -name "$1*" -type d -printf "'%P' " 2> /dev/null))" +_j() { + _arguments "1: :($(find . -mount -name "$1*" -type d -printf "'%P' " 2> /dev/null))" +} diff --git a/.config/zsh/completions/_kxn b/.config/zsh/completions/_kxn index 188bc65..5603492 100644 --- a/.config/zsh/completions/_kxn +++ b/.config/zsh/completions/_kxn @@ -1,12 +1,14 @@ #compdef kxn -case "$#words" in - 2) - _arguments "1: :(- $(kubectl config get-contexts -oname))" - ;; - 3) - _arguments "2: :($(kubectl --context "${words[2]}" get namespaces -o=jsonpath='{range .items[*].metadata.name}{@}{"\n"}{end}'))" - ;; - *) - ;; -esac +_kxn() { + case "$#words" in + 2) + _arguments "1: :(- $(kubectl config get-contexts -oname))" + ;; + 3) + _arguments "2: :($(kubectl --context "${words[2]}" get namespaces -o=jsonpath='{range .items[*].metadata.name}{@}{"\n"}{end}'))" + ;; + *) + ;; + esac +} diff --git a/.config/zsh/powerlevel10k b/.config/zsh/powerlevel10k index 6234105..0cc19ac 160000 --- a/.config/zsh/powerlevel10k +++ b/.config/zsh/powerlevel10k @@ -1 +1 @@ -Subproject commit 62341054d8aa40ade03fc55bdbc95b9ff2d8d2b6 +Subproject commit 0cc19ac2ede35fd8accff590fa71df580dc7e109 diff --git a/.mail/ange@duhayon.com/.gitkeep b/.mail/ange@duhayon.com/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/.mail/ange@yw5n.com/.gitkeep b/.mail/ange@yw5n.com/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/.mbsyncrc b/.mbsyncrc deleted file mode 100644 index a7dce2c..0000000 --- a/.mbsyncrc +++ /dev/null @@ -1,47 +0,0 @@ -####################### -### Global settings ### -####################### - -Create Both -Expunge Both -SyncState * - -##################### -### ange@yw5n.com ### -##################### -IMAPStore ange@yw5n.com-remote -SSLType IMAPS -CertificateFile /etc/ssl/certs/ca-certificates.crt -Host ssl0.ovh.net -User ange@yw5n.com -PassCmd "pass show email/ange@yw5n.com" - -MaildirStore ange@yw5n.com-local -Path ~/.mail/ange@yw5n.com/ -Inbox ~/.mail/ange@yw5n.com/INBOX/ -SubFolders Verbatim - -Channel ange@yw5n.com -Far :ange@yw5n.com-remote: -Near :ange@yw5n.com-local: -Patterns * - -######################## -### ange@duhayon.com ### -######################## -IMAPStore ange@duhayon.com-remote -SSLType IMAPS -CertificateFile /etc/ssl/certs/ca-certificates.crt -Host ssl0.ovh.net -User ange@duhayon.com -PassCmd "pass show email/ange@duhayon.com" - -MaildirStore ange@duhayon.com-local -Path ~/.mail/ange@duhayon.com/ -Inbox ~/.mail/ange@duhayon.com/INBOX/ -SubFolders Verbatim - -Channel ange@duhayon.com -Far :ange@duhayon.com-remote: -Near :ange@duhayon.com-local: -Patterns * diff --git a/.mozilla/firefox/ange/user.js b/.mozilla/firefox/ange/user.js index 4f2ae3c..6a2a663 100644 --- a/.mozilla/firefox/ange/user.js +++ b/.mozilla/firefox/ange/user.js @@ -12,6 +12,7 @@ user_pref("browser.privatebrowsing.vpnpromourl", ""); user_pref("browser.startup.homepage", "chrome://browser/content/blanktab.html"); user_pref("browser.tabs.tabmanager.enabled", false); user_pref("browser.topsites.contile.cachedTiles", ""); +user_pref("browser.urlbar.update2.engineAliasRefresh", true); user_pref("datareporting.healthreport.uploadEnabled", false); user_pref("datareporting.policy.dataSubmissionEnabled", false); user_pref("dom.security.https_only_mode", true); diff --git a/.xinitrc b/.xinitrc index 738913a..b2b46d6 100644 --- a/.xinitrc +++ b/.xinitrc @@ -9,5 +9,7 @@ xss-lock -n screensaver -- lock & picom & gammastep 2> /dev/null & sbar & +flameshot & -exec dbus-launch dwm +dbus-update-activation-environment --systemd DISPLAY XAUTHORITY +exec dwm diff --git a/.zshenv b/.zshenv index 97a3be1..63dfa8c 100644 --- a/.zshenv +++ b/.zshenv @@ -10,7 +10,6 @@ export SAVEHIST=8192 export HISTFILE="$XDG_STATE_HOME/zsh_history" export ZDOTDIR="$XDG_CONFIG_HOME/zsh" -export ZSH_CUSTOM="$ZDOTDIR/custom" export LESSHISTFILE='-' export PYTHONPYCACHEPREFIX="$XDG_CACHE_HOME/python" diff --git a/bin/am b/bin/am index 96b1040..ba7b66b 100755 --- a/bin/am +++ b/bin/am @@ -6,13 +6,10 @@ # support for /mnt function get_row() { - local pos row + local row _col - printf '\e[6n' >&2 - read -sdRr pos - pos="${pos#*[}" - row="${pos%\;*}" - echo "$row" + IFS=';' read -sdR -p $'\e[6n' row _col + echo "${row#??}" } ROW="$(($(get_row) + 1))" @@ -25,47 +22,27 @@ function clear_output() { done } -function umount_all() { - local disks +function main() { + while true; do + readarray -t LSBLK <<< "$(lsblk -n --paths --list | grep part)" - readarray -t disks <<< "$(mount | grep udisks2 | cut -f1 -d' ')" + COLUMNS=1 + select dev in "${LSBLK[@]}"; do + if [ -z "$dev" ]; then + clear_output + break + fi + name="$(awk '{print $1}' <<< "$dev")" - umount "${disks[@]}" - echo "unmounted ${disks[*]}" + clear_output + if mount | grep -q "$name"; then + umount "$name" + else + udisksctl mount -b "$name" > /dev/null + fi + break + done || exit + done } -if ! [ -t 1 ]; then - exit 1 -fi - -while getopts a o; do - case "$o" in - a) - umount_all - exit - ;; - *) - ;; - esac -done - -while true; do - readarray -t LSBLK <<< "$(lsblk -n --paths --list | grep part)" - - COLUMNS=1 - select dev in "${LSBLK[@]}"; do - if [ -z "$dev" ]; then - clear_output - break - fi - name="$(cut -f1 -d' ' <<< "$dev")" - - clear_output - if mount | grep -q "$name"; then - umount "$name" - else - udisksctl mount -b "$name" > /dev/null - fi - break - done || exit -done +main "$@" diff --git a/bin/arch b/bin/arch index 030a534..bce7982 100755 --- a/bin/arch +++ b/bin/arch @@ -2,4 +2,4 @@ CRI=(sudo docker) -"${CRI[@]}" run --rm -it -v "$PWD:/mnt/" -w /mnt/ docker.io/archlinux:latest +"${CRI[@]}" run --rm -it -v "$PWD:/mnt/" -w /mnt/ docker.io/archlinux/archlinux:base diff --git a/bin/muttduhayon b/bin/muttduhayon deleted file mode 100755 index 110aebe..0000000 --- a/bin/muttduhayon +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -e - -neomutt -F "${XDG_CONFIG_HOME}/neomutt/ange@duhayon.com" "$@" diff --git a/bin/muttyw5n b/bin/muttyw5n deleted file mode 100755 index 7835bb2..0000000 --- a/bin/muttyw5n +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -e - -neomutt -F "${XDG_CONFIG_HOME}/neomutt/ange@yw5n.com" "$@" diff --git a/bin/passopen b/bin/passopen index ac8c631..64445bb 100755 --- a/bin/passopen +++ b/bin/passopen @@ -1,3 +1,3 @@ #!/bin/bash -e -xdg-open "$(pass "$(cat /tmp/passselect)" | sed -n 's/URL: //p')" +xdg-open "$(pass "$(cat /tmp/passselect)" | sed -n '/^URL:/{s/URL:\s*//p;q}')" diff --git a/bin/passuser b/bin/passuser index e062355..2fd8e6b 100755 --- a/bin/passuser +++ b/bin/passuser @@ -1,3 +1,3 @@ #!/bin/bash -e -xdotool type --clearmodifiers --delay 0 "$(pass "$(cat /tmp/passselect)" | sed -n 's/Username: //p')" +xdotool type --clearmodifiers --delay 0 "$(pass "$(cat /tmp/passselect)" | sed -n '/^Username:/{s/Username:\s*//p;q}')" diff --git a/bin/sbar b/bin/sbar index f9beb3d..fb09a4c 100755 --- a/bin/sbar +++ b/bin/sbar @@ -53,7 +53,7 @@ function update_source_vol() { function update_wlp() { local sig; sig="$(awk '$1 ~ "wlp" {print int($3)}' /proc/net/wireless)" - local ssid; ssid="$(nmcli device wifi show-password | sed -n 's/SSID: //p')" + local ssid; ssid="$(nmcli device wifi show-password | sed -n 's/SSID:\s*//p')" [ -z "$ssid" ] && wlp='⚠' && return [ -z "$sig" ] && sig=0 @@ -82,7 +82,7 @@ fi # SIGNALING # trap ';display' 'RTMIN+n' -trap 'update_sink_vol;display' 'RTMIN' +trap 'update_sink_vol;display' 'RTMIN' # to update it from external commands ## kill -m "$(cat ~/.cache/pidofbar)" # where m = 34 + n