Rename system to lib
This commit is contained in:
parent
cf4c9710a2
commit
addad268e5
18 changed files with 2 additions and 2 deletions
43
lib/shared/home-manager-packages.nix
Normal file
43
lib/shared/home-manager-packages.nix
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with pkgs; [
|
||||
awscli2
|
||||
bitwarden-cli
|
||||
bottom
|
||||
ctop
|
||||
delta
|
||||
dog
|
||||
doppler
|
||||
fd
|
||||
file
|
||||
gcc
|
||||
gh
|
||||
git
|
||||
git-crypt
|
||||
gnupg
|
||||
go
|
||||
htop
|
||||
inotify-tools
|
||||
jq
|
||||
lua
|
||||
mysql
|
||||
neofetch
|
||||
php82
|
||||
php82Packages.composer
|
||||
pv
|
||||
ripgrep
|
||||
rustywind
|
||||
tldr
|
||||
tree
|
||||
tree-sitter
|
||||
unzip
|
||||
virtualenv
|
||||
watchexec
|
||||
wget
|
||||
xcp
|
||||
xh
|
||||
yarn
|
||||
]
|
||||
60
lib/shared/home-manager.nix
Normal file
60
lib/shared/home-manager.nix
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
username,
|
||||
self,
|
||||
}: {
|
||||
home.username = "${username}";
|
||||
home.homeDirectory = "/home/${username}";
|
||||
|
||||
home.stateVersion = "22.05";
|
||||
|
||||
programs.home-manager.enable = true;
|
||||
|
||||
imports = [
|
||||
(import ./modules/neovim.nix {inherit inputs;})
|
||||
./modules/git.nix
|
||||
./modules/starship.nix
|
||||
./modules/tmux.nix
|
||||
./modules/zsh.nix
|
||||
];
|
||||
|
||||
programs.fzf = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
};
|
||||
|
||||
programs.bat.enable = true;
|
||||
|
||||
home.file."logo.txt" = {
|
||||
source = pkgs.copyPathToStore "${self}/logo.txt";
|
||||
target = "logo.txt";
|
||||
};
|
||||
|
||||
programs.lsd.enable = true;
|
||||
|
||||
programs.nnn.enable = true;
|
||||
|
||||
programs.direnv = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
|
||||
home.sessionPath = ["$HOME/.config/bin"];
|
||||
|
||||
xdg.configFile."ripgrep/config".text = ''
|
||||
--follow
|
||||
--smart-case
|
||||
'';
|
||||
|
||||
xdg.configFile.bin = {
|
||||
source = ../../bin;
|
||||
recursive = true;
|
||||
};
|
||||
|
||||
xdg.configFile.phpactor = {
|
||||
source = ../../config/phpactor;
|
||||
recursive = true;
|
||||
};
|
||||
}
|
||||
127
lib/shared/modules/git.nix
Normal file
127
lib/shared/modules/git.nix
Normal file
|
|
@ -0,0 +1,127 @@
|
|||
{
|
||||
home.file.".gitmessage".text = ''
|
||||
|
||||
|
||||
# Description
|
||||
#
|
||||
# - Why is this change necessary?
|
||||
# - How does it address the issue?
|
||||
# - What side effects does this change have?
|
||||
#
|
||||
# For breaking changes, uncomment the following line and describe the change:
|
||||
#
|
||||
# BREAKING CHANGE:
|
||||
#
|
||||
#
|
||||
# Add any issue IDs or commit SHAs that this commit references:
|
||||
#
|
||||
# Refs:
|
||||
|
||||
'';
|
||||
|
||||
xdg.configFile."git/ignore".text = ''
|
||||
/.direnv/
|
||||
/.ignored/
|
||||
/.issue-id
|
||||
/.phpactor.json
|
||||
/notes
|
||||
/todo
|
||||
'';
|
||||
|
||||
programs = {
|
||||
git = {
|
||||
enable = true;
|
||||
userName = "Oliver Davies";
|
||||
userEmail = "oliver@oliverdavies.dev";
|
||||
|
||||
aliases = {
|
||||
aa = "add --all";
|
||||
assume = "update-index --assume-unchanged";
|
||||
assumed = "!git ls-files -v | grep '^[hsmrck?]' | cut -c 3-";
|
||||
b = "branch";
|
||||
browse = "!gh repo view --web";
|
||||
ca = "commit --amend --verbose";
|
||||
car = "commit --amend --no-edit";
|
||||
cl = "!hub clone";
|
||||
co = "checkout";
|
||||
compare = "!hub compare";
|
||||
current-branch = "rev-parse --abbrev-ref HEAD";
|
||||
dc = "diff --color --word-diff --cached";
|
||||
df = "diff --color --word-diff";
|
||||
dup = "!git checkout develop && git fetch origin && echo && git sl develop..origin/develop && echo && git pull --quiet && git checkout -";
|
||||
fixup = "commit --fixup";
|
||||
issues = "!gh issue list --web";
|
||||
mup = "!git master-to-main-wrapper checkout %BRANCH% && git fetch origin && echo && git sl %BRANCH%..origin/%BRANCH% && echo && git pull --quiet && git checkout -";
|
||||
no-ff = "merge --no-ff";
|
||||
pl = "pull";
|
||||
prune = "remote prune origin";
|
||||
ps = "push";
|
||||
pulls = "!gh pr list --web";
|
||||
rbc = "rebase --continue";
|
||||
rdup = "!git dup && git rebase develop";
|
||||
remotes = "remote -v";
|
||||
repush = "!git pull --rebase && git push";
|
||||
ri = "rebase --interactive";
|
||||
rid = "!git rebase -i $(git merge-base develop HEAD)";
|
||||
rim = "!git rebase -i $(git master-to-main-wrapper merge-base %BRANCH% HEAD)";
|
||||
rip = "!git rebase -i $(git merge-base production HEAD)";
|
||||
ris = "!git rebase -i $(git merge-base staging HEAD)";
|
||||
riu = "!git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u})";
|
||||
rmup = "!git mup && git master-to-main-wrapper rebase %BRANCH%";
|
||||
sl = "log --oneline --decorate -20";
|
||||
sla = "log --oneline --decorate --graph --all -20";
|
||||
slap = "log --oneline --decorate --graph --all";
|
||||
slp = "log --oneline --decorate";
|
||||
staged = "diff --staged";
|
||||
unassume = "update-index --no-assume-unchanged";
|
||||
uncommit = "reset --soft HEAD^";
|
||||
unstage = "reset";
|
||||
upstream = "rev-parse --abbrev-ref --symbolic-full-name @{u}";
|
||||
ureset = "!git reset --hard $(git upstream)";
|
||||
worktrees = "worktree list";
|
||||
};
|
||||
|
||||
extraConfig = {
|
||||
branch = {
|
||||
autosetupmerge = true;
|
||||
autosetuprebase = "always";
|
||||
};
|
||||
checkout.defaultRemote = "origin";
|
||||
color.ui = true;
|
||||
commit = {template = "~/.gitmessage";};
|
||||
core = {
|
||||
editor = "nvim";
|
||||
excludesFile = "~/.config/git/ignore";
|
||||
pager = "delta";
|
||||
};
|
||||
delta.line-numbers = true;
|
||||
diff.tool = "vimdiff";
|
||||
fetch.prune = true;
|
||||
grep.lineNumber = true;
|
||||
help.autocorrect = "1";
|
||||
init.defaultBranch = "main";
|
||||
merge.ff = "only";
|
||||
push = {
|
||||
autoSetupRemote = true;
|
||||
default = "upstream";
|
||||
};
|
||||
pull = {
|
||||
ff = "only";
|
||||
rebase = true;
|
||||
};
|
||||
rebase = {
|
||||
autosquash = true;
|
||||
autostash = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
lazygit = {
|
||||
enable = true;
|
||||
|
||||
settings = {
|
||||
gui.skipDiscardChangeWarning = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
14
lib/shared/modules/neovim.nix
Normal file
14
lib/shared/modules/neovim.nix
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
{inputs}: {pkgs, ...}: let
|
||||
system = pkgs.system;
|
||||
in {
|
||||
programs.neovim = inputs.opdavies-nvim.lib.mkHomeManager {inherit system;};
|
||||
|
||||
home.file.".markdownlint.yaml".text = ''
|
||||
default: true
|
||||
|
||||
line-length: false
|
||||
|
||||
no-duplicate-heading:
|
||||
siblings_only: true
|
||||
'';
|
||||
}
|
||||
3
lib/shared/modules/starship.nix
Normal file
3
lib/shared/modules/starship.nix
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
programs.starship.enable = true;
|
||||
}
|
||||
108
lib/shared/modules/tmux.nix
Normal file
108
lib/shared/modules/tmux.nix
Normal file
|
|
@ -0,0 +1,108 @@
|
|||
{pkgs, ...}: {
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
terminal = "tmux-256color";
|
||||
|
||||
extraConfig = ''
|
||||
unbind C-b
|
||||
|
||||
set -g prefix C-s
|
||||
bind C-s send-prefix
|
||||
|
||||
bind-key -n C-h select-pane -L
|
||||
bind-key -n C-j select-pane -D
|
||||
bind-key -n C-k select-pane -U
|
||||
bind-key -n C-l select-pane -R
|
||||
|
||||
set-option -g status-keys "emacs"
|
||||
set-option -sa terminal-features "''${TERM}:RGB"
|
||||
|
||||
bind-key h split-window -v -c "#{pane_current_path}"
|
||||
bind-key v split-window -h -c "#{pane_current_path}"
|
||||
|
||||
bind -n S-Left resize-pane -L 2
|
||||
bind -n S-Right resize-pane -R 2
|
||||
bind -n S-Down resize-pane -D 1
|
||||
bind -n S-Up resize-pane -U 1
|
||||
|
||||
bind -n C-Left resize-pane -L 10
|
||||
bind -n C-Right resize-pane -R 10
|
||||
bind -n C-Down resize-pane -D 5
|
||||
bind -n C-Up resize-pane -U 5
|
||||
|
||||
# Status line customisation
|
||||
set-option -g status-left " "
|
||||
set-option -g status-right " #{session_name} "
|
||||
set-option -g status-right-length 100
|
||||
set-option -g status-style "fg=#7C7D83 bg=#242631"
|
||||
set-option -g window-status-activity-style none
|
||||
set-option -g window-status-current-format "#{window_index}:#{pane_current_command}#{window_flags} "
|
||||
set-option -g window-status-current-style "fg=#E9E9EA"
|
||||
set-option -g window-status-format "#{window_index}:#{pane_current_command}#{window_flags} "
|
||||
|
||||
bind c new-window -c "#{pane_current_path}"
|
||||
|
||||
set -g base-index 1
|
||||
set -g renumber-windows on
|
||||
|
||||
# Break a pane into a new window.
|
||||
bind-key b break-pane -d
|
||||
bind-key J command-prompt -p "join pane from: " "join-pane -h -s '%%'"
|
||||
|
||||
bind-key C-j choose-tree
|
||||
|
||||
# Use vim keybindings in copy mode
|
||||
setw -g mode-keys vi
|
||||
|
||||
# Setup 'v' to begin selection as in Vim
|
||||
bind-key -T copy-mode-vi 'v' send -X begin-selection
|
||||
bind-key -T copy-mode-vi 'y' send -X copy-pipe "reattach-to-user-namespace pbcopy"
|
||||
|
||||
bind C-j split-window -v "tmux list-sessions | sed -E 's/:.*$//' | grep -v \"^$(tmux display-message -p '#S')\$\" | fzf --reverse | xargs tmux switch-client -t"
|
||||
|
||||
bind-key K run-shell 'tmux switch-client -n \; kill-session -t "$(tmux display-message -p "#S")" || tmux kill-session'
|
||||
|
||||
# Allow clearing screen with ctrl-l by using <prefix> C-l
|
||||
bind C-l send-keys "C-l"
|
||||
bind C-k send-keys "C-k"
|
||||
|
||||
# Enable mouse support.
|
||||
setw -g mouse on
|
||||
|
||||
# Remove delay when switching Vim modes.
|
||||
set -sg escape-time 0
|
||||
|
||||
set-option -g pane-active-border-style "fg=#1f2335"
|
||||
set-option -g pane-border-style "fg=#1f2335"
|
||||
|
||||
# Smart pane switching with awareness of Vim splits.
|
||||
# See: https://github.com/christoomey/vim-tmux-navigator
|
||||
is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
|
||||
| grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
|
||||
|
||||
bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h' 'select-pane -L'
|
||||
bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j' 'select-pane -D'
|
||||
bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k' 'select-pane -U'
|
||||
bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l' 'select-pane -R'
|
||||
|
||||
bind-key -T copy-mode-vi 'C-h' select-pane -L
|
||||
bind-key -T copy-mode-vi 'C-j' select-pane -D
|
||||
bind-key -T copy-mode-vi 'C-k' select-pane -U
|
||||
bind-key -T copy-mode-vi 'C-l' select-pane -R
|
||||
bind-key -T copy-mode-vi 'C-\' select-pane -l
|
||||
|
||||
bind-key -r F new-window t
|
||||
bind-key -r D run-shell "t ~/Code/github.com/opdavies/dotfiles.nix"
|
||||
bind-key -r N run-shell "t ~/Code/github.com/opdavies/opdavies.nvim"
|
||||
bind-key -r W run-shell "t ~/Code/github.com/opdavies/oliverdavies.uk"
|
||||
|
||||
set -g @resurrect-strategy-nvim 'session'
|
||||
'';
|
||||
|
||||
plugins = with pkgs; [
|
||||
tmuxPlugins.resurrect
|
||||
tmuxPlugins.vim-tmux-navigator
|
||||
tmuxPlugins.yank
|
||||
];
|
||||
};
|
||||
}
|
||||
219
lib/shared/modules/zsh.nix
Normal file
219
lib/shared/modules/zsh.nix
Normal file
|
|
@ -0,0 +1,219 @@
|
|||
{
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
enableCompletion = false;
|
||||
dotDir = ".config/zsh";
|
||||
|
||||
initExtra = ''
|
||||
# Plugins
|
||||
source "''${ZPLUG_REPOS}/robbyrussell/oh-my-zsh/plugins/git/git.plugin.zsh"
|
||||
source "''${ZPLUG_REPOS}/robbyrussell/oh-my-zsh/plugins/vi-mode/vi-mode.plugin.zsh"
|
||||
|
||||
# Case insensitive autocompletion.
|
||||
zstyle ":completion:*" matcher-list "" "m:{a-zA-Z}={A-Za-z}" "r:|=*" "l:|=* r:|=*"
|
||||
autoload -Uz compinit && compinit
|
||||
|
||||
bindkey -s ^f "t\n"
|
||||
|
||||
clear-ls-all() {
|
||||
clear
|
||||
lsd -al
|
||||
}
|
||||
zle -N clear-ls-all
|
||||
|
||||
clear-git-status() {
|
||||
clear
|
||||
git status -sb .
|
||||
}
|
||||
zle -N clear-git-status
|
||||
|
||||
clear-tree-2() {
|
||||
clear
|
||||
tree -L 2
|
||||
}
|
||||
zle -N clear-tree-2
|
||||
|
||||
clear-tree-3() {
|
||||
clear
|
||||
tree -L 3
|
||||
}
|
||||
zle -N clear-tree-3
|
||||
|
||||
bindkey '^G' clear-git-status
|
||||
# bindkey '^H' clear-tree-3
|
||||
# bindkey '^J' clear-tree-2
|
||||
# bindkey '^K' clear-ls-all
|
||||
|
||||
# auto-completes aliases
|
||||
# enables to define
|
||||
# - normal aliases (completed with trailing space)
|
||||
# - blank aliases (completed without space)
|
||||
# - ignored aliases (not completed)
|
||||
|
||||
# ignored aliases
|
||||
typeset -a ialiases
|
||||
ialiases=()
|
||||
|
||||
ialias() {
|
||||
alias $@
|
||||
args="$@"
|
||||
args=''${args%%\=*}
|
||||
ialiases+=(''${args##* })
|
||||
}
|
||||
|
||||
# blank aliases
|
||||
typeset -a baliases
|
||||
baliases=()
|
||||
|
||||
balias() {
|
||||
alias $@
|
||||
args="$@"
|
||||
args=''${args%%\=*}
|
||||
baliases+=(''${args##* })
|
||||
}
|
||||
|
||||
expand-alias-space() {
|
||||
[[ $LBUFFER =~ "\<(''${(j:|:)baliases})\$" ]]; insertBlank=$?
|
||||
if [[ ! $LBUFFER =~ "\<(''${(j:|:)ialiases})\$" ]]; then
|
||||
zle _expand_alias
|
||||
fi
|
||||
|
||||
zle self-insert
|
||||
|
||||
if [[ "$insertBlank" = "0" ]]; then
|
||||
zle backward-delete-char
|
||||
fi
|
||||
}
|
||||
|
||||
zle -N expand-alias-space
|
||||
|
||||
bindkey " " expand-alias-space
|
||||
bindkey -M isearch " " magic-space
|
||||
|
||||
alias dea='direnv allow'
|
||||
alias dee='direnv edit'
|
||||
|
||||
ialias cs="create-script"
|
||||
ialias daily="run create-daily next"
|
||||
ialias fetch="git fetch --all --jobs=4 --progress --prune"
|
||||
ialias ls="lsd -la"
|
||||
ialias pull="git pull --autostash --jobs=4 --summary origin"
|
||||
ialias rebase="git rebase --autostash --stat"
|
||||
ialias reset="git reset --hard; git clean -fd"
|
||||
ialias run="./run"
|
||||
ialias s="secrets"
|
||||
ialias secrets="doppler --project \"$(whoami)\" run"
|
||||
ialias switch="run nixos nixedo switch"
|
||||
ialias sz="source ~/.config/zsh/.zshrc"
|
||||
ialias tag="tag-release"
|
||||
ialias uncommit="git reset --soft HEAD^";
|
||||
ialias update="fetch && rebase"
|
||||
ialias wip="git add . && git commit -m 'wip'";
|
||||
ialias wt="git worktree"
|
||||
balias lh3="xdg-open http://localhost:3000"
|
||||
balias lh8="xdg-open http://localhost:8000"
|
||||
|
||||
# tmux
|
||||
alias ta="tmux attach"
|
||||
alias tl="tmux list-sessions"
|
||||
alias tk="tmux kill-session"
|
||||
|
||||
# Docker and Docker Compose.
|
||||
alias dk="docker"
|
||||
alias dkp="docker ps"
|
||||
alias dkpa="docker ps -a"
|
||||
alias dkpaq="docker ps -a -q"
|
||||
alias dkb="docker build -t"
|
||||
alias dks="docker start"
|
||||
alias dkt="docker stop"
|
||||
alias dkrm="docker rm"
|
||||
alias dkri="docker rmi"
|
||||
alias dke="docker exec -ti"
|
||||
alias dkl="docker logs -f"
|
||||
alias dki="docker images"
|
||||
alias dkpu="docker pull"
|
||||
alias dkph="docker push"
|
||||
alias dkbnc="docker build --no-cache -t"
|
||||
alias dkr="docker run --rm"
|
||||
alias dkrti="docker run --rm -ti"
|
||||
alias dkc="docker compose"
|
||||
alias dkcb="docker compose build"
|
||||
alias dkcu="docker compose up"
|
||||
alias dkclean="docker ps -q -a -f status=exited | xargs -r docker rm && docker images -q -f dangling=true | xargs -r docker rmi"
|
||||
|
||||
# Nix and NixOS.
|
||||
alias nx="nix"
|
||||
alias nxb="nix build --json --no-link --print-build-logs"
|
||||
alias nxd="nix develop"
|
||||
alias nxf="nix flake"
|
||||
alias nxfu="nix flake update"
|
||||
alias nxs="nix shell"
|
||||
ialias full-system-clean='nix-collect-garbage -d && sudo nix-collect-garbage -d'
|
||||
ialias full-system-repair='nix-store --verify --check-contents --repair'
|
||||
ialias full-system-upgrade="sudo nixos-rebuild switch --upgrade && nix-env -u '*'"
|
||||
ialias list-system-configurations='\ls -l /nix/var/nix/profiles/system-*-link'
|
||||
ialias local-upgrade="nix-channel --update nixpkgs && nix-env -u '*'"
|
||||
ialias set-default-boot='/run/current-system/bin/switch-to-configuration boot'
|
||||
ialias system-rebuild='sudo nixos-rebuild switch'
|
||||
ialias system-repair='sudo nixos-rebuild switch --repair'
|
||||
ialias system-upgrade-information='sudo nixos-rebuild switch --upgrade dry-build'
|
||||
|
||||
alias tf="terraform"
|
||||
|
||||
# run scripts.
|
||||
alias r="run"
|
||||
alias rc="run composer"
|
||||
alias rd="run drush"
|
||||
alias rdcr="run drush cr"
|
||||
alias rdup="run drush updb -y"
|
||||
alias rdce="run drush config:export -y"
|
||||
alias rdci="run drush config:import -y"
|
||||
alias rduli="run drush uli"
|
||||
|
||||
# Build Configs.
|
||||
ialias build-configs="nix shell nixpkgs#php82 --command ~/Code/github.com/OliverDaviesLtd/build-configs/main/bin/build-configs app:generate"
|
||||
ialias build-configs-update-all="~/Code/github.com/OliverDaviesLtd/build-configs-updater/update.sh"
|
||||
alias bc=build-configs
|
||||
alias bcu=build-configs-update-all
|
||||
|
||||
alias -g A1="| awk '{print \$1}'"
|
||||
alias -g Fj='| jq .'
|
||||
alias -g Fy='| yq .'
|
||||
alias -g G='| grep'
|
||||
alias -g GH='| grep HTTP'
|
||||
alias -g Gi='| grep -i'
|
||||
alias -g H2='| head -n 20'
|
||||
alias -g H='| head'
|
||||
alias -g L='| less'
|
||||
alias -g V='| vim -'
|
||||
alias -g X='| xargs -I1'
|
||||
|
||||
setopt auto_cd
|
||||
setopt auto_pushd
|
||||
setopt pushd_ignore_dups
|
||||
setopt pushdminus
|
||||
'';
|
||||
|
||||
zplug = {
|
||||
enable = true;
|
||||
|
||||
plugins = [
|
||||
{
|
||||
name = "themes/robbyrussell";
|
||||
tags = ["from:oh-my-zsh" "as:theme"];
|
||||
}
|
||||
{
|
||||
name = "plugin/git";
|
||||
tags = ["from:oh-my-zsh"];
|
||||
}
|
||||
{
|
||||
name = "plugin/vi-mode";
|
||||
tags = ["from:oh-my-zsh"];
|
||||
}
|
||||
{name = "mollifier/cd-gitroot";}
|
||||
{name = "zsh-users/zsh-completions";}
|
||||
{name = "zsh-users/zsh-syntax-highlighting";}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue