refactor: delete old Ansible configuration
- Remove the Ansible files. - Move the Nix files to the root level of the repository. Refs: #39
This commit is contained in:
parent
a2bded636e
commit
7235dc60dd
98 changed files with 28 additions and 1660 deletions
178
home-manager/modules/common.nix
Normal file
178
home-manager/modules/common.nix
Normal file
|
|
@ -0,0 +1,178 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||
"intelephense"
|
||||
"postman"
|
||||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
bottom
|
||||
ctop
|
||||
delta
|
||||
file
|
||||
fzf
|
||||
gcc
|
||||
gh
|
||||
git
|
||||
git-crypt
|
||||
just
|
||||
tree-sitter
|
||||
htop
|
||||
jq
|
||||
lua
|
||||
mysql
|
||||
neofetch
|
||||
nodejs
|
||||
php81
|
||||
platformsh
|
||||
postman
|
||||
pulumi-bin
|
||||
pv
|
||||
ripgrep
|
||||
tldr
|
||||
tmuxinator
|
||||
tree
|
||||
unzip
|
||||
wget
|
||||
yarn
|
||||
zoxide
|
||||
|
||||
# LSP
|
||||
gopls
|
||||
html-tidy
|
||||
# nodePackages."@ansible/ansible-language-server"
|
||||
nodePackages."@tailwindcss/language-server"
|
||||
nodePackages.bash-language-server
|
||||
nodePackages.dockerfile-language-server-nodejs
|
||||
nodePackages.eslint
|
||||
nodePackages.intelephense
|
||||
nodePackages.markdownlint-cli
|
||||
nodePackages.prettier
|
||||
nodePackages.typescript
|
||||
nodePackages.typescript-language-server
|
||||
nodePackages.vls
|
||||
nodePackages.vscode-langservers-extracted
|
||||
nodePackages.yaml-language-server
|
||||
php81Packages.phpcbf
|
||||
php81Packages.phpcs
|
||||
php81Packages.phpstan
|
||||
rnix-lsp
|
||||
shellcheck
|
||||
sumneko-lua-language-server
|
||||
];
|
||||
|
||||
programs.bat.enable = true;
|
||||
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
plugins = let
|
||||
phpactor = pkgs.vimUtils.buildVimPlugin {
|
||||
name = "phpactor";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "phpactor";
|
||||
repo = "phpactor";
|
||||
rev = "master";
|
||||
sha256 = "0bgfwidrlaqxnjmk14gqc8b0mxh0c5xf098qcjz9mvw236n88xl7";
|
||||
};
|
||||
};
|
||||
|
||||
vim-astro = pkgs.vimUtils.buildVimPlugin {
|
||||
name = "vim-astro";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "wuelnerdotexe";
|
||||
repo = "vim-astro";
|
||||
rev = "main";
|
||||
sha256 = "HyQ4i/T1uQmGurBqCpo8+ESVSVPsTrLQBxLe2OEYjcY=";
|
||||
};
|
||||
};
|
||||
in
|
||||
with pkgs.vimPlugins; [
|
||||
vim-astro
|
||||
|
||||
comment-nvim
|
||||
git-worktree-nvim
|
||||
gitsigns-nvim
|
||||
harpoon
|
||||
impatient-nvim
|
||||
indent-blankline-nvim
|
||||
neogit
|
||||
nvim-web-devicons
|
||||
refactoring-nvim
|
||||
rest-nvim
|
||||
splitjoin-vim
|
||||
vim-abolish
|
||||
vim-highlightedyank
|
||||
vim-polyglot
|
||||
vim-repeat
|
||||
vim-surround
|
||||
vim-test
|
||||
vim-tmux-navigator
|
||||
vimux
|
||||
|
||||
# Debugging
|
||||
nvim-dap
|
||||
nvim-dap-ui
|
||||
nvim-dap-virtual-text
|
||||
|
||||
# Treesitter
|
||||
nvim-treesitter
|
||||
nvim-treesitter-context
|
||||
nvim-treesitter-textobjects
|
||||
|
||||
# LSP
|
||||
null-ls-nvim
|
||||
nvim-lspconfig
|
||||
lsp-status-nvim
|
||||
|
||||
# Completion
|
||||
cmp-buffer
|
||||
cmp-cmdline
|
||||
cmp-nvim-lsp
|
||||
cmp-path
|
||||
cmp-tabnine
|
||||
cmp-treesitter
|
||||
cmp-vsnip
|
||||
cmp_luasnip
|
||||
lspkind-nvim
|
||||
nvim-cmp
|
||||
|
||||
# Snippets
|
||||
luasnip
|
||||
|
||||
# Telescope
|
||||
plenary-nvim
|
||||
popup-nvim
|
||||
telescope-file-browser-nvim
|
||||
telescope-fzf-native-nvim
|
||||
telescope-nvim
|
||||
telescope-ui-select-nvim
|
||||
|
||||
# Git
|
||||
# neogit
|
||||
|
||||
# Databases
|
||||
vim-dadbod
|
||||
vim-dadbod-ui
|
||||
vim-dadbod-completion
|
||||
|
||||
# Themes
|
||||
catppuccin-nvim
|
||||
nightfox-nvim
|
||||
onehalf
|
||||
];
|
||||
};
|
||||
|
||||
home.sessionPath = [
|
||||
"$HOME/.config/bin"
|
||||
];
|
||||
|
||||
xdg.configFile.bin = {
|
||||
source = ../../../bin;
|
||||
recursive = true;
|
||||
};
|
||||
|
||||
xdg.configFile.nvim = {
|
||||
source = ../../../config/neovim;
|
||||
recursive = true;
|
||||
};
|
||||
}
|
||||
90
home-manager/modules/git.nix
Normal file
90
home-manager/modules/git.nix
Normal file
|
|
@ -0,0 +1,90 @@
|
|||
{ config, pkgs, lib, libs, ... }:
|
||||
{
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userName = "Oliver Davies";
|
||||
userEmail = "oliver@oliverdavies.uk";
|
||||
|
||||
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 -";
|
||||
nah = "!git reset --hard && git clean -fd";
|
||||
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)";
|
||||
wip = "!git add . && git commit -m 'wip'";
|
||||
worktrees = "worktree list";
|
||||
};
|
||||
|
||||
extraConfig = {
|
||||
branch = {
|
||||
autosetupmerge = true;
|
||||
autosetuprebase = "always";
|
||||
};
|
||||
checkout.defaultRemote = "origin";
|
||||
color.ui = true;
|
||||
commit = {
|
||||
template = "~/.gitmessage";
|
||||
};
|
||||
core = {
|
||||
editor = "nvim";
|
||||
excludesFile = "~/.gitignore-global";
|
||||
pager = "delta";
|
||||
};
|
||||
delta.line-numbers = true;
|
||||
diff.tool = "vimdiff";
|
||||
fetch.prune = true;
|
||||
grep.lineNumber = true;
|
||||
help.autocorrect = "1";
|
||||
init.templatedir = "~/.git_template";
|
||||
merge.ff = "only";
|
||||
rebase = {
|
||||
autosquash = true;
|
||||
autostash = true;
|
||||
};
|
||||
push.default = "upstream";
|
||||
pull = {
|
||||
ff = "only";
|
||||
rebase = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
9
home-manager/modules/home-manager.nix
Normal file
9
home-manager/modules/home-manager.nix
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{ config, pkgs, ... }:
|
||||
{
|
||||
home.username = "opdavies";
|
||||
home.homeDirectory = "/home/opdavies";
|
||||
|
||||
home.stateVersion = "22.05";
|
||||
|
||||
programs.home-manager.enable = true;
|
||||
}
|
||||
104
home-manager/modules/tmux.nix
Normal file
104
home-manager/modules/tmux.nix
Normal file
|
|
@ -0,0 +1,104 @@
|
|||
{ config, pkgs, lib, libs, ... }:
|
||||
{
|
||||
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 -ga terminal-overrides ",*256col*:Tc"
|
||||
set-option -g default-terminal "screen-256color"
|
||||
|
||||
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-length 100
|
||||
set-option -g status-right-length 100
|
||||
set-option -g status-left " #{session_name} "
|
||||
set-option -g status-right "#{pane_title} "
|
||||
set-option -g status-style "fg=#7C7D83 bg=#242631"
|
||||
set-option -g window-status-format "#{window_index}:#{pane_current_command}#{window_flags} "
|
||||
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-activity-style none
|
||||
|
||||
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 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
|
||||
|
||||
# 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-\\' if-shell "$is_vim" 'send-keys C-\\\\' 'select-pane -l'
|
||||
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/dotfiles"
|
||||
'';
|
||||
|
||||
plugins = with pkgs; [
|
||||
tmuxPlugins.resurrect
|
||||
tmuxPlugins.vim-tmux-navigator
|
||||
tmuxPlugins.yank
|
||||
];
|
||||
};
|
||||
}
|
||||
52
home-manager/modules/zsh.nix
Normal file
52
home-manager/modules/zsh.nix
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{ config, pkgs, lib, libs, ... }:
|
||||
{
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
enableCompletion = false;
|
||||
dotDir = ".config/zsh";
|
||||
|
||||
shellAliases = {
|
||||
fetch = "git fetch --all --jobs=4 --progress --prune";
|
||||
run = "./run";
|
||||
pull = "git pull --autostash --jobs=4 --summary origin";
|
||||
rebase = "git rebase --autostash --stat";
|
||||
update = "fetch && rebase";
|
||||
};
|
||||
|
||||
initExtra = ''
|
||||
if [ -f ~/.config/zsh/.p10k.zsh ]; then
|
||||
. ~/.config/zsh/.p10k.zsh
|
||||
fi
|
||||
|
||||
eval "$(zoxide init zsh)"
|
||||
|
||||
# Case insensitive autocompletion.
|
||||
zstyle ":completion:*" matcher-list "" "m:{a-zA-Z}={A-Za-z}" "r:|=*" "l:|=* r:|=*"
|
||||
autoload -Uz compinit && compinit
|
||||
|
||||
# No arguments: `git status`
|
||||
# With arguments: acts like `git`
|
||||
g() {
|
||||
if [[ $# -gt 0 ]]; then
|
||||
git "$@"
|
||||
else
|
||||
git status
|
||||
fi
|
||||
}
|
||||
|
||||
compdef g=git
|
||||
'';
|
||||
|
||||
zplug = {
|
||||
enable = true;
|
||||
|
||||
plugins = [
|
||||
{ name = "mollifier/cd-gitroot"; }
|
||||
{ name = "romkatv/powerlevel10k"; tags = [ as:theme depth:1 ]; }
|
||||
{ name = "zsh-users/zsh-autosuggestions"; }
|
||||
{ name = "zsh-users/zsh-completions"; }
|
||||
{ name = "zsh-users/zsh-syntax-highlighting"; }
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue