From 921677a401505f06fc3b806566c68be61108f58c Mon Sep 17 00:00:00 2001
From: Grigory Shipunov <blame@oxapentane.com>
Date: Thu, 14 Jul 2022 22:47:45 +0200
Subject: [PATCH] nix flake update

---
 flake.lock            | 36 ++++++++++++++++++------------------
 modules/graphical.nix | 16 +++++++---------
 modules/mail.nix      |  5 +++++
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/flake.lock b/flake.lock
index 415fcb7..0fdf05d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1657607339,
-        "narHash": "sha256-HaqoAwlbVVZH2n4P3jN2FFPMpVuhxDy1poNOR7kzODc=",
+        "lastModified": 1657780062,
+        "narHash": "sha256-gxhX2gtaUrclcYO7+Dj5R2gONmWX0aORlM6k0dRWWFs=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "b814c83d9e6aa5a28d0cf356ecfdafb2505ad37d",
+        "rev": "ddd63d2b8546a84bdcb27a9779e4f4ae0eec86e6",
         "type": "github"
       },
       "original": {
@@ -44,11 +44,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1657621596,
-        "narHash": "sha256-lRd1RHpuSaCvkXSLBV/eTW0cKt4pj51yW0d62Yg9dAs=",
+        "lastModified": 1657719085,
+        "narHash": "sha256-nQt3MEBwKuKlmFKSRhdoh60AGlc+YlspV5e8kO/3y8U=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1e66e035e18ca02d72ebbbc83e4e75fa0acdf1af",
+        "rev": "2c94b9801f1a11cde0fc97aa850687bb9137d42c",
         "type": "github"
       },
       "original": {
@@ -80,11 +80,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1657476024,
-        "narHash": "sha256-4xnAf6VxE/efOwHt/MsG/g1gmpT78n/8oHqF1atzNjI=",
+        "lastModified": 1657693803,
+        "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cf034a867e08b7e083df1658c915c58456dbbde2",
+        "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2",
         "type": "github"
       },
       "original": {
@@ -112,11 +112,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1657447684,
-        "narHash": "sha256-FCP9AuU1q6PE3vOeM5SFf58f/UKPBAsoSGDUGamNBbo=",
+        "lastModified": 1657624652,
+        "narHash": "sha256-rFJNM0X/dxekT6EESSh80mlBGqztfN/XOF/oRL6in68=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5f43d8b088d3771274bcfb69d3c7435b1121ac88",
+        "rev": "68c63e60b8413260605efbe1ac5addaa099cdfb3",
         "type": "github"
       },
       "original": {
@@ -139,11 +139,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1657557289,
-        "narHash": "sha256-PRW+nUwuqNTRAEa83SfX+7g+g8nQ+2MMbasQ9nt6+UM=",
+        "lastModified": 1657713616,
+        "narHash": "sha256-GpYrMuRo0DIJ3qIqIQlIy/WZnrqZFqgRwUJK1roBoVU=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "caf23f29144b371035b864a1017dbc32573ad56d",
+        "rev": "794ecd58a32dfd9fdab0596b181133d4d2ae4b6f",
         "type": "github"
       },
       "original": {
@@ -161,11 +161,11 @@
         "nixpkgs-22_05": "nixpkgs-22_05"
       },
       "locked": {
-        "lastModified": 1657474083,
-        "narHash": "sha256-AVs6Tnu5E81VrT4jPzkkUdBnV2YEoHao7/JI2XBC04U=",
+        "lastModified": 1657695756,
+        "narHash": "sha256-5eeq7Itk9gMK6E5u3IrooFd3KswlheIO/L2Cs7Wwj9k=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "2c898a6d760c0c47fecd76317175206951ab884d",
+        "rev": "912514e60a6e0227d6a2e0ecc8524752337fcde2",
         "type": "github"
       },
       "original": {
diff --git a/modules/graphical.nix b/modules/graphical.nix
index 3eb009c..0d8e4d3 100644
--- a/modules/graphical.nix
+++ b/modules/graphical.nix
@@ -26,7 +26,7 @@
   #on the desktop, we need nice fonts ^^
   fonts.fonts = with pkgs; [
     monoid
-    (nerdfonts.override { fonts = [ "Monoid" "Hack" ]; })
+    (nerdfonts.override { fonts = [ "Monoid" "Hack" "FiraMono" ]; })
     font-awesome
     dejavu_fonts
     julia-mono
@@ -38,8 +38,6 @@
     corefonts
     dina-font
     fira
-    fira-code
-    fira-code-symbols
     fira-mono
     hack-font
     liberation_ttf
@@ -119,6 +117,7 @@
   xdg.portal = {
     enable = true;
     wlr.enable = true;
+    extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
   };
 
   services.udisks2.enable = true;
@@ -129,15 +128,14 @@
     lock = "udisksctl lock -b";
   };
 
-  qt5.platformTheme = "gtk";
+  qt5 = {
+    enable = true;
+    platformTheme = "gnome";
+    style ="adwaita-dark";
+  };
 
   services.gnome.gnome-keyring.enable = true;
 
-  programs.evolution = {
-    enable = true;
-    plugins = [ pkgs.evolution-ews ];
-  };
-
   # required to autounlock gnome-keyring
   services.xserver = {
     enable = true;
diff --git a/modules/mail.nix b/modules/mail.nix
index 01538f8..f3aa5bf 100644
--- a/modules/mail.nix
+++ b/modules/mail.nix
@@ -1,6 +1,11 @@
 { pkgs, ... }: {
   environment.systemPackages = with pkgs; [
+    isync
+    msmtp
     neomutt
+    notmuch
+    pass
+    w3m
   ];
 
   programs.msmtp.enable = true;