diff --git a/sway/config b/sway/config
index 9e6f8c9..5daa7b4 100644
--- a/sway/config
+++ b/sway/config
@@ -19,7 +19,7 @@ set $fg #ffffff
set $fgi #888888
set $wallpaper $HOME/wallpapers/nasamute.png
-set $lock swaylock -i $wallpaper
+set $lock swaylock -f -i $wallpaper
output * bg $wallpaper fill
floating_modifier $mod normal
@@ -28,7 +28,7 @@ smart_borders on
focus_follows_mouse yes
bindsym $mod+Return exec $term
-bindsym $mod+Control+q kill
+bindsym $mod+q kill
bindsym $mod+d exec $menu
bindsym $mod+Shift+c reload
bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
@@ -42,6 +42,7 @@ bindsym $mod+$alt+f exec dolphin
bindsym $mod+$alt+p exec pomatez
bindsym $mod+$alt+e exec evolution
bindsym $mod+$alt+c exec korganizer
+bindsym $mod+p exec bitwarden-desktop
bindsym $mod+$left focus left
bindsym $mod+$down focus down
@@ -125,20 +126,11 @@ for_window [class="pomatez"] floating enable, sticky enable
for_window [class="PacketTracer"] floating enable, border normal
for_window [app_id="LibreWolf" title="^Extension"] floating enable
for_window [floating] border csd
+for_window [app_id="org.keepassxc.KeePassXC"] floating enable
+for_window [class="Bitwarden"] floating enable
bar {
- status_command i3status-rs
- position top
- font pango:$font_family, FontAwesome $font_size
- separator_symbol ""
- colors {
- statusline $fg
- background $bg
- focused_background $bg
- focused_workspace $bg $bg $fg
- active_workspace $bg $bg $fg
- inactive_workspace $bg $bg $fgi
- }
+ swaybar_command waybar
}
input "type:touchpad" {
@@ -159,8 +151,8 @@ exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
exec dbus-update-activation-environment --all
exec swayidle -w \
- timeout 300 'swaylock -f' \
- timeout 305 'swaymsg "output * power off"' \
+ timeout 300 'swaymsg "output * power off"' \
+ timeout 305 $lock \
resume 'swaymsg "output * power on"' \
before-sleep 'playerctl pause; swaylock -f'
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 9fbeee8..f63bf69 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -1,5 +1,5 @@
set -g set-titles on
-set -g mouse off
+set -g mouse on
unbind C-b
set -g prefix C-f
@@ -23,9 +23,15 @@ set -ag terminal-overrides ",xterm-256color:RGB"
set -g base-index 1
-# default is 2000
-set -g history-limit 9999999
-
-set -as terminal-features ",kitty*:RGB"
-
source-file ~/.config/tmux/tokyonight_night.tmux
+
+# plugins
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'tmux-plugins/tmux-yank'
+set -g @plugin 'tmux-plugins/tmux-resurrect'
+set -g @plugin 'tmux-plugins/tmux-continuum'
+
+set -g @resurrect-capture-pane-contents 'on'
+set -g @continnum-restore 'on'
+run "~/.tmux/plugins/tpm/tpm"
diff --git a/waybar/config b/waybar/config
new file mode 100644
index 0000000..9a30054
--- /dev/null
+++ b/waybar/config
@@ -0,0 +1,55 @@
+{
+ "modules-left": ["sway/workspaces", "sway/window", "sway/mode"],
+ "modules-right": ["tray", "pulseaudio", "backlight", "network", "battery", "clock"],
+ "clock": {
+ "tooltip-format": "{:%Y %B}\n{calendar}",
+ "format": "{:%b %d(%H:%M) }"
+ },
+ "backlight": {
+ "format": "{percent}% {icon}",
+ "format-icons": ["", "", "", "", "", "", "", "", ""]
+ },
+ "battery": {
+ "states": {
+ "warning": 30,
+ "critical": 15
+ },
+ "format": "{capacity}% {icon}",
+ "format-charging": "{capacity}% ",
+ "format-plugged": "{capacity}% ",
+ "format-alt": "{time} {icon}",
+ "format-icons": ["", "", "", "", ""]
+ },
+ "pulseaudio": {
+ "format": "{volume}% {icon} {format_source}",
+ "format-bluetooth": "{volume}% {icon} {format_source}",
+ "format-bluetooth-muted": " {icon} {format_source}",
+ "format-muted": " {format_source}",
+ "format-source": "{volume}% ",
+ "format-source-muted": "",
+ "format-icons": {
+ "headphone": "",
+ "hands-free": "",
+ "headset": "",
+ "phone": "",
+ "portable": "",
+ "car": "",
+ "default": ["", "", ""]
+ },
+ "on-click": "pavucontrol"
+ },
+ "network": {
+ "format": "{ifname}",
+ "format-wifi": "Connected ",
+ "format-ethernet": "{ipaddr}/{cidr} ",
+ "format-disconnected": "Disconnected ", //An empty format will hide the module.
+ "tooltip-format": "{ifname} via {gwaddr} ",
+ "tooltip-format-wifi": "{essid} ({signalStrength}%) ",
+ "tooltip-format-ethernet": "{ifname} ",
+ "tooltip-format-disconnected": "Disconnected",
+ "max-length": 50
+ },
+ "tray": {
+ "spacing": 10
+ }
+}
diff --git a/waybar/config.jsonc b/waybar/config.jsonc
deleted file mode 100644
index 7a65838..0000000
--- a/waybar/config.jsonc
+++ /dev/null
@@ -1,117 +0,0 @@
-{
- "layer": "top",
- "position": "bottom",
- "height": 26,
- // Choose the order of the modules
- "modules-left": [
- "sway/workspaces",
- "sway/mode",
- "custom/mic",
- "custom/yubikey",
- "sway/window",
- ],
- "modules-center": [],
- "modules-right": [
- "custom/khal",
- "custom/wireguard",
- "custom/iwd",
- "bluetooth",
- "pulseaudio",
- "custom/inbox",
- // "tray",
- "battery",
- "clock",
- ],
- // Modules configuration
- "sway/workspaces": {
- "disable-scroll": false,
- "disable-scroll-wraparound": true,
- "enable-bar-scroll": true,
- "all-outputs": true,
- "format": "{name} {icon}",
- "format-icons": {
- "focused": "",
- "default": "",
- },
- },
- "custom/mic": {
- "exec": "$HOME/.local/lib/waybar-mic",
- "return-type": "json",
- "on-click": "pactl set-source-mute @DEFAULT_SOURCE@ toggle",
- },
- "custom/yubikey": {
- "exec": "$HOME/.local/lib/waybar-yubikey",
- "return-type": "json",
- },
- "sway/mode": {
- "format": "{}",
- },
- "sway/window": {
- "icon": false,
- "tooltip": false,
- },
- "custom/khal": {
- "exec": "$HOME/.local/lib/waybar-khal",
- "return-type": "json",
- "on-click": "pause khal list now 24h",
- },
- "custom/inbox": {
- "exec": "$HOME/.local/lib/waybar-inbox",
- },
- "clock": {
- "interval": 1,
- "tooltip-format": "{:%Y %B}\n{calendar}",
- "format": " {:%a %Y-%m-%d %X}",
- },
- "battery": {
- "states": {
- // Results in "format-full" being used.
- "full": 100,
- // Applies a CSS animation/alert.
- "critical": 15,
- },
- "format": "{icon} {capacity}%",
- "format-charging": " {capacity}%",
- "format-plugged": " {capacity}%",
- "format-alt": "{icon} {power}W {time}", // Toggled on click.
- "format-icons": ["", "", "", "", "", "", "", "", "", ""],
- // More icons in this range: ->
- // More icons in this range: ->
- // More icons in this range: ->
- },
- "bluetooth": {
- "format-connected": " {num_connections}",
- // TODO: show icons representing each device (e.g.: mouse, headphones, speaker, etc)
- "tooltip-format": "{device_enumerate}",
- "tooltip-format-enumerate-connected-battery": "{device_alias}, {device_battery_percentage}%",
- "on-click": "foot -e bluetuith",
- },
- "custom/iwd": {
- "exec": "$HOME/.local/lib/waybar-iwd",
- "interval": 1, // FIXME: pointless wake-ups every 1000ms.
- },
- "custom/wireguard": {
- "exec": "$HOME/.local/lib/waybar-wireguard",
- "interval": 1, // FIXME: pointless wake-ups every 1000ms.
- },
- "pulseaudio": {
- // "scroll-step": 1, // %, can be a float
- "format": "{icon} {volume}%",
- "format-bluetooth": "{icon} {volume}% ",
- "format-bluetooth-muted": " ",
- "format-muted": "",
- "format-icons": {
- "speaker": "",
- "headphone": "",
- "hands-free": "",
- "headset": "",
- "phone": "",
- "portable": "",
- "car": "",
- "default": ["", "", ""],
- },
- "on-click": "pavucontrol",
- "on-click-right": "pactl set-sink-mute @DEFAULT_SINK@ toggle",
- "reverse-mouse-scrolling": 1,
- },
-}
diff --git a/waybar/style.css b/waybar/style.css
new file mode 100644
index 0000000..2253ac7
--- /dev/null
+++ b/waybar/style.css
@@ -0,0 +1,102 @@
+* {
+ border: none;
+ border-radius: 0;
+ font-family: RobotoMono Nerd Font;
+ font-size: 14px;
+ font-weight: 500;
+}
+
+window#waybar {
+ background-color: #282828;
+ color: #ebdbb2;
+ transition-property: background-color;
+ transition-duration: 0.5s;
+ border-bottom: solid 0px #3c3836;
+}
+
+window#waybar.hidden {
+ opacity: 0.2;
+}
+
+#workspaces button {
+ padding: 0 5px;
+ color: #ebdbb2;
+ border-radius: 5px;
+}
+
+#workspaces button.focused {
+ background-color: #ebdbb2;
+ color: #282828;
+ border-bottom: none;
+}
+
+#workspaces button.urgent {
+ background-color: #cc241d;
+}
+
+widget > * {
+ margin-top: 6px;
+ margin-bottom: 6px;
+}
+
+.modules-left > widget > * {
+ margin-left: 12px;
+ margin-right: 12px;
+}
+
+.modules-left > widget:first-child > * {
+ margin-left: 6px;
+}
+
+.modules-left > widget:last-child > * {
+ margin-right: 18px;
+}
+
+.modules-right > widget > * {
+ padding: 0 12px;
+ margin-left: 0;
+ margin-right: 0;
+ color: #282828;
+ background-color: #ebdbb2;
+}
+
+.modules-right > widget:first-child > * {
+ border-radius: 5px 0 0 5px;
+}
+
+.modules-right > widget:last-child > * {
+ border-radius: 0 5px 5px 0;
+ margin-right: 6px;
+}
+
+#mode {
+ background: transparent;
+ color: #fb4934;
+}
+
+@keyframes blink {
+ to {
+ color: #ebdbb2;
+ }
+}
+
+#battery.critical:not(.charging) {
+ animation-name: blink;
+ animation-duration: 1s;
+ animation-timing-function: linear;
+ animation-iteration-count: infinite;
+ animation-direction: alternate;
+}
+
+label:focus {
+ background-color: #282828;
+}
+
+tooltip {
+ border-radius: 5px;
+ background: #504945;
+}
+
+tooltip label {
+ color: #ebdbb2;
+}
diff --git a/zshrc b/zshrc
index b1af505..6f6a74f 100644
--- a/zshrc
+++ b/zshrc
@@ -106,7 +106,6 @@ zinit light z-shell/zsh-eza
zinit snippet OMZP::git
zinit snippet OMZP::sudo
zinit snippet OMZP::archlinux
-zinit snippet OMZP::command-not-found
zinit snippet OMZP::colored-man-pages
# load completions
@@ -116,3 +115,5 @@ zinit cdreplay -q
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
+
+export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent.socket