Merge branch 'main' of https://git.xenia.me.uk/xenia/nixos

README.org

@@ -3,13 +3,14 @@
 ** TODO Re-write Hyprland config
 Convert from linked text file to proper nix expression (using home-manager)
 * Password store setup
-** Export gpg key
+** Transfer GPG key(s)
 #+begin_src bash
+# Export key on existing machine
 gpg --export-secret-keys > key.gpg
-#+end_src
-** Import gpg key
-#+begin_src bash
+# Import key on new machine
 gpg --import key.gpg
+# Edit (for each key) to set trust
+gpg --edit-key ...
 #+end_src
 ** Clone password-store repository
 #+begin_src bash

home/accounts/calendar.nix

@@ -50,7 +50,7 @@
         };
         vdirsyncer = {
           enable = lib.mkDefault emailConfig.mbsync.enable;
-          collections = [ "from a" ];
+          collections = [ "calendar" ];
           metadata = [ "color" "displayname" ];
           itemTypes = [ "VEVENT" ];
         };

home/accounts/contact.nix

@@ -34,7 +34,7 @@
         };
         vdirsyncer = {
           inherit (calendarAccounts.ukaea.vdirsyncer) enable;
-          collections = [ "from a" ];
+          collections = [ "contacts" ];
         };
       };
     };

home/accounts/email.nix

@@ -90,7 +90,7 @@
           boxes = [ "INBOX" ];
           onNotify = "${pkgs.isync}/bin/mbsync --pull-new icloud:INBOX";
           onNotifyPost =
-            "${pkgs.libnotify}/bin/notify-send 'Proton: New mail arrived'";
+            "${pkgs.libnotify}/bin/notify-send 'iCloud: New mail arrived'";
           extraConfig.wait = 300;
         };
         mbsync = {
@@ -107,7 +107,7 @@
       ukaea = let
         host = "127.0.0.1";
         tls.enable = false;
-        accountEnabled = false;
+        accountEnabled = true;
       in rec {
         inherit realName;
         primary = lib.mkDefault false;
@@ -130,7 +130,7 @@
           boxes = [ "INBOX" ];
           onNotify = "${pkgs.isync}/bin/mbsync --pull-new ukaea:INBOX";
           onNotifyPost =
-            "${pkgs.libnotify}/bin/notify-send 'Proton: New mail arrived'";
+            "${pkgs.libnotify}/bin/notify-send 'UKAEA: New mail arrived'";
           extraConfig = {
             wait = 300;
             tls = false;

home/emacs/doom/init.el

@@ -47,7 +47,7 @@
        treemacs  ; a project drawer, like neotree but cooler
        ;; unicode  ; extended unicode support for various languages
        vc-gutter  ; vcs diff in the fringe
-       vi-tilde-fringe  ; fringe tildes to mark beyond EOB
+       ;; vi-tilde-fringe  ; fringe tildes to mark beyond EOB
        window-select  ; visually switch windows
        workspaces  ; tab emulation, persistence & separate workspaces
        zen  ; distraction-free coding or writing

home/firefox/bookmarks.nix

@@ -80,6 +80,14 @@
           name = "JET";
           url = "http://w3.jet.uk";
         }
+        {
+          name = "Marval";
+          url = "https://marval.service.ukaea.uk/MSMSelfService/Index.aspx";
+        }
+        {
+          name = "U4BW";
+          url = "https://ubw.unit4cloud.com/uk_aea_prod_web/Login/Login.aspx";
+        }
         {
           name = "Physics Summary";
           url =

home/hyprland/config.nix

@@ -168,6 +168,8 @@ in ''
   windowrule = center,(Pinentry)
   windowrule = float,(thunar)
   windowrule = center,(thunar)
+  windowrule = float,(davmail-imap-ImapConnection)
+  windowrule = center,(davmail-imap-ImapConnection)
   windowrule = float,(wlogout)
   windowrule = center,(wlogout)
   windowrule = nofullscreenrequest,(wlogout)

hosts/Ronin/home.nix

@@ -11,13 +11,7 @@
   accounts = {
     email.accounts = {
       proton.primary = false;
-      ukaea = {
-        primary = true;
-        imapnotify.enable = true;
-        mbsync.enable = true;
-        msmtp.enable = true;
-        mu.enable = true;
-      };
+      ukaea.primary = true;
     };
     calendar.accounts.nextcloud.vdirsyncer.enable = false; # TEMP until fixed
   };

hosts/Scorch/home.nix

@@ -11,13 +11,7 @@
   accounts = {
     email.accounts = {
       proton.primary = false;
-      ukaea = {
-        primary = true;
-        imapnotify.enable = true;
-        mbsync.enable = true;
-        msmtp.enable = true;
-        mu.enable = true;
-      };
+      ukaea.primary = true;
     };
     calendar.accounts.nextcloud.vdirsyncer.enable = false; # TEMP until fixed
   };

services/syncthing/default.nix

@@ -1,6 +1,6 @@
 { lib, user, group, ... }:
 let
-  devices = [ "Legion" "Northstar" "Ronin" "Vanguard" ];
+  devices = [ "Legion" "Northstar" "Ronin" "Scorch" "Vanguard" ];
   devicesWithPhone = devices ++ [ "Ion" ];
 in {
   services.syncthing = {
@@ -19,6 +19,8 @@ in {
           "HNK5Z72-757G3BP-I4PBWXY-FM5FWCM-ES4XP56-E5ULWB5-RGRCBUI-RHWRXQV";
         "Ronin".id =
           "ZOL5YHK-ZZZULIE-UHGVKHW-H5E4BP7-S4CZBOX-OIZVUCV-RZUXOKA-QVBUBAJ";
+        "Scorch".id =
+          "VVKKUT6-DMNEJ6J-ZI2QREG-SOLG7S5-V2V6WN3-UCQH2EN-6S2XXLS-FKN6KQF";
         "Vanguard".id =
           "I366QNQ-D3FTDRX-RNOTXMW-YITZXOF-DSCDMQD-63Q72LI-ME2Y4HZ-T34RMQK";
       };