From 80798e3345bd4f872c8d852e74bc3dc591bcd3b2 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Thu, 31 Aug 2023 14:53:08 +0200
Subject: Switch to a more stable emacs setup, rollback mu4e update

---
 flake.lock        | 53 +++++++++++++++++++++++++++++++++++------------------
 flake.nix         | 12 +++++++++---
 gui/conf/email.el |  1 -
 gui/emacs.nix     | 12 +++++-------
 4 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/flake.lock b/flake.lock
index c7c4c45..a8ed802 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1693105704,
-        "narHash": "sha256-j1SSgP2K1iv9G7dc3yX2ulsB4mV3K231L8xNmuDS8WM=",
+        "lastModified": 1693479240,
+        "narHash": "sha256-jEQfzL3ZPiRr2B+J//VYlsvkQYWGznyvuaVPQcJvkL0=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "123ac69d1d430562dd1a266a2f50296eaac7d65d",
+        "rev": "47c9976307a563c6c80250669e47c4b10a4801aa",
         "type": "github"
       },
       "original": {
@@ -61,11 +61,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1692099905,
-        "narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=",
+        "lastModified": 1693208669,
+        "narHash": "sha256-hHFaaUsZ860wvppPeiu7nJn/nXZjJfnqAQEu9SPFE9I=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f",
+        "rev": "5bac4a1c06cd77cf8fc35a658ccb035a6c50cd2c",
         "type": "github"
       },
       "original": {
@@ -97,11 +97,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1693003285,
-        "narHash": "sha256-5nm4yrEHKupjn62MibENtfqlP6pWcRTuSKrMiH9bLkc=",
+        "lastModified": 1693377291,
+        "narHash": "sha256-vYGY9bnqEeIncNarDZYhm6KdLKgXMS+HA2mTRaWEc80=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5690c4271f2998c304a45c91a0aeb8fb69feaea7",
+        "rev": "e7f38be3775bab9659575f192ece011c033655f0",
         "type": "github"
       },
       "original": {
@@ -113,11 +113,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1692986144,
-        "narHash": "sha256-M4VFpy7Av9j+33HF5nIGm0k2+DXXW4qSSKdidIKg5jY=",
+        "lastModified": 1693341273,
+        "narHash": "sha256-wrsPjsIx2767909MPGhSIOmkpGELM9eufqLQOPxmZQg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "74e5bdc5478ebbe7ba5849f0d765f92757bb9dbf",
+        "rev": "2ab91c8d65c00fd22a441c69bbf1bc9b420d5ea1",
         "type": "github"
       },
       "original": {
@@ -158,6 +158,22 @@
         "type": "github"
       }
     },
+    "oldstable": {
+      "locked": {
+        "lastModified": 1688392541,
+        "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-22.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "personal": {
       "inputs": {
         "nixpkgs": "nixpkgs_3"
@@ -181,6 +197,7 @@
         "emacs": "emacs",
         "home-manager": "home-manager",
         "jupyter": "jupyter",
+        "oldstable": "oldstable",
         "personal": "personal",
         "stable": "stable",
         "unstable": "unstable"
@@ -188,11 +205,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1693087214,
-        "narHash": "sha256-Kn1SSqRfPpqcI1MDy82JXrPT1WI8c03TA2F0xu6kS+4=",
+        "lastModified": 1693341273,
+        "narHash": "sha256-wrsPjsIx2767909MPGhSIOmkpGELM9eufqLQOPxmZQg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f155f0cf4ea43c4e3c8918d2d327d44777b6cad4",
+        "rev": "2ab91c8d65c00fd22a441c69bbf1bc9b420d5ea1",
         "type": "github"
       },
       "original": {
@@ -219,11 +236,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1693060755,
-        "narHash": "sha256-KNsbfqewEziFJEpPR0qvVz4rx0x6QXxw1CcunRhlFdk=",
+        "lastModified": 1693355128,
+        "narHash": "sha256-+ZoAny3ZxLcfMaUoLVgL9Ywb/57wP+EtsdNGuXUJrwg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c66ccfa00c643751da2fd9290e096ceaa30493fc",
+        "rev": "a63a64b593dcf2fe05f7c5d666eb395950f36bc9",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index cf5095c..84f0a43 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,7 @@
   inputs = {
     stable.url = github:NixOS/nixpkgs/nixos-23.05;
     unstable.url = github:NixOS/nixpkgs/nixpkgs-unstable;
+    oldstable.url = github:NixOS/nixpkgs/nixos-22.11;
     personal.url = github:KnairdA/pkgs;
     home-manager = {
       url = github:nix-community/home-manager/release-23.05;
@@ -14,7 +15,7 @@
   };
 
   outputs = {
-    self, stable, unstable, personal, emacs, home-manager, jupyter, ...
+    self, stable, unstable, oldstable, personal, emacs, home-manager, jupyter, ...
   }: let
     system = "x86_64-linux";
 
@@ -25,13 +26,17 @@
     pkgs = import stable {
       inherit system;
       config = { allowUnfree = true; };
-      overlays = [ jupyter-overlay ];
+      overlays = [ jupyter-overlay emacs.overlay ];
     };
 
     pkgs-unstable = import unstable {
       inherit system;
       config = { allowUnfree = true; };
-      overlays = [ emacs.overlay ];
+    };
+
+    pkgs-oldstable = import oldstable {
+      inherit system;
+      config = { allowUnfree = true; };
     };
 
     pkgs-personal = personal;
@@ -41,6 +46,7 @@
 
       extraSpecialArgs = {
         inherit pkgs-unstable;
+        inherit pkgs-oldstable;
         inherit pkgs-personal;
         inherit hostname;
       };
diff --git a/gui/conf/email.el b/gui/conf/email.el
index 7010c9c..f0fd448 100644
--- a/gui/conf/email.el
+++ b/gui/conf/email.el
@@ -31,7 +31,6 @@
   (add-hook 'mu4e-compose-mode-hook #'(lambda () (auto-save-mode -1))))
 
 (use-package mu4e-alert
-  :ensure t
   :config
   (mu4e-alert-set-default-style 'libnotify)
   (add-hook 'after-init-hook #'mu4e-alert-enable-notifications))
diff --git a/gui/emacs.nix b/gui/emacs.nix
index d36d7bd..71690fc 100644
--- a/gui/emacs.nix
+++ b/gui/emacs.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, pkgs-unstable, ... }:
+{ config, pkgs, pkgs-oldstable, pkgs-unstable, ... }:
 
 {
   programs.emacs = let
@@ -46,12 +46,10 @@
   in {
     enable = true;
 
-    package = pkgs-unstable.emacsWithPackagesFromUsePackage {
+    package = pkgs.emacsWithPackagesFromUsePackage {
       config = ./conf/init.el;
       alwaysEnsure = false;
 
-      package = pkgs-unstable.emacs-git.override { withNativeCompilation = true; };
-
       extraEmacsPackages = epkgs: (with epkgs.melpaPackages; [
         pdf-tools
         mu4e-alert
@@ -62,7 +60,7 @@
       ])++ [
         akr-color-theme
         custom-runtime-env
-        pkgs.mu
+        pkgs-oldstable.mu
       ];
     };
   };
@@ -86,10 +84,10 @@
     };
 
   in with pkgs; [
-    pkgs-unstable.symbola
+    symbola
     (iosevka-bin.override { variant = "aile"; })
     (iosevka-bin.override { variant = "etoile"; })
-    mu
+    pkgs-oldstable.mu
     org-protocol-shortcut
   ];
 
-- 
cgit v1.2.3