WIP: Switch to NixOS #5

Draft
FunctionalHacker wants to merge 1349 commits from nix into main
3 changed files with 21 additions and 10 deletions
Showing only changes of commit a0d236b56f - Show all commits

View file

@ -10,7 +10,7 @@ source ~/.zinit/bin/zinit.zsh
zinit ice load multisrc'{async,pure}.zsh' zinit ice load multisrc'{async,pure}.zsh'
zinit light sindresorhus/pure zinit light sindresorhus/pure
# fzf as tab completion # skim as tab completion
zinit ice lucid zinit ice lucid
zinit light Aloxaf/fzf-tab zinit light Aloxaf/fzf-tab
@ -18,7 +18,7 @@ zinit light Aloxaf/fzf-tab
zinit ice lucid zinit ice lucid
zinit light zsh-users/zsh-history-substring-search zinit light zsh-users/zsh-history-substring-search
# fzf git awesomeness # skim git awesomeness
zinit ice wait'1' lucid atload'source $HOME/.config/zsh/03-aliases.zsh' zinit ice wait'1' lucid atload'source $HOME/.config/zsh/03-aliases.zsh'
zinit light wfxr/forgit zinit light wfxr/forgit
@ -38,9 +38,12 @@ zinit snippet '$DOTREPO/dotdrop/completion/_dotdrop-completion.zsh'
zinit ice lucid atinit'zpcompinit' zinit ice lucid atinit'zpcompinit'
zinit light zdharma/fast-syntax-highlighting zinit light zdharma/fast-syntax-highlighting
# use fzf with zsh # use skim with zsh
{%@@ if profile == "mko-laptop" @@%} {%@@ if profile == "mko-laptop" @@%}
source ~/.skim.zsh # Source from home directory since mko-laptop is ubuntu and it doesn't
# have skim in it's repositories
source ~/Software/skim/shell/key-bindings.zsh
source ~/Software/skim/shell/completion.zsh
{%@@ else @@%} {%@@ else @@%}
source /usr/share/skim/key-bindings.zsh source /usr/share/skim/key-bindings.zsh
source /usr/share/skim/completion.zsh source /usr/share/skim/completion.zsh

View file

@ -6,13 +6,20 @@ alias gpush='git push'
alias mutt='neomutt' alias mutt='neomutt'
# make fzf zsh plugin use fd # make skim zsh plugin use fd
_fzf_compgen_dir() { _skim_compgen_dir() {
fd -Ht d fd -Ht d
} }
_fzf_compgen_path() { _skim_compgen_path() {
fd -Ht f fd -Ht f
} }
# same for fzf
_fzf_compgen_dir() {
_skim_compgen_dir
}
_fzf_compgen_path() {
_skim_compgen_path
}
# search and install packages with skim # search and install packages with skim
pi() { pi() {
@ -34,9 +41,9 @@ pr() {
fi fi
} }
# find and open man pages with fzf # find and open man pages with skim
fman() { fman() {
man -k . | fzf --prompt='Man> ' | awk '{print $1}' | xargs -r man man -k . | sk --prompt='Man> ' | awk '{print $1}' | xargs -r man
} }
# I'm retarded so I need this # I'm retarded so I need this

View file

@ -7,7 +7,8 @@
.cache/ .cache/
.cargo/ .cargo/
.rustup/ .rustup/
.zplugin/ .go/
.zinit/
.config/nvim/plugged/ .config/nvim/plugged/
.local/share/Trash/ .local/share/Trash/
.bin/ .bin/