From 6b910105783445168c3a55d8c89fec90640bf24c Mon Sep 17 00:00:00 2001
From: Francis Hamel <36383308+francishamel@users.noreply.github.com>
Date: Thu, 29 Aug 2024 01:36:35 -0400
Subject: [PATCH] Misc changes (#297)

* nix run .#update

* Add new git alias for quick commit --amend

* Change yubikey software

* Random vscode settings changes

* Show pane frames in zellij
---
 flake.lock                        | 18 +++++++++---------
 home-manager/modules/git.nix      |  1 +
 home-manager/modules/terminal.nix |  1 -
 home-manager/modules/vscode.nix   |  2 ++
 home-manager/modules/zellij.nix   |  1 -
 nixos/darwin/homebrew.nix         |  1 +
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index f75f4c2..f7e299a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -221,11 +221,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722936497,
-        "narHash": "sha256-UBst8PkhY0kqTgdKiR8MtTBt4c1XmjJoOV11efjsC/o=",
+        "lastModified": 1724435763,
+        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a6c743980e23f4cef6c2a377f9ffab506568413a",
+        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
         "type": "github"
       },
       "original": {
@@ -262,11 +262,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722924007,
-        "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=",
+        "lastModified": 1724561770,
+        "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "91010a5613ffd7ee23ee9263213157a1c422b705",
+        "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e",
         "type": "github"
       },
       "original": {
@@ -293,11 +293,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1722813957,
-        "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
+        "lastModified": 1724819573,
+        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
+        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/modules/git.nix b/home-manager/modules/git.nix
index d42949b..6c10f67 100644
--- a/home-manager/modules/git.nix
+++ b/home-manager/modules/git.nix
@@ -5,6 +5,7 @@
     userName = "Francis Hamel";
     userEmail = "36383308+francishamel@users.noreply.github.com";
     aliases = {
+      ca = "commit --amend";
       cf = "commit --fixup";
       fp = "fetch --prune";
       pfwl = "push --force-with-lease";
diff --git a/home-manager/modules/terminal.nix b/home-manager/modules/terminal.nix
index bfcf1cc..4a82843 100644
--- a/home-manager/modules/terminal.nix
+++ b/home-manager/modules/terminal.nix
@@ -6,6 +6,5 @@
     pkgs.d2
     pkgs.devenv
     pkgs.flyctl
-    pkgs.yubikey-manager
   ];
 }
diff --git a/home-manager/modules/vscode.nix b/home-manager/modules/vscode.nix
index e299d82..e97a658 100644
--- a/home-manager/modules/vscode.nix
+++ b/home-manager/modules/vscode.nix
@@ -23,6 +23,7 @@
     mutableExtensionsDir = false;
     userSettings = {
       "diffEditor.ignoreTrimWhitespace" = false;
+      "editor.accessibilitySupport" = "off";
       "editor.fontFamily" = "'FiraCode Nerd Font'";
       "editor.fontLigatures" = true;
       "editor.formatOnSave" = true;
@@ -56,6 +57,7 @@
           };
         };
       };
+      "scm.showHistoryGraph" = false;
       "tailwindCSS.includeLanguages" = {
         "elixir" = "html";
         "phoenix-heex" = "html";
diff --git a/home-manager/modules/zellij.nix b/home-manager/modules/zellij.nix
index f2c2115..3025664 100644
--- a/home-manager/modules/zellij.nix
+++ b/home-manager/modules/zellij.nix
@@ -6,7 +6,6 @@
     enableZshIntegration = true;
     settings = {
       on_force_close = "quit";
-      pane_frames = false;
     };
   };
 }
diff --git a/nixos/darwin/homebrew.nix b/nixos/darwin/homebrew.nix
index 1f4a17c..0a45f40 100644
--- a/nixos/darwin/homebrew.nix
+++ b/nixos/darwin/homebrew.nix
@@ -21,6 +21,7 @@
       "slack"
       "spotify"
       "todoist"
+      "yubico-yubikey-manager"
     ];
   };
 }