Update alacritty conf to toml

alacritty/.config/alacritty/alacritty.toml

@@ -0,0 +1,45 @@
+[colors.bright]
+black = "#7f7f7f"
+blue = "#00a5ff"
+cyan = "#00ffff"
+green = "#00ff00"
+magenta = "#ff00ff"
+red = "#ff0000"
+white = "#ffffff"
+yellow = "#ffff00"
+
+[colors.normal]
+black = "#000000"
+blue = "#00a5ee"
+cyan = "#00cdcd"
+green = "#00cd00"
+magenta = "#cd00cd"
+red = "#cd0000"
+white = "#e5e5e5"
+yellow = "#cdcd00"
+
+[colors.primary]
+background = "#252525"
+foreground = "#cccccc"
+
+[env]
+TERM = "xterm-256color"
+
+[font]
+size = 9
+
+[font.bold]
+family = "monospace"
+style = "Bold"
+
+[font.bold_italic]
+family = "monospace"
+style = "Bold Italic"
+
+[font.italic]
+family = "monospace"
+style = "Italic"
+
+[font.normal]
+family = "monospace"
+style = "Regular"

alacritty/.config/alacritty/alacritty.yml

@@ -1,49 +0,0 @@
-env:
-  TERM: xterm-256color
-
-font:
-  normal:
-    family: monospace
-    style: Regular
-
-  bold:
-    family: monospace
-    style: Bold
-
-  italic:
-    family: monospace
-    style: Italic
-
-  bold_italic:
-    family: monospace
-    style: Bold Italic
-
-  size: 9
-
-colors:
-    # Default colors
-    primary:
-        background: '#252525'
-        foreground: '#cccccc'
-    # Normal colors
-    normal:
-        black:   '#000000'
-        red:     '#cd0000'
-        green:   '#00cd00'
-        yellow:  '#cdcd00'
-        blue:    '#00a5ee'
-        magenta: '#cd00cd'
-        cyan:    '#00cdcd'
-        white:   '#e5e5e5'
-
-    # Bright colors
-    bright:
-        black:   '#7f7f7f'
-        red:     '#ff0000'
-        green:   '#00ff00'
-        yellow:  '#ffff00'
-        blue:    '#00a5ff'
-        magenta: '#ff00ff'
-        cyan:    '#00ffff'
-        white:   '#ffffff'
-

sway/.config/waybar/config

@@ -5,7 +5,7 @@
     "spacing": 0,
     "modules-left": ["sway/workspaces", "sway/mode", "custom/media"],
     "modules-center": ["sway/window"],
-    "modules-right": ["idle_inhibitor", "network", "cpu", "temperature", "memory", "battery", "battery#bat0", "battery#bat1", "clock", "tray"],
+    "modules-right": ["idle_inhibitor", "network", "cpu", "temperature", "memory", "disk", "battery", "battery#bat0", "battery#bat1", "clock", "tray"],
     "sway/mode": {
         "format": "<span style=\"italic\">{}</span>"
     },
@@ -23,7 +23,7 @@
     "clock": {
         "timezone": "Europe/Tallinn",
         "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-        "format": "{:%Y-%m-%d  %H:%M}",
+        "format": "{:%Y-%m-%d %a %H:%M}",
         "format-alt": "{:%Y-%m-%d}"
     },
     "cpu": {
@@ -33,6 +33,10 @@
     "memory": {
         "format": "{}% "
     },
+    "disk": {
+        "path": "/home",
+        "format": "{path} {free} 🖴"
+    },
     "network": {
         // "interface": "wlp2*", // (Optional) To force the use of this interface
         "format-wifi": "{essid} ({signalStrength}%) ",

sway/.config/waybar/style.css

@@ -0,0 +1,126 @@
+* {
+    /* `otf-font-awesome` is required to be installed for icons */
+    font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+    font-size: 13px;
+}
+
+window#waybar {
+    background-color: rgba(43, 48, 59, 0.5);
+    border-bottom: 3px solid rgba(100, 114, 125, 0.5);
+    color: #ffffff;
+    transition-property: background-color;
+    transition-duration: .5s;
+}
+
+window#waybar.hidden {
+    opacity: 0.2;
+}
+
+#workspaces button {
+    padding: 0 1px;
+    background-color: transparent;
+    color: #ffffff;
+    /* Use box-shadow instead of border so the text isn't offset */
+    box-shadow: inset 0 -3px transparent;
+    /* Avoid rounded borders under each workspace name */
+    border: none;
+    border-radius: 0;
+}
+
+/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
+#workspaces button:hover {
+    background: rgba(0, 0, 0, 0.2);
+    box-shadow: inset 0 -3px #ffffff;
+}
+
+#workspaces button.focused {
+    background: rgba(0, 0, 0, 0.5);
+    box-shadow: inset 0 -3px #ffffff;
+}
+
+#workspaces button.urgent {
+    background-color: #eb4d4b;
+}
+
+#mode {
+    background-color: #64727D;
+    border-bottom: 3px solid #ffffff;
+}
+
+#clock,
+#battery,
+#cpu,
+#memory,
+#disk,
+#temperature,
+#backlight,
+#network,
+#pulseaudio,
+#custom-media,
+#tray,
+#mode,
+#idle_inhibitor,
+#mpd {
+    padding: 0 5px;
+    color: #ffffff;
+    border-left: 1px solid #888888;
+}
+
+#window,
+#workspaces {
+    margin: 0 4px;
+}
+
+/* If workspaces is the leftmost module, omit left margin */
+.modules-left > widget:first-child > #workspaces {
+    margin-left: 0;
+}
+
+/* If workspaces is the rightmost module, omit right margin */
+.modules-right > widget:last-child > #workspaces {
+    margin-right: 0;
+}
+
+#battery.charging, #battery.plugged {
+    color: #ffffff;
+    background-color: #26A65B;
+}
+
+@keyframes blink {
+    to {
+        background-color: #ffffff;
+        color: #000000;
+    }
+}
+
+#battery.critical:not(.charging) {
+    background-color: #f53c3c;
+    color: #ffffff;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+label:focus {
+    background-color: #000000;
+}
+
+#temperature.critical {
+    background-color: #eb4d4b;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+    background-color: #eb4d4b;
+}
+
+#idle_inhibitor {
+    background-color: #2d3436;
+}
+
+#idle_inhibitor.activated {
+    background-color: #ecf0f1;
+    color: #2d3436;
+}

zsh/.zshrc

@@ -1,9 +1,37 @@
 source /usr/share/zaw/zaw.zsh
 
-bindkey '^R' zaw-history
-bindkey -M filterselect '^R' down-line-or-history
-bindkey -M filterselect '^S' up-line-or-history
-bindkey -M filterselect '^E' accept-search
+# fzf
+xsource /usr/share/fzf/key-bindings.zsh
+xsource /usr/share/fzf/completion.zsh
+
+# fzf history search with support for Ctrl+E history edit like with zaw widget before
+if typeset -f fzf-history-widget > /dev/null; then
+    # Copied form key-bindings.zsh
+    # CTRL-R - Paste the selected command from history into the command line
+    fzf-history-widget() {
+      local selected num
+      setopt localoptions noglobsubst noposixbuiltins pipefail no_aliases 2> /dev/null
+      selected=( $(fc -rl 1 | perl -ne 'print if !$seen{(/^\s*[0-9]+\**\s+(.*)/, $1)}++' |
+        FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} $FZF_DEFAULT_OPTS -n2..,.. --tiebreak=index --bind=ctrl-r:toggle-sort --expect=ctrl-e $FZF_CTRL_R_OPTS --query=${(qqq)LBUFFER} +m" $(__fzfcmd)) )
+      local ret=$?
+      if [ -n "$selected" ]; then
+        local accept=0
+        if [[ $selected[1] == ctrl-e ]]; then
+          accept=1
+          shift selected
+        fi
+        num=$selected[1]
+        if [ -n "$num" ]; then
+          zle vi-fetch-history -n $num
+          [[ $accept = 0 ]] && zle accept-line
+        fi
+      fi
+      zle reset-prompt
+      return $ret
+    }
+    zle     -N   fzf-history-widget
+    bindkey '^R' fzf-history-widget
+fi
 
 zstyle ':filter-select:highlight' matched fg=green
 zstyle ':filter-select' max-lines 3