From 29f4ff1d92e063d5761843166302ad07a5e5f673 Mon Sep 17 00:00:00 2001
From: Agatha Lovelace <agatha@technogothic.net>
Date: Fri, 7 Jul 2023 16:04:42 +0200
Subject: [PATCH] Add ssh client config; configure redshift; fix theme errors

---
 README.md                              |  2 ++
 common/fragments/graphical/default.nix | 43 +++++++++++++++++++++++++-
 common/home_manager/helix.nix          |  7 ++---
 3 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 7c96bee..26b1211 100644
--- a/README.md
+++ b/README.md
@@ -29,12 +29,14 @@ Bloodletting:
 Ritual:
 - `colmena apply[-local]` - deploy config
 - `mkdir -p ~/.gnupg` - create directory for gnupg
+- copy `~/.ssh/id_ed25519`
 - manual configuration/login:
   - Firefox
     - Copy extension data
   - Element
   - Telegram Desktop
   - Geary
+  - Obsidian
 
 ### Rsyncd Modules
 Modded minecraft instance rsync modules can be accessed through `mc-[modpack]@bloodletting::mc-[modpack]` with `--rsh=ssh`
diff --git a/common/fragments/graphical/default.nix b/common/fragments/graphical/default.nix
index 210212e..8cee1ef 100644
--- a/common/fragments/graphical/default.nix
+++ b/common/fragments/graphical/default.nix
@@ -40,6 +40,7 @@
     nil
     nitrogen
     obs-studio
+    obsidian
     pfetch
     pridefetch
     prismlauncher
@@ -51,11 +52,20 @@
     xdotool
     yubioath-flutter
     bspm
+    polybar-spotify
   ];
 
   # Brightness/volume keys
   users.users.agatha.extraGroups = [ "video" ];
-  programs.light.enable = true;
+
+  location = {
+    latitude = 49.0;
+    longitude = 8.4;
+  };
+  services.redshift = {
+    enable = true;
+    brightness.night = "0.8";
+  };
 
   services.xserver = {
     enable = true;
@@ -145,8 +155,39 @@
         "ZorinPurple-Dark";
     };
 
+    programs.helix.settings.theme =
+      if config.environment.graphical.theme.light then
+        "paramount-light"
+      else
+        "paramount-dark";
+
     programs.direnv.enable = true;
     home.sessionVariables = { "DIRENV_LOG_FORMAT" = ""; };
+
+    programs.ssh.enable = true;
+    programs.ssh.matchBlocks = {
+      "bloodletting" = { hostname = "technogothic.net"; };
+
+      "backups" = {
+        match = ''originalhost backups exec "ip r | rg 10.42.0.0/24"'';
+        hostname = "10.20.1.2";
+        user = "agatha";
+        identityFile = [ "~/.ssh/id_ed25519" ];
+      };
+
+      "work" = {
+        match = ''originalhost work exec "ip r | rg 10.42.0.0/24"'';
+        hostname = "10.42.0.222";
+        forwardX11 = true;
+        forwardX11Trusted = true;
+        extraOptions."TCPKeepAlive" = "yes";
+      };
+
+      "ritual" = {
+        match = ''originalhost ritual exec "ip r | rg 10.42.0.0/24"'';
+        hostname = "10.42.0.230";
+      };
+    };
   };
 
   environment.graphical.colorschemes = {
diff --git a/common/home_manager/helix.nix b/common/home_manager/helix.nix
index c7de2db..1ed99de 100644
--- a/common/home_manager/helix.nix
+++ b/common/home_manager/helix.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }: {
+{ pkgs, config, lib, ... }: {
   home-manager.users.agatha = {
     # Formatters/Language Servers that Helix uses
     home.packages = with pkgs; [ nixfmt ];
@@ -15,10 +15,7 @@
           }];
         };
         settings = {
-          theme = if config.environment.graphical.theme.light then
-            "paramount-light"
-          else
-            "paramount-dark";
+          theme = lib.mkDefault "paramount-dark";
           editor = {
             middle-click-paste = false;
             scroll-lines = 4;