diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index cf3a34b..b938512 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -228,4 +228,5 @@ exec-once = dbus-update-activation-environment --all
 exec-once = jellyfin-mpv-shim
 exec-once = hyprctl setcursor phinger-cursors-light 24
 exec-once = swaybg -m fill -i  ~/pics/wallpapers/adventure.jpg
+exec-once = waybar
 exec-once = swayidle -w timeout 300 'swaylock -S --effect-blur 20x3 --fade-in 1 --effect-vignette 0.5:1 --grace 60' timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -S --effect-blur 20x3 --effect-vignette 0.5:1' 
diff --git a/.config/.mbsyncrc b/.config/mbsyncrc
similarity index 90%
rename from .config/.mbsyncrc
rename to .config/mbsyncrc
index 4a1970c..e98d844 100644
--- a/.config/.mbsyncrc
+++ b/.config/mbsyncrc
@@ -4,7 +4,7 @@
 IMAPAccount gmail
 Host imap.gmail.com
 User ccochrun21@gmail.com
-PassCmd rbw get gmail
+PassCmd "rbw get gmail"
 AuthMechs LOGIN
 SSLType IMAPS
 SSLVersions SSLv3
@@ -13,21 +13,21 @@ SSLVersions SSLv3
 IMAPAccount office
 Host outlook.office365.com
 User chris@tfcconnection.org
-PassCmd rbw get 'Office 365'
+PassCmd "/home/chris/bin/mailpass"
 AuthMechs LOGIN
 SSLType IMAPS
 
 IMAPAccount outlook
 Host outlook.office365.com
 User chris.cochrun@outlook.com
-PassCmd rbw get outlook
+PassCmd "rbw get outlook"
 AuthMechs LOGIN
 SSLType IMAPS
 
 IMAPAccount cochrun
 Host mail.cochrun.xyz
 User chris@cochrun.xyz
-PassCmd rbw get 'Office 365'
+PassCmd "rbw get 'Office 365'"
 AuthMechs LOGIN
 SSLType IMAPS
 # SSLVersions SSLv3
@@ -42,8 +42,8 @@ IMAPStore gmail-remote
 Account gmail
 
 MaildirStore gmail-local
-Path ~/Maildir/gmail/
-Inbox ~/Maildir/gmail/INBOX
+Path ~/mail/gmail/
+Inbox ~/mail/gmail/INBOX
 
 IMAPStore office-remote
 Account office
@@ -51,8 +51,8 @@ Account office
 # LOCAL STORAGE (CREATE DIRECTORIES with mkdir -p Maildir/gmail)
 
 MaildirStore office-local
-Path ~/Maildir/office/
-Inbox ~/Maildir/office/INBOX
+Path ~/mail/office/
+Inbox ~/mail/office/INBOX
 Subfolders Verbatim
 
 
@@ -60,16 +60,16 @@ IMAPStore outlook-remote
 Account outlook
 
 MaildirStore outlook-local
-Path ~/Maildir/outlook/
-Inbox ~/Maildir/outlook/INBOX
+Path ~/mail/outlook/
+Inbox ~/mail/outlook/INBOX
 Subfolders Verbatim
 
 IMAPStore cochrun-remote
 Account cochrun
 
 MaildirStore cochrun-local
-Path ~/Maildir/cochrun/
-Inbox ~/Maildir/cochrun/INBOX
+Path ~/mail/cochrun/
+Inbox ~/mail/cochrun/INBOX
 Subfolders Verbatim
 
 # CONNECTIONS SPECIFY LINKS BETWEEN REMOTE AND LOCAL FOLDERS
diff --git a/.config/waybar/config b/.config/waybar/config
index 14202c2..63002f8 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -5,9 +5,9 @@
     "height": 35, // Waybar height (to be removed for auto height)
     "width": 1400, // Waybar width
     // Choose the order of the modules "custom/wintitle", 
-    "modules-left": ["wlr/workspaces", "hyprland/window"],
+    "modules-left": ["hyprland/workspaces", "hyprland/window"],
     "modules-center": ["clock"],
-    "modules-right": ["pulseaudio", "backlight", "temperature", "memory", "cpu", "battery", "tray"],
+    "modules-right": ["pulseaudio", "backlight", "memory", "cpu", "battery", "tray"],
     "margin-top": -5,
     "margin-bottom": 8,
     "margin-left": 6,
@@ -16,10 +16,20 @@
     "hyprland/window": {
         "format": "  <span style='italic'>{}</span>"
     },
-    "wlr/workspaces": {
+    "hyprland/workspaces": {
      "format": "{icon}",
-     "on-scroll-up": "hyprctl dispatch workspace e+1",
-     "on-scroll-down": "hyprctl dispatch workspace e-1"
+     "format-icons": {
+     "1": "",
+     "2": "",
+     "3": "󰈙",
+     "4": "󰍨",
+     "5": "",
+     "9": "",
+     "active": "",
+     "default": ""
+     },
+     // "on-scroll-up": "hyprctl dispatch workspace e+1",
+     // "on-scroll-down": "hyprctl dispatch workspace e-1"
     },
     "sway/mode": {
         "format": "<span style=\"italic\">  {}</span>"
diff --git a/guix/home.scm b/guix/home.scm
index 08144db..b3763cc 100644
--- a/guix/home.scm
+++ b/guix/home.scm
@@ -11,6 +11,7 @@
   #:use-module (pkgs qt5ct)
   #:use-module (pkgs kdenlive)
   #:use-module (home-services pipewire)
+  ;; #:use-module (rde features)
   ;; #:use-module (emacs packages melpa)
   #:use-module (gnu home)
   #:use-module (gnu home services)
@@ -19,6 +20,7 @@
   #:use-module (gnu home services xdg)
   #:use-module (gnu home services gnupg)
   #:use-module (gnu home services fontutils)
+  #:use-module (gnu home services syncthing)
   #:use-module (gnu packages)
   #:use-module (gnu packages vim)
   #:use-module (gnu packages rust-apps)
@@ -52,270 +54,279 @@
 ;;     (base0E . "#ff6ac1")
 ;;     (base0F . "#b2643c")))
 
+;; (define mail-config
+;;   "a scheme module to setup my email config"
+;;   (service-type (name 'mail)
+;;                 (extensions
+;;                  (list (service-extension
+;;                         home-files-service-type
+;;                   `((".mbsyncrc" ,(local-file "../.config/.mbsyncrc"))))))))
+
 (define home-packages
   (list ;; Let's start with some things
-        ;; CLI apps
-        "vim"
-        "exa"
-        "unzip"
-        "rsync"
-        "openssh"
-        "gcc-toolchain"
-        "make"
-        "git"
-        "curl"
-        "vlc"
-	"mpv"
-	"mpv-mpris"
-        "libva"
-        "libva-utils"
-        "neofetch"
-        "qrencode"
-        "git:send-email"
-	"yt-dlp"
-        "playerctl"
-        "pavucontrol"
-        "alsa-utils"
-        "v4l-utils"
-        "tmux"
-        "direnv"
-        "dutree"
-        "btop"
-        "htop"
-        "ripgrep"
-        "imagemagick"
-        "jq"
-        "bat"
-        "alacritty"
-        "pandoc"
-        "fd"
-        "bc"
-        "sysstat"
-        "ffmpeg"
-        "ydotool"
-        "mediainfo"
-        "pulsemixer"
-        "pamixer"
-        "python-pulsectl"
-        "rbw"
-        "alsa-utils"
-        "wtype"
-        "brightnessctl"
-        "transmission"
-        "blesh"
-        "trash-cli"
+   ;; CLI apps
+   "vim"
+   "exa"
+   "unzip"
+   "rsync"
+   "openssh"
+   "gcc-toolchain"
+   "make"
+   "git"
+   "curl"
+   "vlc"
+   "mpv"
+   "mpv-mpris"
+   "libva"
+   "libva-utils"
+   "neofetch"
+   "qrencode"
+   "git:send-email"
+   "yt-dlp"
+   "playerctl"
+   "pavucontrol"
+   "alsa-utils"
+   "v4l-utils"
+   "tmux"
+   "direnv"
+   "dutree"
+   "btop"
+   "htop"
+   "ripgrep"
+   "imagemagick"
+   "jq"
+   "bat"
+   "alacritty"
+   "pandoc"
+   "fd"
+   "bc"
+   "sysstat"
+   "ffmpeg"
+   "ydotool"
+   "mediainfo"
+   "pulsemixer"
+   "pamixer"
+   "python-pulsectl"
+   "rbw"
+   "alsa-utils"
+   "wtype"
+   "brightnessctl"
+   "transmission"
+   "blesh"
+   "trash-cli"
 
-        ;; Utilities and Libraries
-        "libva"
-        "libvpx"
-        "python"
-        "gstreamer"
-        "gst-plugins-base"
-        "gst-plugins-good"
-        "gst-plugins-bad"
-        "gst-plugins-ugly"
-        "gst-libav"
-        "fish-foreign-env"
-        "libnotify"
-        "ffmpegthumbs"
-        "ffmpegthumbnailer"
-        "kio"
-        "nim"
-        "kio-fuse"
-        "sshfs"
-        "sshfs-fuse"
-        "ifuse"
-        "libimobiledevice"
-        "kio-extras"
-        "usbmuxd"
-        ;; "nautilus"
-        "swaybg"
-        "dconf"
-        "dconf-editor"
-        ;; "tracker"
-        ;; "tracker-miners"
-        "gvfs"
-        ;; "texlive"
-        ;; "texlive-pdfx"
-        ;; "texlive-latex-pdfx"
-        "jmtpfs"
-        "libmtp"
-        "xfconf"
-        "kfind"
-        "kiconthemes"
-        "gvfs"
-        "xfconf"
-        "kwallet"
-        "kwallet-pam"
-        "openjdk"
-        "python-vosk"
-        "gst-vosk"
-        "vosk-api"
-        "python-srt"
-        "perl-image-exiftool"
-        "srt"
-        "breeze-icons"
-        "distrobox"
-        "libreoffice"
-        ;; "nemo"
-        ;; "tridactyl-native"
-        ;; "qtwayland@5.15.8"
-        ;; "qtdeclarative@5.15.8"
-        "egl-wayland"
-        "pinentry"
-        "pinentry-qt"
-        "pinentry-rofi"
-        "flatpak"
-        "flatpak-xdg-utils"
-        "xdg-utils"
-        "xdg-desktop-portal"
-        "xdg-desktop-portal-kde"
-        "aspell"
-        "aspell-dict-en"
-        "enchant"
-        "ncurses"
-        "sbcl"
+   ;; Utilities and Libraries
+   "libva"
+   "libvpx"
+   "python"
+   "gstreamer"
+   "gst-plugins-base"
+   "gst-plugins-good"
+   "gst-plugins-bad"
+   "gst-plugins-ugly"
+   "gst-libav"
+   "fish-foreign-env"
+   "libnotify"
+   "ffmpegthumbs"
+   "ffmpegthumbnailer"
+   "kio"
+   "nim"
+   "kio-fuse"
+   "sshfs"
+   "sshfs-fuse"
+   "ifuse"
+   "libimobiledevice"
+   "kio-extras"
+   "usbmuxd"
+   ;; "nautilus"
+   "swaybg"
+   "dconf"
+   "dconf-editor"
+   ;; "tracker"
+   ;; "tracker-miners"
+   "gvfs"
+   ;; "texlive"
+   ;; "texlive-pdfx"
+   ;; "texlive-latex-pdfx"
+   "jmtpfs"
+   "libmtp"
+   "xfconf"
+   "kfind"
+   "kiconthemes"
+   "gvfs"
+   "xfconf"
+   "kwallet"
+   "kwallet-pam"
+   "openjdk"
+   "python-vosk"
+   "gst-vosk"
+   "vosk-api"
+   "python-srt"
+   "perl-image-exiftool"
+   "srt"
+   "breeze-icons"
+   "distrobox"
+   "libreoffice"
+   ;; "nemo"
+   ;; "tridactyl-native"
+   ;; "qtwayland@5.15.8"
+   ;; "qtdeclarative@5.15.8"
+   "egl-wayland"
+   "pinentry"
+   "pinentry-qt"
+   "pinentry-rofi"
+   "flatpak"
+   "flatpak-xdg-utils"
+   "xdg-utils"
+   "xdg-desktop-portal"
+   "xdg-desktop-portal-kde"
+   "aspell"
+   "aspell-dict-en"
+   "enchant"
+   "ncurses"
+   "sbcl"
 
-        ;; Theming
-        "phinger-cursors-theme" ;; Personal package of cursors
-        "papirus-icon-theme"
-        "sound-theme-freedesktop"
-        "lightly"
+   ;; Theming
+   "phinger-cursors-theme" ;; Personal package of cursors
+   "papirus-icon-theme"
+   "sound-theme-freedesktop"
+   "lightly"
 
-        ;; Gui Apps
-        "nextcloud-client"
-        "dunst"
-        "rofi-wayland"
-        "waybar"
-        "qt5ct"
-        "grim"
-        "slurp"
-        "imv"
-	"mpv"
-	"mpv-mpris"
-        "firefox-wayland"
-        "qutebrowser"
-        "nyxt"
-        "breeze"
-        "kdeconnect"
-        ;;"plasma"
-        "dolphin"
-        "darktable"
-        "thunar"
-        "dconf-editor"
-        "ark"
-        ;;"kdenlive-fix" ;; Personal fixed kdenlive
-        "gimp"
-        "distrobox"
-        "libreoffice"
-        "swaylock-effects"
-        "swayidle"
-        "steam"
-        ;; "tridactyl-native"
+   ;; Gui Apps
+   "nextcloud-client"
+   "dunst"
+   "rofi-wayland"
+   "waybar"
+   "qt5ct"
+   "grim"
+   "slurp"
+   "imv"
+   "mpv"
+   "mpv-mpris"
+   "firefox-wayland"
+   "qutebrowser"
+   "nyxt"
+   "breeze"
+   "kdeconnect"
+   ;;"plasma"
+   "dolphin"
+   "darktable"
+   "thunar"
+   "dconf-editor"
+   "ark"
+   ;;"kdenlive-fix" ;; Personal fixed kdenlive
+   "gimp"
+   "distrobox"
+   "libreoffice"
+   "swaylock-effects"
+   "swayidle"
+   "steam"
+   ;; "tridactyl-native"
 
-        ;; Fonts
-        "font-google-noto"
-        "font-google-noto-emoji"
-        "font-victor-mono"
+   ;; Fonts
+   "font-google-noto"
+   "font-google-noto-emoji"
+   "font-victor-mono"
 
-        ;; Emacs and packages
-        "emacs-next-pgtk"
-        "emacs-dired-rsync"
-        "emacs-all-the-icons"
-        "emacs-org-roam"
-        "emacs-paredit"
-        "emacs-evil-paredit"
-        "emacs-doom-modeline"
-        "emacs-doom-themes"
-        "emacs-org"
-        "emacs-elfeed"
-        "emacs-elfeed-org"
-        "emacs-esh-autosuggest"
-        "emacs-use-package"
-        "emacs-exec-path-from-shell"
-        "emacs-langtool"
-        "emacs-avy"
-        "emacs-general"
-        "emacs-evil"
-        "emacs-evil-collection"
-        "emacs-no-littering"
-        "emacs-evil-escape"
-        "emacs-smartparens"
-        "emacs-evil-org"
-        "emacs-evil-smartparens"
-        "emacs-aggressive-indent"
-        "emacs-adaptive-wrap"
-        "emacs-which-key"
-        "emacs-evil-surround"
-        "emacs-websocket"
-        "emacs-org-modern"
-        "emacs-org-web-tools"
-        "emacs-org-re-reveal"
-        "emacs-org-ql"
-        "emacs-org-msg"
-        "emacs-nov-el"
-        "emacs-calfw"
-        "emacs-transmission"
-        "emacs-emojify"
-        "emacs-pulsar"
-        "emacs-vertico"
-        "emacs-consult"
-        "emacs-consult-eglot"
-        "emacs-consult-org-roam"
-        "emacs-tempel"
-        "emacs-tempel-collection"
-        "emacs-marginalia"
-        "emacs-embark"
-        "emacs-wgrep"
-        "emacs-corfu"
-        "emacs-cape"
-        "emacs-rainbow-delimiters"
-        "emacs-orderless"
-        "emacs-kind-icon"
-        "emacs-projectile"
-        "emacs-simple-httpd"
-        "emacs-direnv"
-        "emacs-sly"
-        "emacs-diredfl"
-        "emacs-pdf-tools"
-        "emacs-vterm"
-        "emacs-plz"
-        "emacs-empv"
-        "emacs-ement"
-        "emacs-bongo"
-        "emacs-emms"
-        "emacs-gcmh"
-        "emacs-visual-fill-column"
-        "emacs-eat"
-        "emacs-mpv"
-        "emacs-all-the-icons-dired"
-        "emacs-all-the-icons-completion"
-        "emacs-org-super-agenda"
-        "emacs-toc-org"
-        "emacs-ox-reveal"
-        "emacs-ox-pandoc"
-        "emacs-ox-hugo"
-        "emacs-dired-sidebar"
-        "emacs-dired-du"
-        "emacs-ledger-mode"
-        "emacs-rustic"
-        "emacs-lua-mode"
-        "emacs-fennel-mode"
-        "emacs-web-mode"
-        "emacs-qml-mode"
-        "emacs-yaml-mode"
-        "emacs-cmake-mode"
-        "emacs-typescript-mode"
-        "emacs-fish-mode"
-        "emacs-markdown-mode"
-        "emacs-restclient"
-        "emacs-ob-restclient"
-        "emacs-guix"
-        "emacs-nix-mode"
-        "emacs-helpful"
-        ;; "emacs-mu4e"
-        "isync"
-        "mu"))
+   ;; Emacs and packages
+   "emacs-next-pgtk"
+   "emacs-dired-rsync"
+   "emacs-all-the-icons"
+   "emacs-org-roam"
+   "emacs-paredit"
+   "emacs-evil-paredit"
+   "emacs-doom-modeline"
+   "emacs-doom-themes"
+   "emacs-org"
+   "emacs-elfeed"
+   "emacs-elfeed-org"
+   "emacs-esh-autosuggest"
+   "emacs-use-package"
+   "emacs-exec-path-from-shell"
+   "emacs-langtool"
+   "emacs-avy"
+   "emacs-general"
+   "emacs-evil"
+   "emacs-evil-collection"
+   "emacs-no-littering"
+   "emacs-evil-escape"
+   "emacs-smartparens"
+   "emacs-evil-org"
+   "emacs-evil-smartparens"
+   "emacs-aggressive-indent"
+   "emacs-adaptive-wrap"
+   "emacs-which-key"
+   "emacs-evil-surround"
+   "emacs-websocket"
+   "emacs-org-modern"
+   "emacs-org-web-tools"
+   "emacs-org-re-reveal"
+   "emacs-org-ql"
+   "emacs-org-msg"
+   "emacs-nov-el"
+   "emacs-calfw"
+   "emacs-transmission"
+   "emacs-emojify"
+   "emacs-pulsar"
+   "emacs-ace-link"
+   "emacs-vertico"
+   "emacs-consult"
+   "emacs-consult-eglot"
+   "emacs-consult-org-roam"
+   "emacs-tempel"
+   "emacs-tempel-collection"
+   "emacs-marginalia"
+   "emacs-embark"
+   "emacs-wgrep"
+   "emacs-corfu"
+   "emacs-cape"
+   "emacs-rainbow-delimiters"
+   "emacs-orderless"
+   "emacs-kind-icon"
+   "emacs-projectile"
+   "emacs-simple-httpd"
+   "emacs-direnv"
+   "emacs-sly"
+   "emacs-diredfl"
+   "emacs-pdf-tools"
+   "emacs-vterm"
+   "emacs-plz"
+   "emacs-empv"
+   "emacs-ement"
+   "emacs-bongo"
+   "emacs-emms"
+   "emacs-gcmh"
+   "emacs-visual-fill-column"
+   "emacs-eat"
+   "emacs-mpv"
+   "emacs-all-the-icons-dired"
+   "emacs-all-the-icons-completion"
+   "emacs-org-super-agenda"
+   "emacs-toc-org"
+   "emacs-ox-reveal"
+   "emacs-ox-pandoc"
+   "emacs-ox-hugo"
+   "emacs-dired-sidebar"
+   "emacs-dired-du"
+   "emacs-ledger-mode"
+   "emacs-rustic"
+   "emacs-lua-mode"
+   "emacs-fennel-mode"
+   "emacs-web-mode"
+   "emacs-qml-mode"
+   "emacs-yaml-mode"
+   "emacs-cmake-mode"
+   "emacs-typescript-mode"
+   "emacs-fish-mode"
+   "emacs-markdown-mode"
+   "emacs-restclient"
+   "emacs-ob-restclient"
+   "emacs-guix"
+   "emacs-nix-mode"
+   "emacs-helpful"
+   ;; "emacs-mu4e"
+   "isync"
+   "mu"))
 
 (home-environment
   (packages (specifications->packages home-packages))
@@ -433,16 +444,21 @@ gtk-xft-rgba=none
                            ("gtk-2.0" ,(local-file "../.config/gtk-2.0" #:recursive? #t))))
          (simple-service 'scripts
                          home-files-service-type
-                         `(("bin" ,(local-file "../scripts" #:recursive? #t))
-                           (".mozilla/firefox/chris.default/chrome" ,(local-file "../.config/firefox/chrome" #:recursive? #t))
+                         `(("bin" ,(local-file "../scripts" #:recursive? #t))))
+         (simple-service 'home-files
+                         home-files-service-type
+                         `((".mozilla/firefox/chris.default/chrome" ,(local-file "../.config/firefox/chrome" #:recursive? #t))
                            (".var/app/org.mozilla.firefox/.mozilla/firefox/chris.default/chrome" ,(local-file "../.config/firefox/chrome" #:recursive? #t))
                            (".Xresources" ,(plain-file "Xresources" "Xcursor.theme: phinger-cursors-light
 Xcursor.size: 36
 "))
+                           (".mbsyncrc" ,(local-file "../.config/mbsyncrc"))
                            (".icons/default/index.theme" ,(plain-file "default.theme" "[icon theme]
 Inherits=phinger-cursors-light
 "))))
 
+         ;; (mail-config)
+         (service home-syncthing-service-type)
          (service home-gpg-agent-service-type
                   (home-gpg-agent-configuration
                    (pinentry-program
diff --git a/guix/pkgs/waybar.scm b/guix/pkgs/waybar.scm
new file mode 100644
index 0000000..2618ff0
--- /dev/null
+++ b/guix/pkgs/waybar.scm
@@ -0,0 +1,44 @@
+(define-module (pkgs waybar))
+
+(define-public waybar
+  (package
+    (name "waybar")
+    (version "0.9.22")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Alexays/Waybar")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "07h5l7h7wmzqgg7fbp98khrxg2sq2s4ncp4fiiz1yg62r752idy4"))))
+    (build-system meson-build-system)
+    (arguments
+     (list #:configure-flags #~(list "--wrap-mode=nodownload")))
+    (inputs (list date
+                  fmt
+                  gtk-layer-shell
+                  gtkmm-3
+                  jsoncpp
+                  libdbusmenu
+                  libevdev
+                  libinput-minimal
+                  libmpdclient
+                  libnl
+                  libxml2
+                  pipewire
+                  playerctl
+                  pulseaudio
+                  spdlog
+                  wayland
+                  wireplumber))
+    (native-inputs
+     (list `(,glib "bin") pkg-config scdoc wayland-protocols))
+    (home-page "https://github.com/Alexays/Waybar")
+    (synopsis "Wayland bar for Sway and Wlroots based compositors")
+    (description "Waybar is a highly customisable Wayland bar for Sway and
+Wlroots based compositors.")
+    (license license:expat))) ; MIT license
+
+waybar
diff --git a/qmk/qmk_firmware b/qmk/qmk_firmware
index c84cf9a..127dcdd 160000
--- a/qmk/qmk_firmware
+++ b/qmk/qmk_firmware
@@ -1 +1 @@
-Subproject commit c84cf9a83ac7f3a930ca08e431057783ea469424
+Subproject commit 127dcdd2277e0c73493f416fedc537391ab2444b