Fix fonts

9 files changed, 94 insertions, 38 deletions

diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml
index b33e97f..d7b569b 100644
--- a/alacritty/alacritty.yml
+++ b/alacritty/alacritty.yml
@@ -1,15 +1,15 @@
 font:
   normal:
-    family: Iosevka Term
+    family: Iosevka Term Nerd Font
     style: Regular
   bold:
-    family: Iosevka Term
+    family: Iosevka Term Nerd Font
     style: Bold
   italic:
-    family: Iosevka Term
+    family: Iosevka Term Nerd Font
     style: Italic
   bold_italic:
-    family: Iosevka Term
+    family: Iosevka Term Nerd Font
     style: Bold Italic
   size: 11
 
diff --git a/info.yml b/info.yml
index 79d1a96..7d887e9 100644
--- a/info.yml
+++ b/info.yml
@@ -156,6 +156,10 @@ sections:
       - ==: link
         from: wallpaper.jpg
         to: ~/.config/sway/wallpaper.jpg
+      - ==: run
+        command: "cp input.cfg ~/.conifg/sway/input.cfg"
+      - ==: run
+        command: "cp output.cfg ~/.conifg/sway/output.cfg"
 
   # Copy waybar configurations
   configure-waybar:
diff --git a/mako/config b/mako/config
index de96178..00d7957 100644
--- a/mako/config
+++ b/mako/config
@@ -10,4 +10,4 @@ icon-location=right
 max-icon-size=64
 default-timeout=5000
 ignore-timeout=1
-font=Iosevka Term 12
+font=Iosevka Term Nerd Font 12
diff --git a/sway/config b/sway/config
index 52926f6..153260c 100644
--- a/sway/config
+++ b/sway/config
@@ -8,7 +8,7 @@ set $down  j
 set $up    k
 set $right l
 set $term alacritty
-set $menu rofi -font "Iosevka Term 12" -show combi | xargs swaymsg exec
+set $menu rofi -font "Iosevka Term Nerd Font 12" -show combi | xargs swaymsg exec
 
 # Colours
 set $cl_high #4d4d4d
@@ -17,15 +17,11 @@ set $cl_back #1c1c1c
 set $cl_fore #ffffff
 set $cl_urge #ee2e24
 
-# Output names
-set $monitor1 DP-1
-set $monitor2 HDMI-A-1
-
 #############
 #  Display  #
 #############
 
-font pango:Iosevka Term 11
+font pango:Iosevka Term Nerd Font 11
 
 gaps inner 15
 
@@ -36,19 +32,13 @@ client.urgent           $cl_urge $cl_urge $cl_fore $cl_urge $cl_urge
 
 output * background ~/.config/sway/wallpaper.jpg fill
 
+include output.cfg
+
 ############
 #  Inputs  #
 ############
 
-input type:keyboard {
-	xkb_layout "gb"
-	repeat_delay 300
-	repeat_rate 30
-}
-
-input type:pointer {
-	pointer_accel -0.7
-}
+include input.cfg
 
 ##############
 # Workspaces #
@@ -67,10 +57,16 @@ workspace 5 output $monitor1 # thunderbird
 
 bindsym $mod+Return exec $term
 bindsym $mod+d exec $menu
-bindsym $mod+Shift+q kill
 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'
 
+# Politely quit
+bindsym $mod+q kill
+# Rudely kill
+bindsym $mod+Shift+q exec swaymsg -t get_tree | \
+          jq '.. | select(.type?) | select(.focused==true).pid' | \
+          xargs -L 1 kill -9
+
 floating_modifier $mod normal
 
 # Move around
@@ -144,6 +140,10 @@ bindsym $mod+minus scratchpad show
 
 # Screenshot
 bindsym Print exec /usr/share/sway/scripts/grimshot copy area
+bindsym $mod+Shift+equal exec /usr/share/sway/scripts/grimshot copy area
+
+bindsym $mod+bracketleft exec pactl set-sink-volume @DEFAULT_SINK@ -5%
+bindsym $mod+bracketright exec pactl set-sink-volume @DEFAULT_SINK@ +5%
 
 mode "resize" {
     bindsym $left  resize shrink width 10px
@@ -168,6 +168,13 @@ exec mako
 # Make sure env vars are imported into D-Bus
 exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
 
+# Swayidle
+exec swayidle -w \
+    before-sleep "swaylock"
+
+# Chromium hotkey fix
+for_window [app_id="^chrome-.*-.*$"] shortcuts_inhibitor disable
+
 ############
 #  Waybar  #
 ############
diff --git a/sway/input.cfg b/sway/input.cfg
new file mode 100644
index 0000000..a4746f7
--- /dev/null
+++ b/sway/input.cfg
@@ -0,0 +1,11 @@
+# Manually change this file
+
+input type:keyboard {
+	xkb_layout "gb"
+	repeat_delay 300
+	repeat_rate 30
+}
+
+input type:pointer {
+	pointer_accel -0.7
+}
diff --git a/sway/output.cfg b/sway/output.cfg
new file mode 100644
index 0000000..dc504a2
--- /dev/null
+++ b/sway/output.cfg
@@ -0,0 +1,4 @@
+# Manually change this file
+
+set $monitor1 DP-1
+set $monitor2 HDMI-1
diff --git a/waybar/config b/waybar/config
index a239f8f..7e7b530 100644
--- a/waybar/config
+++ b/waybar/config
@@ -2,7 +2,7 @@
     "height": 30, 
     "spacing": 4, 
     "modules-left": ["sway/workspaces", "sway/mode"],
-    "modules-right": ["tray", "custom/spotify", "pulseaudio", "network", "cpu", "memory", "temperature", "clock"],
+    "modules-right": ["tray", "custom/spotify", "idle_inhibitor", "network", "cpu", "memory", "backlight", "pulseaudio", "battery", "clock"],
     "custom/spotify": {
         "exec": "/usr/bin/python3 ~/.config/waybar/scripts/mediaplayer.py --player spotify",
         "format": "{}",
@@ -31,40 +31,67 @@
         "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
         "format": "{:%d/%m/%Y  %H:%M:%S}",
         "format-alt": "{:%Y-%m-%d}",
+        "timezone": "Europe/London",
         "interval": 1
     },
+    "battery": {
+        "interval": 1,
+        "states": {
+            "warning": 30,
+            "critical": 15,
+        },
+        "format": "{icon} {capacity}%",
+        "format-charging": "{icon} {capacity}% ",
+        "format-icons": [" ", " ", " ", " ", " "],
+    },
+    "backlight": {
+        "format": "{icon} {percent}%",
+        "format-icons": [" ", " "],
+        "on-scroll-up": "brightnessctl set +5",
+        "on-scroll-down": "brightnessctl set 5-"
+    },
     "cpu": {
-        "format": " {usage}%",
+        "format": "  {usage}%",
         "tooltip": false
     },
     "memory": {
-        "format": " {used}/{total} GiB"
+        "format": "  {used}/{total} GiB"
     },
     "network": {
-        "format-wifi": "{essid} ({signalStrength}%) ",
+        "format-wifi": "  {ipaddr} @ {essid} ({signalStrength}%)",
         "format-ethernet": "歷 {ipaddr}",
-        "tooltip-format": "{ifname} via {gwaddr} ",
+        "tooltip-format": "  {ifname} via {gwaddr}",
         "format-linked": "歷 {ifname} (No IP)",
         "format-disconnected": "歷 Disconnected",
-        "format-alt": "{ifname}: {ipaddr}/{cidr}"
+        "format-alt": "{ifname}: {ipaddr}/{cidr}",
+        "on-click-right": "alacritty -e /usr/bin/nmtui",
     },
     "pulseaudio": {
-        "format": "{icon} {volume}% {format_source}",
-        "format-bluetooth": "{volume}% {icon} {format_source}",
-        "format-bluetooth-muted": " {icon} {format_source}",
-        "format-muted": " {format_source}",
+        "format": "{icon} {volume}%  {format_source}",
+        "format-bluetooth": " {volume}%  {format_source}",
+        "format-bluetooth-muted": " 婢  {format_source}",
+        "format-muted": "婢 {format_source}",
         "format-source": " {volume}%",
-        "format-source-muted": "",
+        "format-source-muted": " ",
         "format-icons": {
-            "headphone": "",
+            "headphone": " ",
             "hands-free": "",
             "headset": "",
             "phone": "",
             "portable": "",
-            "car": "",
-            "default": ["", "", ""]
+            "car": " ",
+            "default": ["", " ", " "]
         },
-        "on-click": "pavucontrol"
-    }
+        "on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle",
+        "on-click-right": "pavucontrol",
+        "scroll-step": 0.5
+    },
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "activated": "",
+            "deactivated": ""
+        }
+	}
 }
 
diff --git a/waybar/style.css b/waybar/style.css
index c92fd57..6f0ea93 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,6 +1,6 @@
 * {
     /* `otf-font-awesome` is required to be installed for icons */
-    font-family: Iosevka Term;
+    font-family: Iosevka Term Nerd Font;
     font-size: 13px;
 }
 
diff --git a/zsh/config/environment.zsh b/zsh/config/environment.zsh
index fdea1da..cf76ed1 100644
--- a/zsh/config/environment.zsh
+++ b/zsh/config/environment.zsh
@@ -10,3 +10,6 @@ export PATH="$HOME/bin:$PATH"
 
 # Exa colours
 export EXA_COLORS="uu=37:un=37:gu=37:gn=37:da=37"
+
+# Firefox wayland
+export MOZ_ENABLE_WAYLAND=1