teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

terminal-life: add upstream nixos-option gc fix

Browse source
This commit is contained in:
teutat3s 2021-10-29 16:43:36 +02:00
parent 76a2342954
commit c059af5248
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/terminal-life/default.nix
View file

@ -1,4 +1,4 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, self, ... }:
with lib; with lib;
let let
psCfg = config.pub-solar; psCfg = config.pub-solar;
@ -37,7 +37,7 @@ in
programs.neovim = import ./nvim { inherit config; inherit pkgs; }; programs.neovim = import ./nvim { inherit config; inherit pkgs; };
programs.fzf = import ./fzf { 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; };
}; };
}; };
} }

4
modules/terminal-life/zsh/default.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }: { config, pkgs, self, ... }:
let let
psCfg = config.pub-solar; psCfg = config.pub-solar;
xdg = config.home-manager.users."${psCfg.user.name}".xdg; xdg = config.home-manager.users."${psCfg.user.name}".xdg;
@ -32,7 +32,7 @@ in
drone = "DRONE_TOKEN=$(secret-tool lookup drone token) drone"; drone = "DRONE_TOKEN=$(secret-tool lookup drone token) drone";
no = "manix \"\" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview=\"manix '{}'\" | xargs manix"; no = "manix \"\" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview=\"manix '{}'\" | xargs manix";
# fix nixos-option # fix nixos-option
nixos-option = "nixos-option -I nixpkgs=/etc/nixos/lib/compat"; nixos-option = "nixos-option -I nixpkgs=${self}/lib/compat";
}; };
zplug = { zplug = {
enable = true; enable = true;