From 65d5c5f8f9cbd1a5fc9d91452f7285a7abb524fc Mon Sep 17 00:00:00 2001
From: mat ess <mat@mat.services>
Date: Sun, 16 Oct 2022 19:43:04 -0400
Subject: [PATCH] Tweaks/fixes

---
 README.md                 | 4 ++--
 darwin/homebrew.nix       | 2 ++
 home/fish.nix             | 2 ++
 home/git.nix              | 2 +-
 home/programs.nix         | 7 ++++---
 home/services/tarsnap.nix | 3 ++-
 modules/darwin/games.nix  | 8 +-------
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index ecd467e..3cbb0f1 100644
--- a/README.md
+++ b/README.md
@@ -76,11 +76,11 @@ fish shell configuration and integrations
 
 #### darwin
 
-various extensions for nix-darwin
+various extensions for nix-darwin configuration
 
 #### home
 
-customization for kitty terminal and kakoune
+customization for kitty terminal and other programs
 
 ### overlays
 
diff --git a/darwin/homebrew.nix b/darwin/homebrew.nix
index a43ae77..6be6050 100644
--- a/darwin/homebrew.nix
+++ b/darwin/homebrew.nix
@@ -47,6 +47,7 @@ in
 
   homebrew.masApps = {
     Bitwarden = 1352778147;
+    "Reeder 5" = 1529448980;
     Spark = 1176895641;
     Tailscale = 1475387142;
     Xcode = 497799835;
@@ -98,6 +99,7 @@ in
     "fileicon"
     "fzf"
     "gifsicle"
+    "netlify-cli"
     "tarsnap"
     "unison-language"
   ];
diff --git a/home/fish.nix b/home/fish.nix
index 574ff0f..2f3b36b 100644
--- a/home/fish.nix
+++ b/home/fish.nix
@@ -82,8 +82,10 @@
       body = ''
         switch $$env_var
         case 1
+          echo "Setting dark mode"
           set -U term_background dark
         case 0
+          echo "Setting light mode"
           set -U term_background light
         end
       '';
diff --git a/home/git.nix b/home/git.nix
index 633394e..7ffb29f 100644
--- a/home/git.nix
+++ b/home/git.nix
@@ -10,7 +10,7 @@
   programs.git.userName = config.home.primaryUser.fullName;
 
   programs.git.extraConfig = {
-    core.editor = "kak";
+    core.editor = "hx";
     diff.colorMoved = "default";
     pull.rebase = true;
     init.defaultBranch = "main";
diff --git a/home/programs.nix b/home/programs.nix
index f2b0a0a..22f02d2 100644
--- a/home/programs.nix
+++ b/home/programs.nix
@@ -2,7 +2,9 @@
 
 {
   # Programs + packages with configuration --------------------------------------------------------------- {{{
-
+  home.sessionVariables = {
+    EDITOR = "hx";
+  };
   programs = {
     # a nicer cat
     # https://rycee.gitlab.io/home-manager/options.html#opt-programs.bat.enable
@@ -47,10 +49,9 @@
     };
     ssh = {
       enable = true;
-      matchBlocks."*".extraOptions = {
+      matchBlocks."*".extraOptions = lib.optionalAttrs pkgs.stdenv.isDarwin {
         UseKeychain = "yes";
         AddKeysToAgent = "yes";
-      } // lib.optionalAttrs pkgs.stdenv.isDarwin {
         IdentityAgent = "${config.home.homeDirectory}/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
       };
     };
diff --git a/home/services/tarsnap.nix b/home/services/tarsnap.nix
index 096ec93..44cbf60 100644
--- a/home/services/tarsnap.nix
+++ b/home/services/tarsnap.nix
@@ -5,8 +5,9 @@
     let
       logPath = "/var/log/tarsnap";
       tarsnapBackup = pkgs.writeShellScriptBin "tarsnap-backup-helper" ''
-        /opt/homebrew/bin/tarsnap -v -c \
+        /opt/homebrew/bin/tarsnap -c \
           --configfile ${config.home.homeDirectory}/.tarsnaprc \
+          --keyfile ${config.xdg.configHome}/tarsnap/write-only.key \
           -f $(uname -n)-$(date -u +%Y-%m-%dT%H:%M:%SZ) \
           ${config.home.homeDirectory}/{dotfiles.nix,Desktop,Development,Documents,Downloads}
       '';
diff --git a/modules/darwin/games.nix b/modules/darwin/games.nix
index d3e27b1..de058e3 100644
--- a/modules/darwin/games.nix
+++ b/modules/darwin/games.nix
@@ -1,11 +1,5 @@
 { lib, ... }:
 
-let
-  inherit (lib) mkEnableOption;
-in
-
 {
-  options = {
-    games.enable = mkEnableOption "Enable games (managed by homebrew)";
-  };
+  options.games.enable = lib.mkEnableOption "Enable games (managed by homebrew)";
 }