From 942bd9bd66d21132b2685b8098b95341c2b579f6 Mon Sep 17 00:00:00 2001
From: tactonbishop <tactonbishop@gmail.com>
Date: Sat, 11 Jun 2022 13:32:44 +0100
Subject: [PATCH] Ch ch ch changes

---
 .gitignore                                    |  4 ++-
 i3/config                                     | 20 ++++++------
 polybar/config.ini                            | 31 +++++++++++++++----
 .../launch_bluetooth_manager.sh               | 24 ++++++++++----
 vscode/settings.json                          |  2 +-
 5 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index c892b78..e6d60db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 .nvimlog
-spotifyd/spotifyd.conf
\ No newline at end of file
+/polybar/secret.txt
+spotifyd/spotifyd.conf
+polybar/polybar_scripts/wakatime_status/query_wakatime.sh
diff --git a/i3/config b/i3/config
index 8252068..91522f3 100644
--- a/i3/config
+++ b/i3/config
@@ -14,7 +14,7 @@ set $sup Mod4
 
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
-font Roboto 9 
+font Inter 9 
 
 # This font is widely installed, provides lots of unicode glyphs, right-to-left
 # text rendering and scalability on retina/hidpi displays (thanks to pango).
@@ -43,7 +43,7 @@ bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ to
 bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
 
 # Use Mouse+$mod to drag floating windows to their wanted position
-floating_modifier $mod
+#floating_modifier $mod
 
 # start a terminal
 #bindsym $mod+Return exec kitty
@@ -63,10 +63,10 @@ bindsym $mod+Shift+q kill
 
 # change focus
 
-bindsym $mod+h focus left
-bindsym $mod+j focus down
-bindsym $mod+k focus up
-bindsym $mod+l focus right
+bindsym $sup+h focus left
+bindsym $sup+j focus down
+bindsym $sup+k focus up
+bindsym $sup+l focus right
 
 # alternatively, you can use the cursor keys:
 bindsym $mod+Left focus left
@@ -97,10 +97,10 @@ bindsym $mod+w layout tabbed
 bindsym $mod+e layout toggle split
 
 # toggle tiling / floating
-bindsym $mod+Shift+f floating toggle
+bindsym $mod+Shift+space floating toggle
 
 # change focus between tiling / floating windows
-# bindsym $mod+space focus mode_toggle
+#bindsym $mod+space focus mode_toggle
 
 # focus the parent container
 bindsym $mod+a focus parent
@@ -186,9 +186,9 @@ exec_always --no-startup-id $HOME/.config/polybar/launch.sh # Polybar
 exec_always guake # Guake 
 
 # KEY BINDINGS
+bindsym $mod+h split h
+bindsym $mod+v split v
 
-bindsym $mod+Shift+h split v # split horiz
-bindsym $mod+Shift+v split h # split vert
 bindsym $mod+space exec rofi -show drun -show-icons -display-drun "" # Rofi drun
 bindsym $mod+Tab exec rofi -show window # Rofi window-switcher
 
diff --git a/polybar/config.ini b/polybar/config.ini
index 24946c2..57ab2b6 100644
--- a/polybar/config.ini
+++ b/polybar/config.ini
@@ -56,8 +56,8 @@ font-3 = SymbolsNerdFont:size=15;3
 
 
 modules-left = my-text-label xworkspaces nowplaying 
-modules-center = 
-modules-right = filesystem memory cpu battery temperature backlight pulseaudio bluetooth wlan date
+;modules-center = 
+modules-right = filesystem memory cpu battery temperature backlight pulseaudio bluetooth wlan wakatime date time
 
 tray-position = right
 tray-padding = 2
@@ -138,7 +138,7 @@ label-padding = 1
 type = internal/cpu
 interval = 2
 format-prefix = " "
-format-underline = #df8008
+format-underline = #7f2b26
 format-prefix-foreground = ${colors.primary}
 label = %percentage: 2%%
 
@@ -180,7 +180,18 @@ format-prefix-foreground = ${colors.primary}
 format-prefix = ""
 date = %a %d %b %Y
 time = %H:%M
-label = %date% | %{F#2f7e25}%time% 
+label = %date% 
+label-padding = 2
+
+[module/time]
+type = internal/date
+interval = 1
+format-underline = #df8008
+format-prefix-foreground = ${colors.primary}
+format-prefix = ""
+date = %a %d %b %Y
+time = %H:%M
+label = %time%  
 label-padding = 2
 
 [module/temperature]
@@ -277,8 +288,16 @@ format-prefix-foreground = ${colors.primary}
 label-padding = 1
 format-underline = ${colors.primary}
 
+
+[module/wakatime]
+type = custom/script
+exec = ~/dotfiles/polybar/polybar_scripts/wakatime_status/query_wakatime.sh
+interval = 10
+format-prefix = " "
+format-underline = #707f23
+format-prefix-foreground = ${colors.primary}
+label-padding = 1
+
 [settings]
 screenchange-reload = true
 pseudo-transparency = true
-
-
diff --git a/polybar/polybar_scripts/launch_bluetooth_manager.sh b/polybar/polybar_scripts/launch_bluetooth_manager.sh
index 5eebc0f..a956a1b 100755
--- a/polybar/polybar_scripts/launch_bluetooth_manager.sh
+++ b/polybar/polybar_scripts/launch_bluetooth_manager.sh
@@ -2,11 +2,23 @@
 #!/bin/sh
 if [ $(bluetoothctl show | grep "Powered: yes" | wc -c) -eq 0 ]
 then
-  echo "%{F#66ffffff}"
+    echo "%{F#66ffffff}"
 else
-  if [ $(echo info | bluetoothctl | grep 'Device' | wc -c) -eq 0 ]
-  then 
-    echo ""
-  fi
-  echo "%{F#73fa91}"
+    if [ $(echo info | bluetoothctl | grep 'Device' | wc -c) -eq 0 ]
+    then
+        echo ""
+    fi
+    echo "%{F#73fa91}"
 fi
+
+
+
+# if [ "$player_status" = "Playing" ]; then
+#     echo " $(playerctl metadata artist) | $(playerctl metadata title) | $(playerctl metadata album)"
+# elif [ "$player_status" = "Paused" ]; then
+#     echo " $(playerctl metadata artist) | $(playerctl metadata title) | $(playerctl metadata album)"
+# elif [ "$player_status" = "Stopped" ]; then
+#     echo " $(playerctl metadata artist) | $(playerctl metadata title) | $(playerctl metadata album)"
+# else
+#     echo " Disconnected"
+# fi
diff --git a/vscode/settings.json b/vscode/settings.json
index f2f0a6f..a6c25e0 100644
--- a/vscode/settings.json
+++ b/vscode/settings.json
@@ -76,7 +76,7 @@
     "suppressGitMissingWarning": true
   },
   "[shellscript]": {
-    "editor.defaultFormatter": "foxundermoon.shell-format"
+    "editor.defaultFormatter": "shakram02.bash-beautify"
   },
   "workbench.colorTheme": "Alien Blood ",
   "window.titleBarStyle": "custom"