From 5103cc8cd5b795d8d7ad4b2df951a19320ccccbd Mon Sep 17 00:00:00 2001
From: Micke Nordin <mik@elnord.in>
Date: Tue, 22 Dec 2020 14:42:59 +0100
Subject: [PATCH] Switch to waybar and custom nm-applet

---
 dotfiles/.config/ncspot/config.toml | 18 +++++++++++++++++
 dotfiles/.config/sway/config        | 30 +++++++++++++++--------------
 dotfiles/.config/waybar/config      | 30 +++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 14 deletions(-)
 create mode 100644 dotfiles/.config/ncspot/config.toml
 create mode 100644 dotfiles/.config/waybar/config

diff --git a/dotfiles/.config/ncspot/config.toml b/dotfiles/.config/ncspot/config.toml
new file mode 100644
index 0000000..71bd381
--- /dev/null
+++ b/dotfiles/.config/ncspot/config.toml
@@ -0,0 +1,18 @@
+[theme]
+background = "black"
+primary = "light white"
+secondary = "light black"
+title = "green"
+playing = "green"
+playing_selected = "light green"
+playing_bg = "black"
+highlight = "light white"
+highlight_bg = "#484848"
+error = "light white"
+error_bg = "red"
+statusbar = "black"
+statusbar_progress = "green"
+statusbar_bg = "green"
+cmdline = "light white"
+cmdline_bg = "black"
+search_match = "light red"
diff --git a/dotfiles/.config/sway/config b/dotfiles/.config/sway/config
index 5246706..7d146b2 100644
--- a/dotfiles/.config/sway/config
+++ b/dotfiles/.config/sway/config
@@ -209,6 +209,7 @@ for_window [window_type="dialog"] floating enable
 #for_window [window_type="menu"] floating enable
 for_window [title="~nwggrid"] floating enable
 for_window [title="~nwgbar"] floating enable
+for_window [title="~nmtui"] floating enable
 
 #
 # Scratchpad:
@@ -251,20 +252,21 @@ bindsym $mod+r mode "resize"
 # Status Bar:
 #
 # Read `man 5 sway-bar` for more information about this section.
-bar {
-    position top
-  
-    # When the status_command prints a new line to stdout, swaybar updates.
-    # The default just shows the current date and time.
-    #status_command while date +'%Y-%m-%d %l:%M:%S %p'; do sleep 1; done
-    status_command while ~/.config/sway/bin/status.sh; do sleep 1; done
-  
-    colors {
-        statusline #ffffff
-        background #323232
-        inactive_workspace #32323200 #32323200 #5c5c5c
-    }
-}
+#bar {
+#    position top
+#  
+#    # When the status_command prints a new line to stdout, swaybar updates.
+#    # The default just shows the current date and time.
+#    #status_command while date +'%Y-%m-%d %l:%M:%S %p'; do sleep 1; done
+#    status_command while ~/.config/sway/bin/status.sh; do sleep 1; done
+#  
+#    colors {
+#        statusline #ffffff
+#        background #323232
+#        inactive_workspace #32323200 #32323200 #5c5c5c
+#    }
+#}
+exec --no-startup-id waybar
 
 # Pulse Audio controls
 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume $(pacmd list-sinks |awk '/.* index:/{print $3}') +5% # Raise
diff --git a/dotfiles/.config/waybar/config b/dotfiles/.config/waybar/config
new file mode 100644
index 0000000..6f122d7
--- /dev/null
+++ b/dotfiles/.config/waybar/config
@@ -0,0 +1,30 @@
+{
+     "layer": "top",
+     "modules-left": ["sway/workspaces", "sway/mode"],
+     "modules-center": ["custom/date","custom/clock"],
+     "modules-right": ["network","battery","custom/nmtui","tray"],
+     "sway/window": {
+          "max-length": 50
+     },
+     "network": {
+          // "interface": "wlp2*", // (Optional) To force the use of this interface
+          "format-wifi": "{essid} ({signalStrength}%) ",
+          "format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
+          "format-linked": "{ifname} (No IP) ",
+          "format-disconnected": "Disconnected ⚠",
+          "format-alt": "{ifname}: {ipaddr}/{cidr}"
+    },
+     "custom/nmtui": {
+         "format": "  ",
+         "tooltip": "NetworkManager",
+         "on-click": "foot --title ~nmtui nmtui"
+     },
+     "custom/clock": {
+         "interval": 1,
+         "exec": "date \"+%Y-%m-%d %H:%M:%S\""
+     },
+     "battery": {
+          "format": "{capacity}% {icon}",
+          "format-icons": ["", "", "", "", ""]
+     }
+}