From c059af5248c67353953f95052aaa9c238180c538 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Fri, 29 Oct 2021 16:43:36 +0200
Subject: [PATCH] terminal-life: add upstream nixos-option gc fix

---
 modules/terminal-life/default.nix     | 4 ++--
 modules/terminal-life/zsh/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/terminal-life/default.nix b/modules/terminal-life/default.nix
index 4d36655f..87b2ee45 100644
--- a/modules/terminal-life/default.nix
+++ b/modules/terminal-life/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, pkgs, ... }:
+{ lib, config, pkgs, self, ... }:
 with lib;
 let
   psCfg = config.pub-solar;
@@ -37,7 +37,7 @@ in
 
       programs.neovim = import ./nvim { inherit config; inherit pkgs; };
       programs.fzf = import ./fzf { inherit config; inherit pkgs; };
-      programs.zsh = import ./zsh { inherit config; inherit pkgs; };
+      programs.zsh = import ./zsh { inherit config; inherit pkgs; inherit self; };
     };
   };
 }
diff --git a/modules/terminal-life/zsh/default.nix b/modules/terminal-life/zsh/default.nix
index 0ff87812..f4923c50 100644
--- a/modules/terminal-life/zsh/default.nix
+++ b/modules/terminal-life/zsh/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, self, ... }:
 let
   psCfg = config.pub-solar;
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
@@ -32,7 +32,7 @@ in
     drone = "DRONE_TOKEN=$(secret-tool lookup drone token) drone";
     no = "manix \"\" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview=\"manix '{}'\" | xargs manix";
     # fix nixos-option
-    nixos-option = "nixos-option -I nixpkgs=/etc/nixos/lib/compat";
+    nixos-option = "nixos-option -I nixpkgs=${self}/lib/compat";
   };
   zplug = {
     enable = true;