Added zsh

This commit is contained in:
Tibo De Peuter 2023-03-24 11:15:51 +01:00 committed by Tibo De Peuter
parent 42c919c1b6
commit 8d0cc90276
5 changed files with 79 additions and 11 deletions

View file

@ -64,11 +64,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1679318992, "lastModified": 1679472241,
"narHash": "sha256-uoj5Oy6hruIHuxzfQZtcalObe5kPrX9v+ClUMFEOzmE=", "narHash": "sha256-VK2YDic2NjPvfsuneJCLIrWS38qUfoW8rLLimx0rWXA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e2c97799da5f5cd87adfa5017fba971771e123ef", "rev": "9ef6e7727f4c31507627815d4f8679c5841efb00",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -42,12 +42,6 @@
}; };
modules = [ modules = [
./users/tdpeuter/home.nix ./users/tdpeuter/home.nix
{
home = {
username = "tdpeuter";
homeDirectory = "/home/tdpeuter";
};
}
]; ];
}; };
}; };

View file

@ -112,6 +112,7 @@
packages = with pkgs; [ packages = with pkgs; [
home-manager home-manager
]; ];
shell = pkgs.zsh;
}; };
# Allow unfree packages # Allow unfree packages

View file

@ -1,6 +1,9 @@
{ inputs, lib, config, pkgs, ... }: { inputs, lib, config, pkgs, ... }:
{ {
# Check documentation at
# https://rycee.gitlab.io/home-manager/options.html
imports = [ imports = [
]; ];
@ -46,6 +49,9 @@
# Software Engineering Lab 1 # Software Engineering Lab 1
android-studio android-studio
# Fonts
font-awesome_5 # Vifm and zsh dependency
]; ];
file = { file = {
@ -54,6 +60,7 @@
".vim".source = ../../../stow/vim/.vim; ".vim".source = ../../../stow/vim/.vim;
".vimrc".source = ../../../stow/vim/.vimrc; ".vimrc".source = ../../../stow/vim/.vimrc;
".config/zellij".source = ../../../stow/zellij/.config/zellij; ".config/zellij".source = ../../../stow/zellij/.config/zellij;
".oh-my-zsh".source = ../../../stow/zsh/.oh-my-zsh;
}; };
}; };
@ -72,6 +79,27 @@
}; };
gpg.enable = true; gpg.enable = true;
zsh = {
enable = true;
oh-my-zsh = {
enable = true;
custom = "$HOME/.oh-my-zsh";
plugins = [ "dirhistory" "git" "screen" ];
theme = "mrfortem";
};
plugins = [
{
name = "cmdtime";
src = pkgs.fetchFromGitHub {
owner = "tom-auger";
repo = "cmdtime";
rev = "ffc72641dcfa0ee6666ceb1dc712b61be30a1e8b";
hash = "sha256-v6wCfNoPXDD3sS6yUYE6lre8Ir1yJcLGoAW3O8sUOCg=";
};
}
];
};
}; };

View file

@ -0,0 +1,45 @@
#
# ~/.oh-my-zsh/themes/mrfortem.zsh-theme
# Stolen from gentoo-theme and gianni
#
autoload -Uz colors && colors
autoload -Uz vcs_info
zstyle ':vcs_info:*' check-for-changes true
zstyle ':vcs_info:*' unstagedstr '%F{red}*' # display this when there are unstaged changes
zstyle ':vcs_info:*' stagedstr '%F{yellow}+' # display this when there are staged changes
zstyle ':vcs_info:*' actionformats '%F{5}(%F{2}%b%F{3}|%F{1}%a%c%u%m%F{5})%f '
zstyle ':vcs_info:*' formats "%F{white}(%F{cyan} %b%c%u%m%F{white})%f "
zstyle ':vcs_info:svn:*' branchformat '%b'
zstyle ':vcs_info:svn:*' actionformats '%F{5}(%F{2}%b%F{1}:%{3}%i%F{3}|%F{1}%a%c%u%m%F{5})%f '
zstyle ':vcs_info:svn:*' formats '%F{5}(%F{2}%b%F{1}:%F{3}%i%c%u%m%F{5})%f '
zstyle ':vcs_info:*' enable git cvs svn
zstyle ':vcs_info:git*+set-message:*' hooks untracked-git
+vi-untracked-git() {
if command git status --porcelain 2>/dev/null | command grep -q '??'; then
hook_com[misc]='%F{red}?'
else
hook_com[misc]=''
fi
}
loadgit() {
vcs_info
}
autoload -U add-zsh-hook
add-zsh-hook precmd loadgit
# Backup line(s)
# PROMPT='%(!.%B%F{red}.%B%F{green}%n@)%m %F{blue}%(!.%1~.%~) ${vcs_info_msg_0_}%F{blue}%(!.#.$)%k%b%f '
# PROMPT='%(!.%B%F{red}.%B%F{green}%n@)%m %{$reset_color%}%F{cyan}%c %B${vcs_info_msg_0_}%F{green}%(!.#.$)%k%b%f '
PROMPT='%(!.%B%F{red}%m .)%{$reset_color%}%F{cyan}%c %B${vcs_info_msg_0_}%F{green}%(!.#.$)%k%b%f '
# PROMPT='%{$fg_bold[green]%}[%n@%m%{$reset_color%} %{$fg[cyan]%}%c%{$reset_color%}$(git_prompt_info)%{$fg_bold[green]%}]%{$reset_color%}$ '
# ZSH_THEME_GIT_PROMPT_PREFIX=" (%{$fg_bold[cyan]%}"
# ZSH_THEME_GIT_PROMPT_SUFFIX=")"
# ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%} %{$fg[yellow]%}X%{$reset_color%}"
# ZSH_THEME_GIT_PROMPT_CLEAN="%{$reset_color%}"