From a9f798f051744c974bb550b5792b72321cb583a3 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Wed, 1 Nov 2023 08:37:30 +0000
Subject: [PATCH 01/11] Fix and re-enable dashboard

Add some more fonts

Try to fix modeline fonts, still not quite working, rearranged config
to test this
---
 flake.nix                                   | 13 ++-
 home/emacs/init.el                          | 13 +--
 home/emacs/modules/custom-email-config.el   | 73 ++++++++---------
 home/emacs/modules/custom-feed-config.el    | 15 ++--
 home/emacs/modules/custom-ide-config.el     |  4 +-
 home/emacs/modules/custom-org-config.el     | 10 +--
 home/emacs/modules/custom-project-config.el |  4 +-
 home/emacs/modules/custom-social-config.el  |  6 +-
 home/emacs/modules/custom-ui-config.el      | 89 ++++++++++++---------
 system/emacs.nix                            |  3 +-
 10 files changed, 127 insertions(+), 103 deletions(-)

diff --git a/flake.nix b/flake.nix
index cb693914..fa055848 100644
--- a/flake.nix
+++ b/flake.nix
@@ -158,7 +158,18 @@
                   fira-mono
                   fira-code
                   fira-code-symbols
-                  (nerdfonts.override { fonts = [ "FiraCode" ]; })
+                  (nerdfonts.override {
+                    fonts = [
+                      "FiraCode"
+                      "FiraMono"
+                      "DejaVuSansMono"
+                      "Noto"
+                      "ComicShannsMono"
+                      "NerdFontsSymbolsOnly"
+                    ];
+                  })
+                  emacs-all-the-icons-fonts
+                  weather-icons
                   noto-fonts
                   noto-fonts-cjk
                   noto-fonts-emoji
diff --git a/home/emacs/init.el b/home/emacs/init.el
index 68b9d35d..739d393f 100644
--- a/home/emacs/init.el
+++ b/home/emacs/init.el
@@ -32,7 +32,14 @@
 (setq user-full-name "Evie Litherland-Smith"
       user-mail-address "evie@xenia.me.uk")
 
+;; Set default coding system (especially for Windows)
+(set-default-coding-systems 'utf-8)
+(set-terminal-coding-system 'utf-8)
+(set-keyboard-coding-system 'utf-8)
+
+(require 'custom-ui-config)
 (require 'custom-defaults-config)
+
 (require 'custom-email-config)
 (require 'custom-feed-config)
 (require 'custom-ide-config)
@@ -41,15 +48,9 @@
 (require 'custom-org-config)
 (require 'custom-project-config)
 (require 'custom-social-config)
-(require 'custom-ui-config)
 
 (require 'crafted-completion-config)
 (require 'crafted-ide-config)
 (require 'crafted-org-config)
 (require 'crafted-workspaces-config)
 (require 'crafted-writing-config)
-
-;; Set default coding system (especially for Windows)
-(set-default-coding-systems 'utf-8)
-(set-terminal-coding-system 'utf-8)
-(set-keyboard-coding-system 'utf-8)
diff --git a/home/emacs/modules/custom-email-config.el b/home/emacs/modules/custom-email-config.el
index 2790e0a0..13dfe76e 100644
--- a/home/emacs/modules/custom-email-config.el
+++ b/home/emacs/modules/custom-email-config.el
@@ -3,7 +3,39 @@
       message-sendmail-f-is-evil t
       message-sendmail-extra-arguments '("--read-envelope-from")
       message-send-mail-function #'message-send-mail-with-sendmail
-      message-kill-buffer-on-exit t)
+      message-kill-buffer-on-exit t
+      mail-user-agent 'mu4e-user-agent
+      read-mail-command 'mu4e
+      mu4e-maildir "~/Mail"
+      mu4e-attachment-dir "~/Downloads"
+      mu4e-get-mail-command "mbsync -a"
+      mu4e-update-interval (* 5 60) ; Every 5 minutes
+      mu4e-sent-messages-behavior 'sent
+      mu4e-change-filenames-when-moving t
+      mu4e-context-policy 'pick-first
+      mu4e-headers-thread-single-orphan-prefix '("─>" . "─▶")
+      mu4e-headers-thread-orphan-prefix        '("┬>" . "┬▶ ")
+      mu4e-headers-thread-connection-prefix    '("│ " . "│ ")
+      mu4e-headers-thread-first-child-prefix   '("├>" . "├▶")
+      mu4e-headers-thread-child-prefix         '("├>" . "├▶")
+      mu4e-headers-thread-last-child-prefix    '("└>" . "╰▶")
+      mu4e-modeline-all-read '("R:" . "󰑇 ")
+      mu4e-modeline-all-clear '("C:" . "󰚭 ")
+      mu4e-modeline-new-items '("N:" . "󰎔 ")
+      mu4e-modeline-unread-items '("U:" . "󰮒 ")
+      mu4e-search-full-label '("F" . "󱊖 ")
+      mu4e-search-hide-label '("H" . "󰘓 ")
+      mu4e-search-related-label '("R" . "󰌹 ")
+      mu4e-search-skip-duplicates-label '("D" . "󰆑 ")
+      mu4e-search-threaded-label'("T" . "󱇫 ")
+      mu4e-alert-modeline-formatter 'mu4e-alert-default-mode-line-formatter
+      mu4e-headers-fields '((:human-date . 12)
+			    (:flags . 6)
+			    (:from-or-to . 25)
+			    (:subject))
+      mu4e-maildir-shortcuts '((:maildir "/Proton/Inbox/" :key ?p)
+			       (:maildir "/iCloud/Inbox/" :key ?i)
+			       (:maildir "/Outlook/Inbox/" :key ?o)))
 
 (when (require 'mu4e nil :noerror)
   (keymap-set global-map "C-c m m" #'mu4e)
@@ -11,46 +43,11 @@
   (keymap-set global-map "C-c m c" #'mu4e-compose-new)
 
   (when (require 'mu4e-alert nil :noerror)
-    (setq mu4e-alert-modeline-formatter 'mu4e-alert-default-mode-line-formatter)
     (mu4e-alert-set-default-style 'libnotify)
     (mu4e-alert-enable-notifications)
     (mu4e-alert-enable-mode-line-display))
-  
-  (setq mu4e-maildir "~/Mail"
-	mu4e-attachment-dir "~/Downloads"
-	mu4e-get-mail-command "mbsync -a"
-	mu4e-update-interval (* 5 60) ; Every 5 minutes
-	mu4e-sent-messages-behavior 'sent
-	mu4e-change-filenames-when-moving t
-	mu4e-context-policy 'pick-first
-	sendmail-program (executable-find "msmtp")
-	send-mail-function #'smtpmail-send-it
-	message-sendmail-f-is-evil t
-	message-sendmail-extra-arguments '("--read-envelope-from")
-	message-send-mail-function #'message-send-mail-with-sendmail
-	mu4e-headers-thread-single-orphan-prefix '("─>" . "─▶")
-        mu4e-headers-thread-orphan-prefix        '("┬>" . "┬▶ ")
-        mu4e-headers-thread-connection-prefix    '("│ " . "│ ")
-        mu4e-headers-thread-first-child-prefix   '("├>" . "├▶")
-        mu4e-headers-thread-child-prefix         '("├>" . "├▶")
-        mu4e-headers-thread-last-child-prefix    '("└>" . "╰▶")
-	mu4e-modeline-all-read '("R:" . "󰑇 ")
-	mu4e-modeline-all-clear '("C:" . "󰚭 ")
-	mu4e-modeline-new-items '("N:" . "󰎔 ")
-	mu4e-modeline-unread-items '("U:" . "󰮒 ")
-	mu4e-search-full-label '("F" . "󱊖 ")
-	mu4e-search-hide-label '("H" . "󰘓 ")
-	mu4e-search-related-label '("R" . "󰌹 ")
-	mu4e-search-skip-duplicates-label '("D" . "󰆑 ")
-	mu4e-search-threaded-label'("T" . "󱇫 ")
-	mu4e-headers-fields '((:human-date . 12)
-			      (:flags . 6)
-			      (:from-or-to . 25)
-			      (:subject))
-	mu4e-maildir-shortcuts '((:maildir "/Proton/Inbox/" :key ?p)
-				 (:maildir "/iCloud/Inbox/" :key ?i)
-				 (:maildir "/Outlook/Inbox/" :key ?o))
-	mu4e-contexts (list
+
+  (setq mu4e-contexts (list
 		       (make-mu4e-context
 			:name "Proton"
 			:match-func (lambda (msg) (when msg (string-prefix-p "/Proton" (mu4e-message-field msg :maildir))))
diff --git a/home/emacs/modules/custom-feed-config.el b/home/emacs/modules/custom-feed-config.el
index 6fa4c348..8ae7df6d 100644
--- a/home/emacs/modules/custom-feed-config.el
+++ b/home/emacs/modules/custom-feed-config.el
@@ -1,10 +1,13 @@
+(let ((elfeed-base-directory "~/.elfeed"))
+  (setq elfeed-db-directory (expand-file-name "db" elfeed-base-directory)
+	elfeed-enclosure-default-dir (expand-file-name "enclosures" elfeed-base-directory)
+	rmh-elfeed-org-files (list (expand-file-name "feeds.org" elfeed-base-directory))))
+
 (when (require 'elfeed nil :noerror)
-  (let ((elfeed-base-directory "~/.elfeed"))
-    (setq elfeed-db-directory (expand-file-name "db" elfeed-base-directory)
-	  elfeed-enclosure-default-dir (expand-file-name "enclosures" elfeed-base-directory)
-	  rmh-elfeed-org-files (list (expand-file-name "feeds.org" elfeed-base-directory))))
   (add-hook 'elfeed-search-mode-hook #'elfeed-update)
-  (when (require 'elfeed-org nil :noerror) (elfeed-org))
-  (when (require 'elfeed-tube nil :noerror) (elfeed-tube-setup)))
+  (when (require 'elfeed-org nil :noerror)
+    (elfeed-org))
+  (when (require 'elfeed-tube nil :noerror) 
+    (elfeed-tube-setup)))
 
 (provide 'custom-feed-config)
diff --git a/home/emacs/modules/custom-ide-config.el b/home/emacs/modules/custom-ide-config.el
index 7be989d7..66eafb61 100644
--- a/home/emacs/modules/custom-ide-config.el
+++ b/home/emacs/modules/custom-ide-config.el
@@ -4,16 +4,16 @@
 (when (require 'treesit-aut nil :noerror)
   (global-treesit-auto-mode +1))
 
+(setq apheleia-remote-algorithm 'local)
 (when (require 'apheleia nil :noerror)
-  (setq apheleia-remote-algorithm 'local)
   (keymap-set global-map "C-c c f" #'apheleia-format-buffer)
   (apheleia-global-mode +1))
 
 (when (require 'eglot nil :noerror)
   (eglot-ensure))
 
+(setq direnv-always-show-summary nil)
 (when (require 'direnv nil :noerror)
-  (setq direnv-always-show-summary nil)
   (direnv-mode +1))
 
 (when (require 'yasnippet nil :noerror)
diff --git a/home/emacs/modules/custom-org-config.el b/home/emacs/modules/custom-org-config.el
index fdc39e37..7d682217 100644
--- a/home/emacs/modules/custom-org-config.el
+++ b/home/emacs/modules/custom-org-config.el
@@ -50,12 +50,12 @@
 	 :emptry-lines 1)
 	))
 
+(setq khalel-import-org-file (expand-file-name "calendar.org" org-directory)
+      khalel-import-org-file-read-only nil
+      khalel-import-org-file-confirm-overwrite nil
+      khalel-import-start-date "-30d"
+      khalel-import-end-date "+30d")
 (when (require 'khalel nil :noerror)
-  (setq khalel-import-org-file (expand-file-name "calendar.org" org-directory)
-	khalel-import-org-file-read-only nil
-	khalel-import-org-file-confirm-overwrite nil
-	khalel-import-start-date "-30d"
-	khalel-import-end-date "+30d")
   (add-hook 'org-agenda-mode-hook #'khalel-import-events)
   (khalel-add-capture-template "e"))
 
diff --git a/home/emacs/modules/custom-project-config.el b/home/emacs/modules/custom-project-config.el
index f6bb0c51..9b782558 100644
--- a/home/emacs/modules/custom-project-config.el
+++ b/home/emacs/modules/custom-project-config.el
@@ -6,7 +6,7 @@
         (project-find-dir "Find directory")
         (project-eshell "Eshell")))
 
-(when (require 'magit nil :noerror)
-  (setq magit-clone-default-directory "~/Projects/"))
+(setq magit-clone-default-directory "~/Projects/")
+(require 'magit nil :noerror)
 
 (provide 'custom-project-config)
diff --git a/home/emacs/modules/custom-social-config.el b/home/emacs/modules/custom-social-config.el
index c331b8ed..64482c5a 100644
--- a/home/emacs/modules/custom-social-config.el
+++ b/home/emacs/modules/custom-social-config.el
@@ -1,5 +1,5 @@
-(when (require 'mastodon nil :noerror)
-  (setq mastodon-instance-url "https://tech.lgbt"
-	mastodon-active-user "Tux922"))
+(setq mastodon-instance-url "https://tech.lgbt"
+      mastodon-active-user "Tux922")
+(require 'mastodon nil :noerror)
 
 (provide 'custom-social-config)
diff --git a/home/emacs/modules/custom-ui-config.el b/home/emacs/modules/custom-ui-config.el
index f81a7c04..27da0cdb 100644
--- a/home/emacs/modules/custom-ui-config.el
+++ b/home/emacs/modules/custom-ui-config.el
@@ -25,63 +25,74 @@
   (load-theme 'doom-tokyo-night t))
 
 ;; Nerd-Icons modes
-(when (require 'nerd-icons-dired nil :noerror)
-  (add-hook 'dired-mode-hook #'nerd-icons-dired-mode))
+(when (require 'nerd-icons)
+  (when (require 'nerd-icons-dired nil :noerror)
+    (add-hook 'dired-mode-hook #'nerd-icons-dired-mode))
 
-(when (require 'nerd-icons-ibuffer nil :noerror)
-  (add-hook 'ibuffer-mode-hook #'nerd-icons-ibuffer-mode))
+  (when (require 'nerd-icons-ibuffer nil :noerror)
+    (add-hook 'ibuffer-mode-hook #'nerd-icons-ibuffer-mode))
 
-(when (require 'nerd-icons-completion nil :noerror)
-  (nerd-icons-completion-mode)
-  (when (require 'marginalia nil :noerror)
-    (add-hook 'marginalia-mode-hook #'nerd-icons-completion-marginalia-setup)))
+  (when (require 'nerd-icons-completion nil :noerror)
+    (nerd-icons-completion-mode)
+    (when (require 'marginalia nil :noerror)
+      (add-hook 'marginalia-mode-hook #'nerd-icons-completion-marginalia-setup))))
 
 ;; Doom-Modeline
+(setq doom-modeline-icon t
+      doom-modeline-mu4e t
+      doom-modeline-modal nil
+      doom-modeline-modal-icon nil
+      doom-modeline-persp-name nil
+      doom-modeline-persp-icon nil)
 (when (require 'doom-modeline nil :noerror)
-  (setq doom-modeline-icon t
-	doom-modeline-mu4e t)
   (display-battery-mode)
   (doom-modeline-mode +1))
 
 ;; Dashboard
-(when (require 'dashboard nil :noerror)
-  (setq initial-buffer-choice 'dashboard-open
-	dashboard-icon-type 'nerd-icons
-	dashboard-set-heading-icons t
-	dashboard-set-file-icons t
-	dashboard-set-navigator t
-	dashboard-set-init-info t
-	dashboard-startup-banner 'ascii
-	dashboard-projects-backend 'project-el
-	dashboard-projects-switch-function 'project-switch-project
-	dashboard-projects-show-base t
-	dashboard-recentf-show-base 'align
-	dashboard-items '((projects . 5) (agenda . 5) (recents  . 5))
-	dashboard-banner-ascii (concat "          .000000.          \n"
-				       "         .0.    .0.         \n"
-				       "       .00.      .00.       \n"
-				       " .000cl.            .lc000. \n"
-				       ".0                        0.\n"
-				       "0.        .o0000o.        .0\n"
-				       " 00     .0'      '0.     00 \n"
-				       "  00   .0          0.   00  \n"
-				       "  HHHHH HHHHHHHHHHHH HHHHH  \n"
-				       "HHHH HHH HHHHHHHHHHHHHH HHHH\n"
-				       " HHHHHH HHHHHHHHH HHHHHHHH  \n"
-				       "  HHH HHHH HHHHHHHHH HHHH   \n"
-				       "         HHH HHHHHH         \n"
-				       "          HHHHH HH          \n")))
+(setq initial-buffer-choice 'dashboard-open
+      dashboard-icon-type 'nerd-icons
+      dashboard-set-heading-icons t
+      dashboard-set-file-icons t
+      dashboard-set-navigator t
+      dashboard-set-init-info t
+      dashboard-startup-banner 'ascii
+      dashboard-projects-backend 'project-el
+      dashboard-projects-switch-function 'project-switch-project
+      dashboard-projects-show-base t
+      dashboard-recentf-show-base 'align
+      dashboard-items '((projects . 5)
+			(agenda . 5)
+			(recents  . 5))
+      dashboard-heading-icons '((projects . "nf-oct-rocket")
+				(agenda . "nf-oct-calendar")
+			 	(recents . "nf-oct-history"))
+      dashboard-banner-ascii (concat "          .000000.          \n"
+				     "         .0.    .0.         \n"
+				     "       .00.      .00.       \n"
+				     " .000cl.            .lc000. \n"
+				     ".0                        0.\n"
+				     "0.        .o0000o.        .0\n"
+				     " 00     .0'      '0.     00 \n"
+				     "  00   .0          0.   00  \n"
+				     "  HHHHH HHHHHHHHHHHH HHHHH  \n"
+				     "HHHH HHH HHHHHHHHHHHHHH HHHH\n"
+				     " HHHHHH HHHHHHHHH HHHHHHHH  \n"
+				     "  HHH HHHH HHHHHHHHH HHHH   \n"
+				     "         HHH HHHHHH         \n"
+				     "          HHHHH HH          \n"))
+(require 'dashboard nil :noerror)
 
 ;; Extra minor-modes
 (when (require 'which-key nil :noerror)
   (which-key-mode +1))
 
-(when (require 'page-break nil :noerror)
+(when (require 'page-break-lines nil :noerror)
   (global-page-break-lines-mode +1))
 
 ;; Weather in modeline
 (setq display-wttr-format 1)
-(when (require 'display-wttr nil :noerror) (display-wttr-mode +1))
+(when (require 'display-wttr nil :noerror)
+  (display-wttr-mode +1))
 
 ;;;; Help Buffers
 
diff --git a/system/emacs.nix b/system/emacs.nix
index a230c6ea..5ceda273 100644
--- a/system/emacs.nix
+++ b/system/emacs.nix
@@ -64,12 +64,13 @@
           mastodon
 
           # ui-packages
+          all-the-icons
           nerd-icons
           nerd-icons-completion
           nerd-icons-dired
           nerd-icons-ibuffer
           page-break-lines
-          # dashboard
+          dashboard
           doom-modeline
           helpful
           which-key

From 0614725bb04244b6bbb9ee72b977211d2e703f02 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 1 Nov 2023 11:03:46 +0000
Subject: [PATCH 02/11] Use full texlive, add gs and mupdf for doc-view

Remove texlab LSP as texlive ships digestif
---
 home/emacs/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index d9aa86e3..dbcaaadd 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -24,7 +24,9 @@
       pandoc
       gfortran
       rustup
-      texlive.combined.scheme-medium
+      texlive.combined.scheme-full
+      ghostscript
+      mupdf
       (python3.withPackages
         (ps: with ps; [ python-lsp-server python-lsp-ruff pylsp-mypy ]))
 
@@ -51,7 +53,6 @@
       shellcheck
       marksman
       luajitPackages.lua-lsp
-      texlab
       # nodePackages.pyright
       nodePackages.yaml-language-server
       nodePackages.bash-language-server

From e40ac6f61ddfd783b3dc545cf0bef4c7d3f4e3ee Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 1 Nov 2023 18:05:45 +0000
Subject: [PATCH 03/11] Enable mu4e fancy chars, fix folders for iCloud account

---
 home/emacs/modules/custom-email-config.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/home/emacs/modules/custom-email-config.el b/home/emacs/modules/custom-email-config.el
index 13dfe76e..540be896 100644
--- a/home/emacs/modules/custom-email-config.el
+++ b/home/emacs/modules/custom-email-config.el
@@ -13,8 +13,9 @@
       mu4e-sent-messages-behavior 'sent
       mu4e-change-filenames-when-moving t
       mu4e-context-policy 'pick-first
+      mu4e-use-fancy-chars t
       mu4e-headers-thread-single-orphan-prefix '("─>" . "─▶")
-      mu4e-headers-thread-orphan-prefix        '("┬>" . "┬▶ ")
+      mu4e-headers-thread-orphan-prefix        '("┬>" . "┬▶")
       mu4e-headers-thread-connection-prefix    '("│ " . "│ ")
       mu4e-headers-thread-first-child-prefix   '("├>" . "├▶")
       mu4e-headers-thread-child-prefix         '("├>" . "├▶")
@@ -22,7 +23,7 @@
       mu4e-modeline-all-read '("R:" . "󰑇 ")
       mu4e-modeline-all-clear '("C:" . "󰚭 ")
       mu4e-modeline-new-items '("N:" . "󰎔 ")
-      mu4e-modeline-unread-items '("U:" . "󰮒 ")
+      mu4e-modeline-unread-items '("U:" . "󰶊 ")
       mu4e-search-full-label '("F" . "󱊖 ")
       mu4e-search-hide-label '("H" . "󰘓 ")
       mu4e-search-related-label '("R" . "󰌹 ")
@@ -60,9 +61,9 @@
 			:name "iCloud"
 			:match-func (lambda (msg) (when msg (string-prefix-p "/iCloud" (mu4e-message-field msg :maildir))))
 			:vars '((user-mail-address . "e.litherlandsmith@icloud.com")
-				(mu4e-sent-folder . "/iCloud/Sent")
+				(mu4e-sent-folder . "/iCloud/Sent Messages")
 				(mu4e-drafts-folder . "/iCloud/Drafts")
-				(mu4e-trash-folder . "/iCloud/Trash")
+				(mu4e-trash-folder . "/iCloud/Deleted Messages")
 				(mu4e-refile-folder . "/iCloud/Archive")))
 		       (make-mu4e-context
 			:name "Outlook"

From 4c36b300b1cb301848b8061fee9689f5a50b0ca1 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 1 Nov 2023 18:12:17 +0000
Subject: [PATCH 04/11] Switch Org directory back to being a git repo

---
 home/emacs/default.nix         | 4 ++++
 services/syncthing/default.nix | 5 -----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index dbcaaadd..06f22062 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -11,6 +11,10 @@
   services.git-sync = {
     enable = true;
     repositories = with config.home; {
+      org = {
+        url = "${homeDirectory}/Org";
+        uri = "git+https://git.xenia.me.uk/xenia/Org.git";
+      };
       elfeed = {
         path = "${homeDirectory}/.elfeed";
         uri = "git+https://git.xenia.me.uk/xenia/elfeed.git";
diff --git a/services/syncthing/default.nix b/services/syncthing/default.nix
index 81cbec37..887bf91c 100644
--- a/services/syncthing/default.nix
+++ b/services/syncthing/default.nix
@@ -19,11 +19,6 @@
         path = "~/Music";
         ignorePerms = true;
       };
-      "Org" = {
-        id = "kztmq-eoqcs";
-        path = "~/Org";
-        ignorePerms = true;
-      };
       "Pictures" = {
         id = "ziuj8-rm6dn";
         path = "~/Pictures";

From 266693a42b505eba9888cbdae785bcc1c508d020 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 1 Nov 2023 18:21:27 +0000
Subject: [PATCH 05/11] Remove kdeconnect

---
 flake.nix                              | 1 -
 home/hyprland/waybar/modules/mpris.nix | 1 -
 home/kdeconnect.nix                    | 8 --------
 system/desktop.nix                     | 1 -
 4 files changed, 11 deletions(-)
 delete mode 100644 home/kdeconnect.nix

diff --git a/flake.nix b/flake.nix
index fa055848..8517aa5d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,7 +44,6 @@
           ./home/alacritty.nix
           ./home/default.nix
           ./home/firefox.nix
-          ./home/kdeconnect.nix
           ./home/media.nix
           ./home/pass.nix
           ./home/zathura.nix
diff --git a/home/hyprland/waybar/modules/mpris.nix b/home/hyprland/waybar/modules/mpris.nix
index f6f8c6ca..6c912cbe 100644
--- a/home/hyprland/waybar/modules/mpris.nix
+++ b/home/hyprland/waybar/modules/mpris.nix
@@ -5,7 +5,6 @@ in {
   "player-icons" = {
     "default" = "󰲸";
     "mpv" = "󰤽";
-    "kdeconnect" = "󱀟";
     "ncspot" = "󰓇";
     "Spot" = "󰓇";
   };
diff --git a/home/kdeconnect.nix b/home/kdeconnect.nix
deleted file mode 100644
index 247faef9..00000000
--- a/home/kdeconnect.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  services.kdeconnect = {
-    enable = true;
-    indicator = true;
-  };
-}
diff --git a/system/desktop.nix b/system/desktop.nix
index 8178647c..8d368c56 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -68,7 +68,6 @@
     dconf.enable = true;
     light.enable = true;
     noisetorch.enable = true;
-    kdeconnect.enable = true;
   };
   gtk.iconCache.enable = true;
   qt = {

From 0410d43580b4a0f741d2575bd7904deb8e7e61f1 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 1 Nov 2023 18:23:01 +0000
Subject: [PATCH 06/11] Fix typo...

---
 home/emacs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index 06f22062..2f97436a 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -12,7 +12,7 @@
     enable = true;
     repositories = with config.home; {
       org = {
-        url = "${homeDirectory}/Org";
+        path = "${homeDirectory}/Org";
         uri = "git+https://git.xenia.me.uk/xenia/Org.git";
       };
       elfeed = {

From 712487e57162cd45bef719a1c61626a4c1686307 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Thu, 2 Nov 2023 06:52:46 +0000
Subject: [PATCH 07/11] Add network events calendar

---
 home/accounts/calendar.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/accounts/calendar.nix b/home/accounts/calendar.nix
index 4069ae03..8a0686c1 100644
--- a/home/accounts/calendar.nix
+++ b/home/accounts/calendar.nix
@@ -60,7 +60,7 @@
         };
         vdirsyncer = {
           enable = lib.mkDefault emailConfig.mbsync.enable;
-          collections = [ "Work" "Operations" ];
+          collections = [ "Work" "Network Events" "Operations" ];
         };
         khal = {
           inherit (vdirsyncer) enable;

From 56ec494c4dc53abe93639bd3e3fb9d92fcfc405f Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Thu, 2 Nov 2023 07:05:04 +0000
Subject: [PATCH 08/11] Change org tag formatting

---
 home/emacs/modules/custom-org-config.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/home/emacs/modules/custom-org-config.el b/home/emacs/modules/custom-org-config.el
index 7d682217..e65cd7da 100644
--- a/home/emacs/modules/custom-org-config.el
+++ b/home/emacs/modules/custom-org-config.el
@@ -1,4 +1,6 @@
 (setq org-directory "~/Org"
+      org-tags-column 0
+      org-modern-tag nil
       org-journal-dir (expand-file-name "journal" org-directory)
       org-journal-file-type 'daily
       org-journal-file-format "%Y%m%d.org"

From 65aae61cb08d5f6de01d9117a72bb7acff2d63c7 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Thu, 2 Nov 2023 07:48:04 +0000
Subject: [PATCH 09/11] Switch firefox for chromium due to some website login
 problems

---
 system/chromium.nix | 29 +++++++++++++++++++++++++++++
 system/desktop.nix  |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 system/chromium.nix

diff --git a/system/chromium.nix b/system/chromium.nix
new file mode 100644
index 00000000..629628a8
--- /dev/null
+++ b/system/chromium.nix
@@ -0,0 +1,29 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [ chromium ];
+  programs.chromium = rec {
+    enable = true;
+    defaultSearchProviderEnabled = true;
+    defaultSearchProviderSearchURL = "https://duckduckgo.com/?q={searchTerms}";
+    defaultSearchProviderSuggestURL = defaultSearchProviderSearchURL;
+    extensions = [
+      "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
+      "gcbommkclmclpchllfjekcdonpmejbdp" # https everywhere
+      "fnaicdffflnofjppbagibeoednhnbjhg" # floccus bookmark sync
+    ];
+    extraOpts = {
+      "BrowserSignin" = 0;
+      "DeviceAutoUpdateDisabled" = true;
+      "SyncDisabled" = true;
+      "PasswordManagerEnabled" = false;
+      "SpellcheckEnabled" = true;
+      "SpellcheckLanguage" = [ "en-GB" ];
+      "AllowDinosaurEasterEgg" = true;
+      "AllowSystemNotifications" = true;
+      "AutoFillEnabled" = false;
+      "BrowserLabsEnabled" = false;
+      "BookmarkBarEnabled" = false;
+    };
+  };
+}
diff --git a/system/desktop.nix b/system/desktop.nix
index 8d368c56..c69988dd 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [ ./default.nix ./emacs.nix ./firefox.nix ];
+  imports = [ ./default.nix ./emacs.nix ./chromium.nix ];
   environment.systemPackages = with pkgs; [
     dex
     mesa

From 6ef49867d10d8b2c77dfe3ca8120e92db3daba06 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Thu, 2 Nov 2023 07:50:44 +0000
Subject: [PATCH 10/11] Set bookmark bar to true, typo...

---
 system/chromium.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/chromium.nix b/system/chromium.nix
index 629628a8..71501efa 100644
--- a/system/chromium.nix
+++ b/system/chromium.nix
@@ -23,7 +23,7 @@
       "AllowSystemNotifications" = true;
       "AutoFillEnabled" = false;
       "BrowserLabsEnabled" = false;
-      "BookmarkBarEnabled" = false;
+      "BookmarkBarEnabled" = true;
     };
   };
 }

From d9fd0b080661a748b320feeec522a798f3edfe09 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Thu, 2 Nov 2023 07:56:59 +0000
Subject: [PATCH 11/11] Add hyprland workspace rule for chromium-browser

---
 home/hyprland/config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index dca0e7aa..3a7f392e 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -210,6 +210,7 @@ in ''
   bind = SUPER, W, moveworkspacetomonitor, 4 current
   bind = SUPER, W, workspace, 4
   bind = SUPER SHIFT, W, movetoworkspace, 4
+  windowrule = workspace 4, (chromium-browser)
   windowrule = workspace 4, (firefox)
 
   # 5: [f]iles