From c910fc9d89274e19310ae54510d7085ff9b3bb3c Mon Sep 17 00:00:00 2001
From: larstvei <larstvei@ifi.uio.no>
Date: Sun, 22 Jan 2023 16:33:50 +0100
Subject: [PATCH] Updates

Now I have two LaTeX-installations. This is because xindy was missing from the
Nix one... I don't like it, but it works for now.
---
 flake.lock       | 42 ++++++++++++++++++++++--------------------
 modules/home.nix |  4 ++++
 modules/mac.nix  |  1 +
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/flake.lock b/flake.lock
index cc881ca..0d8a427 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1671196037,
-        "narHash": "sha256-2+J98SeczFWonbqFLMEAQC7vZEe6I2gM17XYvEmG52I=",
+        "lastModified": 1673295039,
+        "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "adb8ac0453c8b2c40f5bffb578453dbaee838952",
+        "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
         "type": "github"
       },
       "original": {
@@ -26,11 +26,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1671646610,
-        "narHash": "sha256-3PkqA8X0ISwkKBqoZcRsLc3K6Q+gRTNoc7T8PSld/50=",
+        "lastModified": 1674378536,
+        "narHash": "sha256-ZX97WirFX7GYY2t1NO9+/8E+PjBieOwjPQu1gvlZ7BI=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "b7a13b83ce72c7038d1871ccb63d055b23fc6021",
+        "rev": "50771a213ea23c0ad1de68d8eaa2e3734ff05223",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1671578428,
-        "narHash": "sha256-YmbpBcPaGz9KE2bC4xPvSdgCSMk0BmS/L3ePvy9TR/M=",
+        "lastModified": 1674250603,
+        "narHash": "sha256-SBolFspxBHpW3hCCDNAFXUiO2mucmkVmf17UmSIK3Cs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0f8bf4f92efa3c6168705b49a6788abb3612033a",
+        "rev": "275ab728912006eecb549338a50f24f294a7cfb7",
         "type": "github"
       },
       "original": {
@@ -77,25 +77,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1671458120,
-        "narHash": "sha256-2+k/OONN4OF21TeoNjKB5sXVZv6Zvm/uEyQIW9OYCg8=",
+        "lastModified": 1673540789,
+        "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e37ef84b478fa8da0ced96522adfd956fde9047a",
+        "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1671458120,
-        "narHash": "sha256-2+k/OONN4OF21TeoNjKB5sXVZv6Zvm/uEyQIW9OYCg8=",
+        "lastModified": 1674236650,
+        "narHash": "sha256-B4GKL1YdJnII6DQNNJ4wDW1ySJVx2suB1h/v4Ql8J0Q=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e37ef84b478fa8da0ced96522adfd956fde9047a",
+        "rev": "cfb43ad7b941d9c3606fb35d91228da7ebddbfc5",
         "type": "github"
       },
       "original": {
@@ -107,11 +109,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1671447788,
-        "narHash": "sha256-Nitle27Q2gXkuk66VZUT+iyisT4pGQwQwU9eyExOVEk=",
+        "lastModified": 1672580127,
+        "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bfb04388d42ff49e5e81da9f0bfcb48a6367273d",
+        "rev": "0874168639713f547c05947c76124f78441ea46c",
         "type": "github"
       },
       "original": {
diff --git a/modules/home.nix b/modules/home.nix
index dc3b3eb..b5974d8 100644
--- a/modules/home.nix
+++ b/modules/home.nix
@@ -25,6 +25,7 @@
         pygments
         python-lsp-server
         scipy
+        scikit-learn
         z3
       ]))
     bat
@@ -38,6 +39,7 @@
       (ps: with ps; [
         QuickCheck
       ]))
+    stack
     go
     graphviz
     htop
@@ -50,6 +52,7 @@
     pandoc
     parallel
     poppler_utils
+    pdf2svg
     ripgrep
     rnix-lsp
     rust-analyzer
@@ -105,6 +108,7 @@
       };
 
       shellInit = ''
+        set PATH "$PATH:/usr/local/texlive/2022/bin/universal-darwin/"
         if test "$TERM" != "dumb"
             track_directories
         end
diff --git a/modules/mac.nix b/modules/mac.nix
index 05c0a2e..f1b9345 100644
--- a/modules/mac.nix
+++ b/modules/mac.nix
@@ -72,6 +72,7 @@
       "expressvpn"
       "google-chrome"
       "iina"
+      "mactex"
       "raycast"
       "remarkable"
     ];