secrets home

6 files changed, 17 insertions, 8 deletions

diff --git a/home/ebisu/fortune/development/default.nix b/home/ebisu/fortune/development/default.nix
index 52cc853..435f127 100644
--- a/home/ebisu/fortune/development/default.nix
+++ b/home/ebisu/fortune/development/default.nix
@@ -3,7 +3,6 @@
     ./languages
     ./tools
     ./database.nix
-    ./git.nix
     ./infrastructure.nix
     ./nix.nix
   ];
diff --git a/home/ebisu/fortune/development/tools/default.nix b/home/ebisu/fortune/development/tools/default.nix
index b365ffe..6496464 100644
--- a/home/ebisu/fortune/development/tools/default.nix
+++ b/home/ebisu/fortune/development/tools/default.nix
@@ -1,6 +1,9 @@
 { pkgs, ... }:
 {
-  imports = [ ./build.nix ];
+  imports = [
+    ./build.nix
+    ./git.nix
+  ];
 
   home.packages = with pkgs; [
     clang-tools
diff --git a/home/ebisu/fortune/development/git.nix b/home/ebisu/fortune/development/tools/git.nix
index 7408203..ebf6d4c 100644
--- a/home/ebisu/fortune/development/git.nix
+++ b/home/ebisu/fortune/development/tools/git.nix
@@ -5,6 +5,7 @@
     gh
     onefetch
     gitoxide
-    (callPackage ../../../../pkgs/git-sumi.nix { })
+    (callPackage ../../../../../pkgs/git-sumi.nix { })
+    git-crypt
   ];
 }
diff --git a/home/ebisu/fortune/system/shell/fish.nix b/home/ebisu/fortune/system/shell/fish.nix
index d58b065..1d6003b 100644
--- a/home/ebisu/fortune/system/shell/fish.nix
+++ b/home/ebisu/fortune/system/shell/fish.nix
@@ -32,14 +32,14 @@
         end
       end
 
-      set -l config_home (set -q XDG_CONFIG_HOME; and echo $XDG_CONFIG_HOME; or echo $HOME/.config)
+      set -l config_home (set -q XDG_CONFIG_HOME; and echo $XDG_CONFIG_HOME; or echo ${config.xdg.configHome})
       set HISTSIZE -1
       set HISTFILESIZE -1
       set SAVEHIST -1
 
       bind \ce edit_command_buffer
 
-      cat ~/.cache/wal/sequences
+      cat ${config.xdg.cacheHome}/wal/sequences
 
       zoxide init fish | source
       direnv hook fish | source
@@ -146,7 +146,7 @@
       rotd = "systemctl --user restart opentabledriver.service";
       ks = "kaguya stream --user-agent 'Mozilla/5.0 (X11; Linux x86_64; rv:120.0) Gecko/20100101 Firefox/120.0'";
       def = "myougiden";
-      suzuri = "SUZURI_MINIMAL=1 SUZURI_REVERSE=1 ~/Documents/Code/Git/Fuwn/suzuri/suzuri";
+      suzuri = "SUZURI_MINIMAL=1 SUZURI_REVERSE=1 ${config.home.homeDirectory}/Documents/Code/Git/Fuwn/suzuri/suzuri";
       "5ch" = "html2md -i 'https://ff5ch.syoboi.jp/' -s section | glow";
       shinobu = "curl --silent https://shinobu.fuwn.workers.dev/shinobu -o /tmp/shinobu && nsxiv /tmp/shinobu";
       auto_subtitle = "source $HOME/Documents/Code/Git/Random/auto-subtitle/venv/bin/activate && auto_subtitle --model medium --task translate --srt_only True";
diff --git a/home/ebisu/fortune/system/variables.nix b/home/ebisu/fortune/system/variables.nix
index d4f021b..818e535 100644
--- a/home/ebisu/fortune/system/variables.nix
+++ b/home/ebisu/fortune/system/variables.nix
@@ -1,4 +1,9 @@
-{ pkgs, config, ... }:
+{
+  pkgs,
+  config,
+  secrets,
+  ...
+}:
 {
   home.sessionVariables = {
     # ref: https://github.com/nix-community/home-manager/issues/354#issuecomment-475803163
@@ -83,7 +88,7 @@
     # GIT_ASKPASS = "${pkgs.ksshaskpass}/bin/ksshaskpass";
     # SSH_ASKPASS = "${pkgs.ksshaskpass}/bin/ksshaskpass";
     # SSH_ASKPASS_REQUIRE = "prefer";
-    OPENAI_API_KEY = "sk-proj-lp1rme6lIEbfNeg4sbMQT3BlbkFJoWb5uwnraatH6HOkymqr";
+    OPENAI_API_KEY = secrets.openai_api_key;
     NNN_FIFO = "/tmp/nnn.fifo";
     _Z_DATA = "${config.xdg.dataHome}/z";
     W3M_DIR = "${config.xdg.dataHome}/w3m";
@@ -94,5 +99,6 @@
     BUNDLE_USER_PLUGIN = "${config.xdg.dataHome}/bundle";
     PSQL_HISTORY = "${config.xdg.dataHome}/psql_history";
     PKG_CACHE_PATH = "${config.xdg.cacheHome}/pkg-cache";
+    SUZURI_TOKEN = "${secrets.suzuri_token}";
   };
 }
diff --git a/secrets/secrets.json b/secrets/secrets.json
index 02afcde..de3d603 100644
--- a/secrets/secrets.json
+++ b/secrets/secrets.json