diff --git a/home-configuration.scm b/home-configuration.scm
index 79caad0..adbdaeb 100644
--- a/home-configuration.scm
+++ b/home-configuration.scm
@@ -8,8 +8,10 @@
              (gnu packages)
              (gnu services)
              (guix gexp)
-             (gnu home services shells)
-             (gnu home services))
+             (gnu home services)
+             (gnu home services desktop)
+             (gnu home services sound)
+             (gnu home services shells))
 
 (home-environment
   ;; Below is the list of packages that will show up in your
@@ -29,6 +31,10 @@
                    (bash-profile (list (local-file
                                         "./home/conf-files/.bash_profile"
                                         "bash_profile")))))
+         (service home-dbus-service-type)
+         (service home-pipewire-service-type)
+         (service home-files-service-type
+                  `((".mbsyncrc" ,(local-file "./home/conf-files/mbsyncrc" "mbsyncrc"))))
          (service home-xdg-configuration-files-service-type
                   `(("sway/config" ,(local-file "./home/conf-files/sway-config" "sway-config"))
                     ("foot/foot.ini" ,(local-file "./home/conf-files/foot.ini" "foot.ini")))))))
diff --git a/home/conf-files/mbsyncrc b/home/conf-files/mbsyncrc
new file mode 100644
index 0000000..837ea21
--- /dev/null
+++ b/home/conf-files/mbsyncrc
@@ -0,0 +1,21 @@
+IMAPAccount alternativebit
+Host mail.gandi.net
+User felix@alternativebit.fr
+PassCmd "cat ~/secrets/email/token-gandi-perso"
+SSLType IMAPS
+
+IMAPStore alternativebit-remote
+Account alternativebit
+
+MaildirStore alternativebit-local
+Subfolders Verbatim
+# The trailing "/" is important
+Path ~/.mail/alternativebit/
+Inbox ~/.mail/alternativebit/Inbox
+
+Channel alternativebit
+Far :alternativebit-remote:
+Near :alternativebit-local:
+Patterns *
+SyncState *
+Create Both
\ No newline at end of file
diff --git a/home/conf-files/sway-config b/home/conf-files/sway-config
index 6015b62..62b5549 100644
--- a/home/conf-files/sway-config
+++ b/home/conf-files/sway-config
@@ -178,11 +178,9 @@ bindsym $mod+b exec grim  -g "$(slurp)" /tmp/$(date +'%H:%M:%S.png')
 
 bar {
     position top
-
     swaybar_command waybar
 }
 
-exec dbus-sway-environment
-exec configure-gtk
 exec nm-applet
-exec blueman-applet
\ No newline at end of file
+exec blueman-applet
+exec mako
\ No newline at end of file
diff --git a/modules/services/desktop/sway.scm b/modules/services/desktop/sway.scm
new file mode 100644
index 0000000..78b06af
--- /dev/null
+++ b/modules/services/desktop/sway.scm
@@ -0,0 +1,14 @@
+(define-module (services desktop sway)
+  #:use-module (gnu)
+  #:export (%sway-desktop-services))
+
+(use-service-modules desktop sddm networking xorg ssh)
+
+(define %sway-desktop-services
+  (modify-services
+      %desktop-services
+    (delete gdm-service-type)
+    (service bluetooth-service-type)
+    (simple-service 'sway-env session-environment-service-type
+                    '(("XDG_CURRENT_DESKTOP" . "sway")))
+    (service sddm-service-type)))
diff --git a/config.scm b/system-configuration.scm
similarity index 58%
rename from config.scm
rename to system-configuration.scm
index 93536db..b086d7c 100644
--- a/config.scm
+++ b/system-configuration.scm
@@ -12,13 +12,11 @@
 (use-modules (gnu))
 (use-modules
 	     (nongnu packages linux)
-	     (nongnu system linux-initrd))
-(use-service-modules cups sddm desktop networking ssh xorg)
-
-(define %nonguix-desktop-services
+	     (nongnu system linux-initrd)
+             (services desktop sway))
+(define %framework-desktop-services
   (modify-services
-   %desktop-services
-   (delete gdm-service-type)
+   %sway-desktop-services
    (guix-service-type config =>
                       (guix-configuration
                        (inherit config)
@@ -49,41 +47,39 @@
   ;; Packages installed system-wide.  Users can also install packages
   ;; under their own account: use 'guix search KEYWORD' to search
   ;; for packages and 'guix install PACKAGE' to install a package.
-  (packages (append (list (specification->package "emacs-pgtk")
-                          (specification->package "firefox")
-                          (specification->package "git")
-                          (specification->package "ripgrep")
-                          (specification->package "syncthing")
-                          (specification->package "dino")
-                          (specification->package "htop")
-                          (specification->package "keepassxc")
-                          (specification->package "direnv")
-                          (specification->package "sway")
-                          (specification->package "openssh")
-                          (specification->package "nautilus")
-                          (specification->package "mako")
-                          (specification->package "bemenu")
-                          (specification->package "slurp")
-                          (specification->package "grim")
-                          (specification->package "network-manager-applet")
-                          (specification->package "blueman")
-                          (specification->package "foot")
-                          (specification->package "adwaita-icon-theme")
-                          (specification->package "font-awesome")
-                          (specification->package "waybar")
-                          (specification->package "vim"))
+  (packages (append
+             (map specification->package
+                  (list
+                   "adwaita-icon-theme"
+                   "bemenu"
+                   "blueman"
+                   "dino"
+                   "direnv"
+                   "xdg-desktop-portal"
+                   "xdg-desktop-portal-wlr"
+                   "emacs-pgtk"
+                   "firefox"
+                   "font-awesome"
+                   "foot"
+                   "git"
+                   "grim"
+                   "htop"
+                   "isync"
+                   "keepassxc"
+                   "mako"
+                   "nautilus"
+                   "network-manager-applet"
+                   "openssh"
+                   "pavucontrol"
+                   "ripgrep"
+                   "slurp"
+                   "sway"
+                   "syncthing"
+                   "vim"
+                   "waybar"))
                     %base-packages))
 
-  ;; Below is the list of system services.  To search for available
-  ;; services, run 'guix system search KEYWORD' in a terminal.
-  (services
-   (append (list
-                 (service cups-service-type)
-                 (service bluetooth-service-type)
-                 (service sddm-service-type))
-           ;; This is the default list of services we
-           ;; are appending to.
-           %nonguix-desktop-services))
+  (services %framework-desktop-services)
 
   (bootloader (bootloader-configuration
                 (bootloader grub-efi-bootloader)