From 4da7b08cd4241a1e809ba35fafa68e5dcd8c84b0 Mon Sep 17 00:00:00 2001
From: Felix Albrigtsen <felix@albrigtsen.it>
Date: Thu, 2 Nov 2023 11:14:28 +0100
Subject: [PATCH] worf: Add texlive, remove gs, ++

---
 flake.lock          | 36 ++++++++++++++++++------------------
 home/zsh.nix        |  2 ++
 hosts/worf/home.nix | 26 +++++++++++++++++++++-----
 3 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/flake.lock b/flake.lock
index bddd998..1bb012f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -26,11 +26,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1695523160,
-        "narHash": "sha256-ExYu6mpSZ3F0PDKnW1rmOKRxYzXOWH61CYWGOx6MJko=",
+        "lastModified": 1697936579,
+        "narHash": "sha256-nMyepKnwoHMzu2OpXvG2ZhU081TV9ENmWCo0vWxs6AI=",
         "owner": "dali99",
         "repo": "nixos-matrix-modules",
-        "rev": "161d1ed3607b73eb4f873c54ec6e00d07aa7cea2",
+        "rev": "e09814657187c8ed1a5fe1646df6d8da1eb2dee9",
         "type": "github"
       },
       "original": {
@@ -46,11 +46,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696360011,
-        "narHash": "sha256-HpPv27qMuPou4acXcZ8Klm7Zt0Elv9dgDvSJaomWb9Y=",
+        "lastModified": 1698429334,
+        "narHash": "sha256-Gq3+QabboczSu7RMpcy79RSLMSqnySO3wsnHQk4DfbE=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "8b6ea26d5d2e8359d06278364f41fbc4b903b28a",
+        "rev": "afe83cbc2e673b1f08d32dd0f70df599678ff1e7",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1696983906,
-        "narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=",
+        "lastModified": 1698696950,
+        "narHash": "sha256-FHFL58t6lMumvWqwundC8fDDDLOIvc+JJBNIAlPjrDY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bd1cde45c77891214131cbbea5b1203e485a9d51",
+        "rev": "017ef2132a5bda50bd713aeabce8f918502d4ec1",
         "type": "github"
       },
       "original": {
@@ -93,11 +93,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1696717752,
-        "narHash": "sha256-qEq1styCyQHSrw7AOhskH2qwCFx93bOwsGEzUIrZC0g=",
+        "lastModified": 1698544399,
+        "narHash": "sha256-vhRmPyEyoPkrXF2iykBsWHA05MIaOSmMRLMF7Hul6+s=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2f3b6b3fcd9fa0a4e6b544180c058a70890a7cc1",
+        "rev": "d87c5d8c41c9b3b39592563242f3a448b5cc4bc9",
         "type": "github"
       },
       "original": {
@@ -126,11 +126,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1697064251,
-        "narHash": "sha256-xxp2sB+4vqB6S6zC/L5J8LlRKgVbgIZOcYl9/TDrEzI=",
+        "lastModified": 1698548647,
+        "narHash": "sha256-7c03OjBGqnwDW0FBaBc+NjfEBxMkza+dxZGJPyIzfFE=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "f995ea159252a53b25fa99824f2891e3b479d511",
+        "rev": "632c3161a6cc24142c8e3f5529f5d81042571165",
         "type": "github"
       },
       "original": {
@@ -141,11 +141,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1697059129,
-        "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=",
+        "lastModified": 1698611440,
+        "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593",
+        "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
         "type": "github"
       },
       "original": {
diff --git a/home/zsh.nix b/home/zsh.nix
index cb2a504..2929dc8 100644
--- a/home/zsh.nix
+++ b/home/zsh.nix
@@ -37,6 +37,7 @@
         # Autocomplete ../
         zstyle ':completion:*' special-dirs true
         export PATH="$HOME/.config/emacs/bin:$PATH"
+        unalias "gs"
       '';
 
       shellAliases = {
@@ -52,6 +53,7 @@
         gcm = "git commit -m";
         gps = "git push";
         gpl = "git pull";
+        "git clone git clone" = "git clone";
       };
     };
 
diff --git a/hosts/worf/home.nix b/hosts/worf/home.nix
index 038dac0..8da8b84 100644
--- a/hosts/worf/home.nix
+++ b/hosts/worf/home.nix
@@ -10,21 +10,37 @@
 
   home.packages = with pkgs; [
     alacritty
+    emacs
+    iterm2
+    spotify
+    unstable.ripes
+
     bat
     bottom
     cocoapods
-    emacs
-    unstable.eza
     gnutar
-    iterm2
     ncdu
     neofetch
     nix-index
     nodejs
-    unstable.ripes
-    spotify
     tldr
+    unstable.eza
     zellij
+
+    pandoc
+    texlive.combined.scheme-full
+
+    (python311.withPackages (ps: with ps; [
+      pygments
+
+      jupyter
+      numpy
+      scipy
+
+      pwntools
+      pycryptodome
+      requests
+    ]))
   ];
 
   programs.zsh = {