From 9e0589a9cf9ec7a16aa878c018860ba382545e20 Mon Sep 17 00:00:00 2001
From: Marco Thomas <rb.ma.tho@gmail.com>
Date: Fri, 20 May 2022 11:52:16 +0200
Subject: [PATCH] Fix stuff

---
 files/emacs/init.org           | 13 ++++++-------
 files/sway/.config/sway/bar.sh | 13 +++++++------
 files/sway/.config/sway/config |  4 ++++
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/files/emacs/init.org b/files/emacs/init.org
index c58b243..8503e9a 100644
--- a/files/emacs/init.org
+++ b/files/emacs/init.org
@@ -317,7 +317,7 @@ Use =doom-modeline= as a bar... together with icons and nyan cat!
 #+end_src
 
 Show me the time!
-#+begin_src emacs-lisp
+#+begin_src emacs-lisp :tangle no
 (display-time-mode)
 #+end_src
 
@@ -696,13 +696,12 @@ Auto matching pairs are reaaaaally nice.
   :straight t
   :general
   (vim-leader-def 'normal 'global
-    "gb" 'magit-branch
+    "gb" 'magit-blame
     "gc" 'magit-checkout
     "gc" 'magit-commit
     "gd" 'magit-diff
     "gg" 'counsel-git-grep
     "gi" 'magit-gitignore-in-topdir
-    "gj" 'magit-blame
     "gl" 'magit-log
     "gp" 'magit-push
     "gs" 'magit-status
@@ -989,9 +988,9 @@ Who needs LaTeX when you can have the power of unicode?
    ("\\bigo" ?𝒪)
 
    ; Greek
-   ("\\Ga" ?α) ("\\GA" ?Α) ("\\a" ?α)
-   ("\\Gb" ?β) ("\\GB" ?Β) ("\\b" ?β)
-   ("\\Gg" ?γ) ("\\GG" ?Γ) ("\\g" ?γ) ("\\Gamma" ?Γ)
+   ("\\Ga" ?α) ("\\GA" ?Α) ("\\alpha" ?α)
+   ("\\Gb" ?β) ("\\GB" ?Β) ("\\beta" ?β)
+   ("\\Gg" ?γ) ("\\GG" ?Γ) ("\\gamma" ?γ) ("\\Gamma" ?Γ)
    ("\\Gd" ?δ) ("\\GD" ?Δ) ("\\delta" ?δ) ("\\Delta" ?Δ)
    ("\\Ge" ?ε) ("\\GE" ?Ε) ("\\epsilon" ?ε)
    ("\\Gz" ?ζ) ("\\GZ" ?Ζ)
@@ -999,7 +998,7 @@ Who needs LaTeX when you can have the power of unicode?
    ("\\Gth" ?θ) ("\\GTH" ?Θ) ("\\theta" ?θ) ("\\Theta" ?Θ)
    ("\\Gi" ?ι) ("\\GI" ?Ι) ("\\iota" ?ι)
    ("\\Gk" ?κ) ("\\GK" ?Κ)
-   ("\\Gl" ?λ) ("\\GL" ?Λ) ("\\lam" ?λ)
+   ("\\Gl" ?λ) ("\\GL" ?Λ) ("\\lambda" ?λ)
    ("\\Gm" ?μ) ("\\GM" Μ) ("\\mu" ?μ)
    ("\\Gx" ?ξ) ("\\GX" ?Ξ) ("\\xi" ?ξ) ("\\Xi" ?Ξ)
    ("\\Gp" ?π) ("\\GP" ?Π) ("\\pi" ?π) ("\\Pi" ?Π)
diff --git a/files/sway/.config/sway/bar.sh b/files/sway/.config/sway/bar.sh
index a6e59f4..3bfee65 100755
--- a/files/sway/.config/sway/bar.sh
+++ b/files/sway/.config/sway/bar.sh
@@ -16,22 +16,23 @@ else
 fi
 
 wifi=$(iwgetid -r)
-if [ -z $wifi ]; then
+if [ -z "$wifi" ]; then
     wifi='no wifi'
 fi
 
 powermode=$(cat /sys/firmware/acpi/platform_profile)
 
-cpu_util=$(ps -A -o pcpu | tail -n+2 | paste -sd+ | bc)
+# cpu_util=$(ps -A -o pcpu | tail -n+2 | paste -sd+ | bc)
+cpu_util=$(cat /proc/loadavg | awk '{print $1, $2, $3}')
 
 if [ $(pactl get-sink-mute @DEFAULT_SINK@ | awk '{print $2}') = 'no' ]; then
-    audio="  $(pactl get-sink-volume @DEFAULT_SINK@ | awk '{print $5}')"
+    audio=" $(pactl get-sink-volume @DEFAULT_SINK@ | awk '{print $5}')"
 else
-    audio="婢  muted"
+    audio="婢 muted"
 fi
 
 light=$(light -G | awk '{print int($1+0.5)'})"%"
 
-sep="  "
-echo "${sep}   ${light} ${sep} ${audio} ${sep}   ${wifi} ${sep}   ${powermode}: ${cpu_util} ${sep}   ${conservation} ${sep}   ${battery}% ${bat_rem} ${sep}   ${date}"
+sep=" "
+echo "${sep}  ${light} ${sep} ${audio} ${sep}  ${wifi} ${sep}  ${powermode}: ${cpu_util} ${sep}  ${conservation} ${sep}  ${battery}% ${bat_rem} ${sep}  ${date}"
 
diff --git a/files/sway/.config/sway/config b/files/sway/.config/sway/config
index 1a6586f..fc02bb1 100644
--- a/files/sway/.config/sway/config
+++ b/files/sway/.config/sway/config
@@ -152,6 +152,10 @@ input type:keyboard {
     bindsym $mod+Shift+9 move container to workspace number $ws9
     bindsym $mod+Shift+0 move container to workspace number $ws10
 
+    # Move between displays
+    bindsym $mod+Control+$left move workspace to output left
+    bindsym $mod+Control+$right move workspace to output right
+
 # Layout stuff:
     workspace_layout stacking