refactor: limit use of with lib

This commit is contained in:
matt1432 2024-01-22 11:09:37 -05:00
parent 7fd12f5b04
commit 20dac8791e
16 changed files with 74 additions and 50 deletions
common/home/bash

View file

@ -1,15 +1,17 @@
{lib, ...}: {
{lib, ...}: let
inherit (lib) fileContents;
# TODO: have different colors depending on host
textColor = "#e3e5e5";
firstColor = "#bd93f9";
secondColor = "#715895";
thirdColor = "#382c4a";
fourthColor = "#120e18";
in {
imports = [./programs.nix];
programs = {
starship = let
# TODO: have different colors depending on host
textColor = "#e3e5e5";
firstColor = "#bd93f9";
secondColor = "#715895";
thirdColor = "#382c4a";
fourthColor = "#120e18";
in {
starship = {
enable = true;
enableBashIntegration = true;
settings = {
@ -143,11 +145,11 @@
# Check if shell is interactive
[[ $- == *i* ]] || return 0
${lib.strings.fileContents ./config/dracula/less.sh}
${lib.strings.fileContents ./config/dracula/fzf.sh}
${fileContents ./config/dracula/less.sh}
${fileContents ./config/dracula/fzf.sh}
${lib.strings.fileContents ./config/colorgrid.sh}
${lib.strings.fileContents ./config/bashrc}
${fileContents ./config/colorgrid.sh}
${fileContents ./config/bashrc}
'';
#initExtra = ''
#'';