From 09138e72d9903f7f2ff865cfea8b64eb4812328d Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Mon, 18 Apr 2022 00:41:06 +0200
Subject: [PATCH] Testing umoria

---
 flake.lock                       | 16 ++++++++++++++++
 flake.nix                        |  3 +++
 users/ccr/default.nix            |  3 ++-
 users/profiles/mails/default.nix |  1 +
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/flake.lock b/flake.lock
index 45dc7a3..70f1b2e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -303,6 +303,21 @@
         "type": "github"
       }
     },
+    "nixpkgs-dev": {
+      "locked": {
+        "lastModified": 1650234480,
+        "narHash": "sha256-EdnUK7+8pUoo/CraZvLb1pW9VvL7mfjpJ9swae5btjE=",
+        "owner": "aciceri",
+        "repo": "nixpkgs",
+        "rev": "c2bc2e8c2488f4b0b88217d8655e072ab4fc403b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "aciceri",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-wayland": {
       "inputs": {
         "cachix": [
@@ -400,6 +415,7 @@
         "emacs-overlay": "emacs-overlay",
         "home": "home",
         "nixos-hardware": "nixos-hardware",
+        "nixpkgs-dev": "nixpkgs-dev",
         "nixpkgs-wayland": "nixpkgs-wayland",
         "nur": "nur",
         "stable": "stable",
diff --git a/flake.nix b/flake.nix
index e426de9..afe998a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,6 +5,7 @@
     {
       stable.url = github:nixos/nixpkgs/release-21.11;
       unstable.url = github:nixos/nixpkgs/nixos-unstable;
+      nixpkgs-dev.url = github:aciceri/nixpkgs;
 
       nur.url = github:nix-community/NUR;
 
@@ -34,6 +35,7 @@
     { self
     , digga
     , unstable
+    , nixpkgs-dev
     , home
     , nixos-hardware
     , darwin
@@ -126,6 +128,7 @@
             suites = with profiles; rec {
               base = [ core users.ccr users.root ];
             };
+            nixpkgs-dev = inputs.nixpkgs-dev.legacyPackages.aarch64-linux;
           };
         };
 
diff --git a/users/ccr/default.nix b/users/ccr/default.nix
index 01fcb94..4406c34 100644
--- a/users/ccr/default.nix
+++ b/users/ccr/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, suites, lib, config, ... }:
+{ pkgs, suites, lib, config, nixpkgs-dev, ... }:
 {
   home-manager.users.ccr = { suites, ... }: {
     imports = with suites; shell ++ base ++ (if config.networking.hostName != "hs" then
@@ -9,6 +9,7 @@
     home.packages = with pkgs; [
       ack
       ranger
+      nixpkgs-dev.umoria
     ] ++ (if config.networking.hostName != "hs" then [
       imv
       calibre
diff --git a/users/profiles/mails/default.nix b/users/profiles/mails/default.nix
index b5aec1b..62bc13d 100644
--- a/users/profiles/mails/default.nix
+++ b/users/profiles/mails/default.nix
@@ -34,6 +34,7 @@ in
       mbsync = {
         enable = true;
         create = "maildir";
+        expunge = "both";
       };
       msmtp.enable = true;
       notmuch.enable = true;