2 files changed, 56 insertions, 139 deletions

diff --git a/Desktop.org b/Desktop.org
index e50ef77..558c270 100644
--- a/Desktop.org
+++ b/Desktop.org
@@ -1,4 +1,4 @@
-#+title: EXW Configuration
+#+title: Desktop Configuration
 #+author: jdlugosz963
 #+PROPERTY: header-args:emacs-lisp :tangle .config/emacs/exwm/desktop.el
 
@@ -138,86 +138,3 @@
 
 #+end_src
 
-
-* Applications
-** Flatpak
-
-*Applications to Install*
-
-#+begin_src sh
-
-flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-flatpak install --user flathub com.spotify.Client
-flatpak install --user flathub com.valvesoftware.Steam
-flatpak install --user flathub com.microsoft.Teams
-flatpak install --user flathub com.discordapp.Discord
-
-#+end_src
-
-*Guix Packages*
-
-#+begin_src scheme :noweb-ref packages :noweb-sep ""
-
-"flatpak"
-
-#+end_src
-
-** Audio control
-
-*Guix Packages*
-
-#+begin_src scheme :noweb-ref packages :noweb-sep ""
-
-"pulsemixer"
-
-#+end_src
-
-** Bluetooth
-
-*Guix Packages*
-
-#+begin_src scheme :noweb-ref packages :noweb-sep ""
-
-  "blueman"
-
-#+end_src
-
-** Xorg
-
-*Xmodmap*
-
-#+begin_src sh :tangle .Xmodmap
-
-clear lock
-keycode 0x42 = Escape
-
-#+end_src
-
-*Guix Packages*
-
-#+begin_src scheme :noweb-ref packages :noweb-sep ""
-
-  "xev"
-  "xset"
-  "xrdb"
-  "xhost"
-  "xmodmap"
-  "setxkbmap"
-  "xrandr"
-  "arandr"
-  "xss-lock"
-  "libinput"
-  "xinput"
-
-#+end_src
-
-** Desktop Profile
-
-#+begin_src scheme :tangle .config/guix/manifests/desktop.scm :noweb yes
-
-(specifications->manifest
- '(
-   <<packages>>
-))
-
-#+end_src
diff --git a/Mail.org b/Mail.org
index d946108..b0c8449 100644
--- a/Mail.org
+++ b/Mail.org
@@ -4,66 +4,66 @@
 * jd-mu4e.el
 #+begin_src emacs-lisp
 
-      (use-package org-msg)
+        (use-package org-msg)
+
+        (use-package mu4e
+          :defer 20
+          :ensure nil
+          :config
+          (require 'org-mu4e)
+
+          (setq mu4e-update-interval (* 10 60))
+          (setq mu4e-get-mail-command "mbsync -a")
+          (setq mu4e-maildir "~/Mail")
+
+          (setq mu4e-completing-read-function #'ivy-completing-read)
+
+          (setq mu4e-change-filenames-when-moving t)
+
+          (setq mu4e-contexts
+                `(,(make-mu4e-context
+                    :name "Abaks"
+                    :match-func (lambda (msg) (when msg
+                                                (string-prefix-p "/abaks" (mu4e-message-field msg :maildir))))
+                    :vars '(
+                            (user-full-name . "Jakub Dlugosz")
+                            (user-mail-address . "jakub@abaks.pl")
+                            (mu4e-sent-folder . "/abaks/Sent Items")
+                            (mu4e-trash-folder . "/abaks/Trash")
+                            (mu4e-drafts-folder . "/abaks/Drafts")
+                            (mu4e-refile-folder . "/abaks/Archive")
+                            (mu4e-sent-messages-behavior . sent)
+                            ))
+                  ,(make-mu4e-context
+                  :name "Gmail"
+                  :match-func (lambda (msg) (when msg
+                                              (string-prefix-p "/gmail" (mu4e-message-field msg :maildir))))
+                  :vars '(
+                          (user-full-name . "Jakub Dlugosz")
+                          (user-mail-address . "jdlugosz963@gmail.pl")
+                          (mu4e-sent-folder . "/gmail/\[Gmail\]/Wys\&AUI-ane")
+                          (mu4e-trash-folder . "/gmail/\[Gmail\]/Kosz")
+                          (mu4e-drafts-folder . "/gmail/\[Gmail\]/Wersje\ robocze")
+                          (mu4e-refile-folder . "/gmail/Archive")
+                          (mu4e-sent-messages-behavior . sent)
+                          ))))
 
-      (use-package mu4e
-        :defer 20
-        :ensure nil
-        :config
-        (require 'org-mu4e)
+          (setq mail-user-agent 'mu4e-user-agent
+                message-send-mail-function 'smtpmail-send-it
+                smtpmail-smtp-server "smtp.abaks.pl"
+                smtpmail-local-domain "pl"
+                smtpmail-smtp-service 465
+                smtpmail-stream-type  'ssl)
 
-        (setq mu4e-update-interval (* 10 60))
-        (setq mu4e-get-mail-command "mbsync -a")
-        (setq mu4e-maildir "~/Mail")
+          (mu4e t))
 
-        (setq mu4e-completing-read-function #'ivy-completing-read)
+        (jd/leader-key-def
+          "m"  '(:ignore t :which-key "mail")
+          "mm" 'mu4e
+          "mc" 'mu4e-compose-new)
 
-        (setq mu4e-change-filenames-when-moving t)
 
-        (setq mu4e-contexts
-              `(,(make-mu4e-context
-                  :name "Abaks"
-                  :match-func (lambda (msg) (when msg
-                                              (string-prefix-p "/abaks" (mu4e-message-field msg :maildir))))
-                  :vars '(
-                          (user-full-name . "Jakub Dlugosz")
-                          (user-mail-address . "jakub@abaks.pl")
-                          (mu4e-sent-folder . "/abaks/Sent Items")
-                          (mu4e-trash-folder . "/abaks/Trash")
-                          (mu4e-drafts-folder . "/abaks/Drafts")
-                          (mu4e-refile-folder . "/abaks/Archive")
-                          (mu4e-sent-messages-behavior . sent)
-                          ))
-                ,(make-mu4e-context
-                :name "Gmail"
-                :match-func (lambda (msg) (when msg
-                                            (string-prefix-p "/gmail" (mu4e-message-field msg :maildir))))
-                :vars '(
-                        (user-full-name . "Jakub Dlugosz")
-                        (user-mail-address . "jdlugosz963@gmail.pl")
-                        (mu4e-sent-folder . "/gmail/\[Gmail\]/Wys\&AUI-ane")
-                        (mu4e-trash-folder . "/gmail/\[Gmail\]/Kosz")
-                        (mu4e-drafts-folder . "/gmail/\[Gmail\]/Wersje\ robocze")
-                        (mu4e-refile-folder . "/gmail/Archive")
-                        (mu4e-sent-messages-behavior . sent)
-                        ))))
-
-        (setq mail-user-agent 'mu4e-user-agent
-              message-send-mail-function 'smtpmail-send-it
-              smtpmail-smtp-server "smtp.abaks.pl"
-              smtpmail-local-domain "pl"
-              smtpmail-smtp-service 465
-              smtpmail-stream-type  'ssl)
-
-        (mu4e t))
-
-      (jd/leader-key-def
-        "m"  '(:ignore t :which-key "mail")
-        "mm" 'mu4e
-        "mc" 'mu4e-compose-new)
-
-
-      (provide 'jd-mu4e)
+        (provide 'jd-mu4e)
 
 #+end_src