Stop using zsh-flake and integrate inside the main config

This commit is contained in:
traxys 2023-03-25 23:56:33 +01:00
parent 072ea429de
commit 16f6b47198
4 changed files with 1704 additions and 6 deletions

View file

@ -14,9 +14,6 @@
url = "github:traxys/nvim-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
# zsh-traxys = {
# url = "github:traxys/zsh-flake";
# };
rust-overlay.url = "github:oxalica/rust-overlay";
naersk.url = "github:nix-community/naersk";
comma.url = "github:nix-community/comma";
@ -75,7 +72,7 @@
// {
raclette = inputs.raclette.defaultPackage."${system}";
neovimTraxys = inputs.nvim-traxys.packages."${system}".nvim;
roaming_proxy = inputs.roaming_proxy.defaultPackage."${system}";
roaming_proxy = inputs.roaming_proxy.defaultPackage."${system}";
};
in {
templates = {
@ -118,10 +115,13 @@
./wm
./rustdev.nix
./git
inputs.zsh-traxys.home-managerModule."${system}"
./minimal
];
};
home-manager.extraSpecialArgs = {flake = self;};
home-manager.extraSpecialArgs = {
flake = self;
inputs = self.inputs;
};
# Optionally, use home-manager.extraSpecialArgs to pass
# arguments to home.nix
}

51
minimal/default.nix Normal file
View file

@ -0,0 +1,51 @@
{
pkgs,
inputs,
...
}: {
home.packages = with pkgs; [
nix-zsh-completions
];
programs.zsh = {
enable = true;
enableCompletion = true;
oh-my-zsh = {
enable = true;
plugins = ["git" "wd" "rust"];
};
plugins = [
{
name = "fast-syntax-highlighting";
file = "fast-syntax-highlighting.plugin.zsh";
src = inputs.fast-syntax-highlighting;
}
{
name = "zsh-nix-shell";
file = "nix-shell.plugin.zsh";
src = inputs.zsh-nix-shell;
}
];
initExtra = ''
export PATH="$PATH:$HOME/bin";
source ${./p10k.zsh}
source ${inputs.powerlevel10k}/powerlevel10k.zsh-theme
if [ -f "$HOME/.zvars" ]; then
source "$HOME/.zvars"
fi
${pkgs.fortune}/bin/fortune \
| ${pkgs.cowsay}/bin/cowsay \
| ${pkgs.dotacat}/bin/dotacat
'';
shellAliases = {
cat = "${pkgs.bat}/bin/bat -p";
ls = "${pkgs.exa}/bin/exa --icons";
};
};
home.file = {
".zprofile".source = ./zprofile;
};
}

1623
minimal/p10k.zsh Normal file

File diff suppressed because it is too large Load diff

24
minimal/zprofile Normal file
View file

@ -0,0 +1,24 @@
SSH_ENV="$HOME/.ssh/agent-environment"
function start_agent {
echo "Initialising new SSH agent..."
ssh-agent | sed 's/^echo/#echo/' > "${SSH_ENV}"
echo succeeded
chmod 600 "${SSH_ENV}"
. "${SSH_ENV}" > /dev/null
ssh-add;
}
# Source SSH settings, if applicable
if [ -f "${SSH_ENV}" ]; then
. "${SSH_ENV}" > /dev/null
#ps ${SSH_AGENT_PID} doesn't work under cywgin
ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
start_agent;
}
else
start_agent;
fi
#source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh