Refactor NixOS and Home Manager modules
This makes them more modular and configurable by allowing features to be
enabled per-host.
Squashed commit of the following:
commit e9896d6166125de7aa26ddc63dac3adb196e8c23
Author: Oliver Davies <oliver@oliverdavies.dev>
Date: Mon Nov 25 23:06:23 2024 +0000
Use mkMerge
To ensure features isn't overridden and values aren't lost accidentally
commit c9c8ff5d059f08ade3aee9bb4e25bd51d4817a6d
Author: Oliver Davies <oliver@oliverdavies.dev>
Date: Mon Nov 25 22:56:38 2024 +0000
Move NixOS module imports
commit 4a85bbac9dfa8f06825f6b1fee45ef27befa16d3
Author: Oliver Davies <oliver@oliverdavies.dev>
Date: Mon Nov 25 22:39:54 2024 +0000
Move Home Manager module imports
commit 6d7a1b0aac68ccc8649fa2d8cd6e8b17ecebb4f0
Author: Oliver Davies <oliver@oliverdavies.dev>
Date: Mon Nov 25 21:15:54 2024 +0000
Add host-specific Home Manager configurations
commit b32da2fbf7498c9684d8289be0f02800994e9110
Author: Oliver Davies <oliver@oliverdavies.dev>
Date: Mon Nov 25 18:00:00 2024 +0000
Start to parameterise Home Manager modules
commit e80e89b415849cc4c6051a07b70587ac98724e2c
Author: Oliver Davies <oliver@oliverdavies.dev>
Date: Mon Nov 25 18:00:00 2024 +0000
Rename wsl commands to home-manager
commit 6d82ed73da3c104fb25117fb843c3f3b5d833180
Author: Oliver Davies <oliver@oliverdavies.dev>
Date: Mon Nov 25 18:00:00 2024 +0000
Refactor NixOS Home Manager configuration
commit cc5cbf5ac1a407a456d7258dd65a78ba3128a88f
Author: Oliver Davies <oliver@oliverdavies.dev>
Date: Mon Nov 25 08:05:00 2024 +0000
Refactor WSL Home Manager configuration
commit deaf664a0997871b6f2bb0a8f97d638a91cb10bc
Author: Oliver Davies <oliver@oliverdavies.dev>
Date: Mon Nov 25 08:04:00 2024 +0000
Refactor lemp11 configuration
This commit is contained in:
parent
7973d6ebad
commit
af9edbfe1a
31 changed files with 673 additions and 843 deletions
|
|
@ -1,201 +1,211 @@
|
|||
{ inputs, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
options.features.cli.neovim.enable = lib.mkEnableOption "Enable neovim";
|
||||
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
comment-nvim
|
||||
dial-nvim
|
||||
fidget-nvim
|
||||
gitsigns-nvim
|
||||
harpoon
|
||||
impatient-nvim
|
||||
mini-nvim
|
||||
neodev-nvim
|
||||
nvim-spectre
|
||||
nvim-web-devicons
|
||||
oil-nvim
|
||||
refactoring-nvim
|
||||
sort-nvim
|
||||
treesj
|
||||
undotree
|
||||
vim-abolish
|
||||
vim-eunuch
|
||||
vim-highlightedyank
|
||||
vim-just
|
||||
vim-nix
|
||||
vim-obsession
|
||||
vim-pasta
|
||||
vim-repeat
|
||||
vim-sleuth
|
||||
vim-sort-motion
|
||||
vim-terraform
|
||||
vim-textobj-user
|
||||
vim-unimpaired
|
||||
config = lib.mkIf config.features.cli.neovim.enable {
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
|
||||
conf-vim
|
||||
edit-alternate-vim
|
||||
nvim-tmux-navigation
|
||||
standard-vim
|
||||
vim-autoread
|
||||
vim-textobj-indent
|
||||
vim-textobj-xmlattr
|
||||
vim-zoom
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
comment-nvim
|
||||
dial-nvim
|
||||
fidget-nvim
|
||||
gitsigns-nvim
|
||||
harpoon
|
||||
impatient-nvim
|
||||
mini-nvim
|
||||
neodev-nvim
|
||||
nvim-spectre
|
||||
nvim-web-devicons
|
||||
oil-nvim
|
||||
refactoring-nvim
|
||||
sort-nvim
|
||||
treesj
|
||||
undotree
|
||||
vim-abolish
|
||||
vim-eunuch
|
||||
vim-highlightedyank
|
||||
vim-just
|
||||
vim-nix
|
||||
vim-obsession
|
||||
vim-pasta
|
||||
vim-repeat
|
||||
vim-sleuth
|
||||
vim-sort-motion
|
||||
vim-terraform
|
||||
vim-textobj-user
|
||||
vim-unimpaired
|
||||
|
||||
# Testing
|
||||
vim-test
|
||||
conf-vim
|
||||
edit-alternate-vim
|
||||
nvim-tmux-navigation
|
||||
standard-vim
|
||||
vim-autoread
|
||||
vim-textobj-indent
|
||||
vim-textobj-xmlattr
|
||||
vim-zoom
|
||||
|
||||
# Git
|
||||
committia-vim
|
||||
diffview-nvim
|
||||
vim-fugitive
|
||||
# Testing
|
||||
vim-test
|
||||
|
||||
# Debugging
|
||||
nvim-dap
|
||||
nvim-dap-ui
|
||||
nvim-dap-virtual-text
|
||||
# Git
|
||||
committia-vim
|
||||
diffview-nvim
|
||||
vim-fugitive
|
||||
|
||||
# Treesitter
|
||||
(pkgs.vimPlugins.nvim-treesitter.withPlugins (
|
||||
plugins: with plugins; [
|
||||
bash
|
||||
comment
|
||||
css
|
||||
csv
|
||||
dockerfile
|
||||
gitattributes
|
||||
gitignore
|
||||
go
|
||||
html
|
||||
javascript
|
||||
json
|
||||
kdl
|
||||
lua
|
||||
luadoc
|
||||
make
|
||||
markdown
|
||||
markdown_inline
|
||||
nix
|
||||
php
|
||||
phpdoc
|
||||
query
|
||||
rst
|
||||
scss
|
||||
sql
|
||||
terraform
|
||||
twig
|
||||
typescript
|
||||
vim
|
||||
vimdoc
|
||||
vue
|
||||
xml
|
||||
yaml
|
||||
]
|
||||
))
|
||||
nvim-treesitter-textobjects
|
||||
# Debugging
|
||||
nvim-dap
|
||||
nvim-dap-ui
|
||||
nvim-dap-virtual-text
|
||||
|
||||
# LSP, linting and formatting
|
||||
conform-nvim
|
||||
lsp-status-nvim
|
||||
nvim-lint
|
||||
nvim-lspconfig
|
||||
# Treesitter
|
||||
(pkgs.vimPlugins.nvim-treesitter.withPlugins (
|
||||
plugins: with plugins; [
|
||||
bash
|
||||
comment
|
||||
css
|
||||
csv
|
||||
dockerfile
|
||||
gitattributes
|
||||
gitignore
|
||||
go
|
||||
html
|
||||
javascript
|
||||
json
|
||||
kdl
|
||||
lua
|
||||
luadoc
|
||||
make
|
||||
markdown
|
||||
markdown_inline
|
||||
nix
|
||||
php
|
||||
phpdoc
|
||||
query
|
||||
rst
|
||||
scss
|
||||
sql
|
||||
terraform
|
||||
twig
|
||||
typescript
|
||||
vim
|
||||
vimdoc
|
||||
vue
|
||||
xml
|
||||
yaml
|
||||
]
|
||||
))
|
||||
nvim-treesitter-textobjects
|
||||
|
||||
# Completion
|
||||
cmp-buffer
|
||||
cmp-calc
|
||||
cmp-cmdline
|
||||
cmp-nvim-lsp
|
||||
cmp-path
|
||||
cmp-treesitter
|
||||
cmp_luasnip
|
||||
lspkind-nvim
|
||||
nvim-cmp
|
||||
# LSP, linting and formatting
|
||||
conform-nvim
|
||||
lsp-status-nvim
|
||||
nvim-lint
|
||||
nvim-lspconfig
|
||||
|
||||
# Snippets
|
||||
friendly-snippets
|
||||
luasnip
|
||||
# Completion
|
||||
cmp-buffer
|
||||
cmp-calc
|
||||
cmp-cmdline
|
||||
cmp-nvim-lsp
|
||||
cmp-path
|
||||
cmp-treesitter
|
||||
cmp_luasnip
|
||||
lspkind-nvim
|
||||
nvim-cmp
|
||||
|
||||
# Telescope
|
||||
plenary-nvim
|
||||
popup-nvim
|
||||
telescope-frecency-nvim
|
||||
telescope-fzf-native-nvim
|
||||
telescope-live-grep-args-nvim
|
||||
telescope-nvim
|
||||
telescope-ui-select-nvim
|
||||
# Snippets
|
||||
friendly-snippets
|
||||
luasnip
|
||||
|
||||
# Databases
|
||||
vim-dadbod
|
||||
vim-dadbod-ui
|
||||
vim-dadbod-completion
|
||||
# Telescope
|
||||
plenary-nvim
|
||||
popup-nvim
|
||||
telescope-frecency-nvim
|
||||
telescope-fzf-native-nvim
|
||||
telescope-live-grep-args-nvim
|
||||
telescope-nvim
|
||||
telescope-ui-select-nvim
|
||||
|
||||
# Themes
|
||||
catppuccin-nvim
|
||||
# Databases
|
||||
vim-dadbod
|
||||
vim-dadbod-ui
|
||||
vim-dadbod-completion
|
||||
|
||||
# Configuration.
|
||||
inputs.self.packages.${pkgs.system}.opdavies-nvim
|
||||
];
|
||||
# Themes
|
||||
catppuccin-nvim
|
||||
|
||||
extraLuaConfig = ''
|
||||
if vim.loader then
|
||||
vim.loader.enable()
|
||||
end
|
||||
# Configuration.
|
||||
inputs.self.packages.${pkgs.system}.opdavies-nvim
|
||||
];
|
||||
|
||||
require "opdavies"
|
||||
extraLuaConfig = ''
|
||||
if vim.loader then
|
||||
vim.loader.enable()
|
||||
end
|
||||
|
||||
require "opdavies"
|
||||
'';
|
||||
|
||||
extraPackages = with pkgs; [
|
||||
# Languages
|
||||
nodePackages.typescript
|
||||
nodejs-slim
|
||||
php81
|
||||
|
||||
# Language servers
|
||||
gopls
|
||||
lua-language-server
|
||||
lua54Packages.luacheck
|
||||
marksman
|
||||
nixd
|
||||
nodePackages."@tailwindcss/language-server"
|
||||
nodePackages.bash-language-server
|
||||
nodePackages.dockerfile-language-server-nodejs
|
||||
nodePackages.intelephense
|
||||
nodePackages.typescript-language-server
|
||||
nodePackages.vls
|
||||
nodePackages.vscode-langservers-extracted
|
||||
nodePackages.vue-language-server
|
||||
nodePackages.yaml-language-server
|
||||
phpactor
|
||||
terraform-ls
|
||||
|
||||
# Formatters
|
||||
black
|
||||
eslint_d
|
||||
nixfmt-rfc-style
|
||||
nodePackages.prettier
|
||||
stylua
|
||||
yamlfmt
|
||||
|
||||
# Tools
|
||||
hadolint
|
||||
html-tidy
|
||||
nodePackages.jsonlint
|
||||
nodePackages.markdownlint-cli
|
||||
php82Packages.php-codesniffer
|
||||
php82Packages.phpstan
|
||||
proselint
|
||||
shellcheck
|
||||
yamllint
|
||||
];
|
||||
};
|
||||
|
||||
home.file.".markdownlint.yaml".text = ''
|
||||
default: true
|
||||
|
||||
line-length: false
|
||||
|
||||
no-duplicate-heading:
|
||||
siblings_only: true
|
||||
'';
|
||||
|
||||
extraPackages = with pkgs; [
|
||||
# Languages
|
||||
nodePackages.typescript
|
||||
nodejs-slim
|
||||
php81
|
||||
|
||||
# Language servers
|
||||
gopls
|
||||
lua-language-server
|
||||
lua54Packages.luacheck
|
||||
marksman
|
||||
nixd
|
||||
nodePackages."@tailwindcss/language-server"
|
||||
nodePackages.bash-language-server
|
||||
nodePackages.dockerfile-language-server-nodejs
|
||||
nodePackages.intelephense
|
||||
nodePackages.typescript-language-server
|
||||
nodePackages.vls
|
||||
nodePackages.vscode-langservers-extracted
|
||||
nodePackages.vue-language-server
|
||||
nodePackages.yaml-language-server
|
||||
phpactor
|
||||
terraform-ls
|
||||
|
||||
# Formatters
|
||||
black
|
||||
eslint_d
|
||||
nixfmt-rfc-style
|
||||
nodePackages.prettier
|
||||
stylua
|
||||
yamlfmt
|
||||
|
||||
# Tools
|
||||
hadolint
|
||||
html-tidy
|
||||
nodePackages.jsonlint
|
||||
nodePackages.markdownlint-cli
|
||||
php82Packages.php-codesniffer
|
||||
php82Packages.phpstan
|
||||
proselint
|
||||
shellcheck
|
||||
yamllint
|
||||
];
|
||||
};
|
||||
|
||||
home.file.".markdownlint.yaml".text = ''
|
||||
default: true
|
||||
|
||||
line-length: false
|
||||
|
||||
no-duplicate-heading:
|
||||
siblings_only: true
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue