From 3c5d1ea1587d64a64719e79173c40a7d4e2020cc Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Sun, 17 Oct 2021 22:25:48 +0200
Subject: Update

---
 flake.lock       | 24 ++++++++++++------------
 gui/conf/init.el |  3 +++
 gui/emacs.nix    |  2 --
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1cd0257..eb232ee 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "emacs": {
       "locked": {
-        "lastModified": 1633574989,
-        "narHash": "sha256-rn70qpinjttWGkiWi4X11DVzJr8elKicaaM81uiNK1Y=",
+        "lastModified": 1634491178,
+        "narHash": "sha256-Pzhr3uKOkRFP0dWUQsvL+epPxZ45PrlAfbfRro80FOs=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "b27a5d8e8958cec786b3dc8a064b3cf143beb541",
+        "rev": "43f36e1f2dfad96879e06bdaa95b2d19cab1f78d",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1633291410,
-        "narHash": "sha256-IxUzCGwj+s2Rn/+u0NtY36ix5I8MopMOO8Ip59PnBlw=",
+        "lastModified": 1633596850,
+        "narHash": "sha256-5+qVLYvfOropjLAvpQs/APtD8eYnEIbAd9a36lGHZM0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "382505714d10c6791a96712e0554587c75c5bf8b",
+        "rev": "49695f33aac22358b59e49c94fe6472218e5d766",
         "type": "github"
       },
       "original": {
@@ -120,11 +120,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1633422542,
-        "narHash": "sha256-JYz2PmVogNRO8DhcvXzL/QhZzboTspJz2YSRlnAj8aM=",
+        "lastModified": 1634327140,
+        "narHash": "sha256-d5L7oMjUVC6VU0cQMsF0tceAPkmzuAQ51DWBFNChbEQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "aff647e2704fa1223994604887bb78276dc57083",
+        "rev": "83667ff60a88e22b76ef4b0bdf5334670b39c2b6",
         "type": "github"
       },
       "original": {
@@ -136,11 +136,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1633329294,
-        "narHash": "sha256-0LpQLS4KMgxslMgmDHmxG/5twFlXDBW9z4Or1iOrCvU=",
+        "lastModified": 1633422745,
+        "narHash": "sha256-gA6Ok64nPbkjHk3Oanq4641EeYkjcKhisDF9wBjLxEk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ee084c02040e864eeeb4cf4f8538d92f7c675671",
+        "rev": "8e1eab9eae4278c9bb1dcae426848a581943db5a",
         "type": "github"
       },
       "original": {
diff --git a/gui/conf/init.el b/gui/conf/init.el
index 115596e..726e48e 100644
--- a/gui/conf/init.el
+++ b/gui/conf/init.el
@@ -538,6 +538,9 @@
 (use-package cmake-mode
   :ensure t)
 
+(use-package csv-mode
+  :ensure t)
+
 (use-package rainbow-mode
   :ensure t)
 
diff --git a/gui/emacs.nix b/gui/emacs.nix
index f010ec7..5f9a3a7 100644
--- a/gui/emacs.nix
+++ b/gui/emacs.nix
@@ -49,8 +49,6 @@
     package = pkgs-unstable.emacsWithPackagesFromUsePackage {
       config = ./conf/init.el;
       alwaysEnsure = false;
-      # remove builtin org as in https://github.com/chrisbarrett/.emacs.d/blob/6efd82c8e328e677dbef84331ed54763b89667a3/default.nix
-      # this is a workaround until I find a better way to force usage of a non-builtin up-to-date org version
       package = pkgs-unstable.emacsGit.override { nativeComp = true; };
       extraEmacsPackages = epkgs: (with epkgs.melpaPackages; [
         pdf-tools
-- 
cgit v1.2.3