--- a/pers-init.el	Sat Dec 16 21:08:13 2023 +0000
+++ b/pers-init.el	Sat Dec 16 21:10:30 2023 +0000
@@ -17,37 +17,8 @@
     (progn (message "setting DISPLAY in env")
 	   (setenv "DISPLAY" ":0")))
 
-;;; mail stuff
-(site-caseq (edin
-	     (setq mail-archive-file-name (concat "/disk/scratch/mail/cpy/general/"
-						  (format-time-string
-						   "%Y-%m" (current-time))
-						  ".mbox")))
-	    (t (setq mail-archive-file-name "~/mail/cpy/general")))
-
-
-(setq rmail-dont-reply-to-names "hthompso*\\|h\\.thompso*\\|ht@*" )
-
-(site-caseq (edin
-	     (setq rmail-show-mime nil)
-	     (set-default 'ht-last-file (expand-file-name "/disk/scratch/mail/"))
-	     (setq ht-diary-file-name "/disk/scratch/mail/diary.babyl")
-	     (setq user-mail-address "ht@inf.ed.ac.uk")
-	     (setq mail-append-host "inf.ed.ac.uk")
-	     (setq mail-host-address "inf.ed.ac.uk")))
-
 (setq user-full-name "Henry S. Thompson")
 
-;; new mail hackery
-(site-caseq ((edin ircs ldc)
-	     (setq rmail-spool-directory (file-name-as-directory
-					       (concat rmail-spool-directory
-						       "ht-mail")))))
-;; don't know why this is necessary
-(site-caseq ((edin)
-	     (setq rmail-primary-inbox-list
-		   (list (concat rmail-spool-directory "ht")))))
-
 (setq vc-command-messages t)
 
 (setq minibuffer-max-depth nil)
@@ -221,8 +192,36 @@
 				  (interactive "e")
 				  (mouse-set-point click)
 				  (dired-advertised-find-file)))))
-	  (set-face-background 'modeline '((x) . "lightgrey"))))
+	  (set-face-background 'modeline '((x) . "lightgrey"))
+	  	(defun ht-rooms-setup (&optional arg)
+	      (interactive)
+	      (require 'rooms)
+	      (require 'mail-extras)
+	      (require 'diary)
+	      (let ((scr (selected-frame)))
+					;	    (sit-for 5)
+		(load "ht-rooms.config" nil t)
+		;; for ecclerig viewed from paul
+		(if (eq (device-pixel-width (selected-device)) 1920)
+		    (progn
+		      (unwind-protect
+			  (make-screen-for-room "diary" "+1219" "+68"))
+		      (unwind-protect
+			  (make-screen-for-room "elisp" "+1185" "+102"))
+		      (unwind-protect
+			  (make-screen-for-room "news" "+1253" "+34")))
+		  ;; for ecclerig in office
+		  (unwind-protect (make-screen-for-room "diary" "+1888" "+0"))
+		  (unwind-protect (make-screen-for-room "elisp" "+1888" "+0"))
+		  (unwind-protect (make-screen-for-room "news" "+1223" "+0")))
+		(sit-for 1)
+		(delete-frame scr))
+	      (setq ht-default-config (current-window-configuration)))))
     ;; DICE comes here 2012-01-13
+    (setq interprogram-paste-function (lambda ()
+                                        (or (get-clipboard-foreign)
+                                            (if (selection-exists-p)
+						(get-selection-foreign)))))
     (load "device-type-hacking" t t)
     ;; override changed default, except in gnus
     (message "dth")
@@ -231,23 +230,7 @@
 		       'browse-url-firefox
 		       )
 		 (setq browse-url-browser-function 'browse-url-firefox)
-		 (defun ht-rooms-setup (&optional arg)
-		   (interactive)
-		   (require 'mail-extras)
-		   (require 'diary)
-		     (let ((scr (selected-frame)))
-					;	    (sit-for 5)
-		       (load "ht-rooms.config" nil t)
-		       (unwind-protect (make-screen-for-room "diary" "0" "+62"))
-					;           (sit-for 5)
-		       (unwind-protect (make-screen-for-room "elisp" "-25" "+79"))
-					;	    (sit-for 5)
-		       (unwind-protect (make-screen-for-room "news" "-50" "+96"))
-					;           (sit-for 5)
-		       (unwind-protect (make-screen-for-room "mail" "-75" "+113"))
-		       (sit-for 1)
-		       (delete-screen scr))
-		     (setq ht-default-config (current-window-configuration)))))
+		 ))
     (message "gnus-init")
     (site-caseq ((edin markup maritain)
 		 (require 'gnus-init)))
@@ -320,30 +303,8 @@
 				(interactive "e")
 				(mouse-set-point click)
 				(dired-advertised-find-file)))))
-
-	(defun ht-rooms-setup (&optional arg)
-	      (interactive)
-	      (require 'mail-extras)
-	      (require 'diary)
-	      (let ((scr (selected-frame)))
-					;	    (sit-for 5)
-		(load "ht-rooms.config" nil t)
-		;; for ecclerig viewed from paul
-		(if (eq (device-pixel-width (selected-device)) 1920)
-		    (progn
-		      (unwind-protect
-			  (make-screen-for-room "diary" "+1219" "+68"))
-		      (unwind-protect
-			  (make-screen-for-room "elisp" "+1185" "+102"))
-		      (unwind-protect
-			  (make-screen-for-room "news" "+1253" "+34")))
-		  ;; for ecclerig in office
-		  (unwind-protect (make-screen-for-room "diary" "+1888" "+0"))
-		  (unwind-protect (make-screen-for-room "elisp" "+1888" "+0"))
-		  (unwind-protect (make-screen-for-room "news" "+1223" "+0")))
-		(sit-for 1)
-		(delete-frame scr))
-	      (setq ht-default-config (current-window-configuration))))))
+	(message "defined rooms 2")
+	)))
 (setq sgml-insert-missing-element-comment nil)
 (load "psgml" nil t)
 (load "psgml-edit" nil t)