From fc994d212f968b3f850bc6068b2998c7cf3093c4 Mon Sep 17 00:00:00 2001
From: Madeleine <maddie@spyhoodle.me>
Date: Wed, 12 Jul 2023 20:43:28 +0100
Subject: [PATCH] fixes and new applications

---
 flake.lock                    | 18 +++++++++---------
 maddie/common/git.nix         |  2 +-
 maddie/common/helix.nix       |  4 ++--
 maddie/common/latex.nix       |  7 +++++++
 maddie/common/zsh.nix         |  2 +-
 maddie/nixos/xorg.nix         |  2 +-
 systems/mdesktop/packages.nix |  3 +++
 systems/mmacbookpro/apps.nix  |  3 ++-
 8 files changed, 26 insertions(+), 15 deletions(-)
 create mode 100644 maddie/common/latex.nix

diff --git a/flake.lock b/flake.lock
index a1e82e9..f40e11b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1684343812,
-        "narHash": "sha256-ZTEjiC8PDKeP8JRchuwcFXUNlMcyQ4U+DpyVZ3pB6Q4=",
+        "lastModified": 1689178160,
+        "narHash": "sha256-TVR0hn/JWo1qmtvgzqjfNerLPsIxfdFR3hf3QrnEj7U=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "dfbdabbb3e797334172094d4f6c0ffca8c791281",
+        "rev": "795492c9a895762f36f6c1ff43d6e0de66fdffa8",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1684321175,
-        "narHash": "sha256-V4EbM+jK7pvjKBaj0dgAiW9ultzDE27Nz5fRyu/ceMk=",
+        "lastModified": 1689134369,
+        "narHash": "sha256-0G9dutIvhS/WUr3Awcnqw71g8EVVvvkOhVDnDDbY4Fw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "59659243cd4ababda605e79b4a9c2e6d83e24c86",
+        "rev": "e42fb59768f0305085abde0dd27ab5e0cc15420c",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1684363872,
-        "narHash": "sha256-jkvhzrICFSmj+NBHksKTWzs8Q3+D7RsVK0wLKacbu8s=",
+        "lastModified": 1689138773,
+        "narHash": "sha256-NEcJPQfwc1jNDI/ITvieJW2Y+IWdGIYCFHLJl5PGx3o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1d77f3b72756ca36f16440c59e6b89a957908647",
+        "rev": "bf57c599729771cd23054a18c0f3a391ae85e193",
         "type": "github"
       },
       "original": {
diff --git a/maddie/common/git.nix b/maddie/common/git.nix
index dcd0370..337fca1 100644
--- a/maddie/common/git.nix
+++ b/maddie/common/git.nix
@@ -19,7 +19,7 @@
     signing = {
       key = "FA50688B9EB6D8AA070C8241C296DE8C9053683F";
       signByDefault = true;
-      gpgPath = "gpg2";
+      gpgPath = "/run/current-system/sw/bin/gpg";
     };
 
     aliases = {
diff --git a/maddie/common/helix.nix b/maddie/common/helix.nix
index 0748c4c..b67c29c 100644
--- a/maddie/common/helix.nix
+++ b/maddie/common/helix.nix
@@ -3,12 +3,12 @@
 {
   programs.helix = {
     enable = true;
-    languages = [
+    /* languages = [
       {
         name = "rust";
         auto-format = true;
       }
-    ];
+    ]; */
     settings = {
       theme = "onedark";
       keys.normal = {
diff --git a/maddie/common/latex.nix b/maddie/common/latex.nix
new file mode 100644
index 0000000..9ec960c
--- /dev/null
+++ b/maddie/common/latex.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    texlive.combined.scheme-full
+  ];
+}
diff --git a/maddie/common/zsh.nix b/maddie/common/zsh.nix
index 434cbae..3f48bf6 100644
--- a/maddie/common/zsh.nix
+++ b/maddie/common/zsh.nix
@@ -8,7 +8,7 @@
     # Basic config settings
     enableAutosuggestions = true;
     enableCompletion = true;
-    enableSyntaxHighlighting = true;
+    syntaxHighlighting.enable = true;
     autocd = true;
     /* defaultKeymap = "vicmd"; */
     dotDir = ".config/zsh";
diff --git a/maddie/nixos/xorg.nix b/maddie/nixos/xorg.nix
index d6a3d27..edd9c42 100644
--- a/maddie/nixos/xorg.nix
+++ b/maddie/nixos/xorg.nix
@@ -46,7 +46,7 @@
     ${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-0 --noprimary --mode 2560x1440 --pos 2560x0 --rotate right
 
     # Apply wallpaper
-    ${pkgs.feh}/bin/feh --no-fehbg --bg-fill "$HOME/Pictures/Wallpapers/The Walking Dead/shane_1.jpg" --bg-fill "$HOME/Pictures/Wallpapers/The Walking Dead/shane_3.jpg"
+    ${pkgs.feh}/bin/feh --no-fehbg --bg-fill "$HOME/Pictures/Wallpapers/NixOS/nix-wallpaper-waterfall.png"
 
     # Refresh xresources
     ${pkgs.xorg.xrdb}/bin/xrdb "$HOME/.Xresources"
diff --git a/systems/mdesktop/packages.nix b/systems/mdesktop/packages.nix
index 23c9665..8562890 100644
--- a/systems/mdesktop/packages.nix
+++ b/systems/mdesktop/packages.nix
@@ -43,5 +43,8 @@
 
     # Git
     git
+
+    # Compiler
+    gcc
   ];
 }
diff --git a/systems/mmacbookpro/apps.nix b/systems/mmacbookpro/apps.nix
index 1b21426..6a79b67 100644
--- a/systems/mmacbookpro/apps.nix
+++ b/systems/mmacbookpro/apps.nix
@@ -28,7 +28,7 @@
 
       # Messaging
       "signal"
-      "nheko"
+      "element"
 
       # Games
       "minecraft"
@@ -52,6 +52,7 @@
       "fleet"
       "tower"
       "secretive"
+      "visual-studio-code"
 
       # Learning
       "anki"