refactor: extract a common module
diff --git a/configuration/pop-os/default.nix b/configuration/pop-os/default.nix
index 9ed9e69..2287793 100644
--- a/configuration/pop-os/default.nix
+++ b/configuration/pop-os/default.nix
@@ -3,6 +3,7 @@
{
imports = [
../../home-manager/modules/alacritty.nix
+ ../../home-manager/modules/common.nix
../../home-manager/modules/git.nix
../../home-manager/modules/home-manager.nix
../../home-manager/modules/tmux.nix
@@ -15,9 +16,5 @@
docker
docker-compose
jetbrains-mono
- just
- neovim
];
-
- programs.bat.enable = true;
}
diff --git a/configuration/wsl2/default.nix b/configuration/wsl2/default.nix
index 84c1242..de6afe3 100644
--- a/configuration/wsl2/default.nix
+++ b/configuration/wsl2/default.nix
@@ -2,17 +2,10 @@
{
imports = [
+ ../../home-manager/modules/common.nix
../../home-manager/modules/git.nix
../../home-manager/modules/home-manager.nix
../../home-manager/modules/tmux.nix
../../home-manager/modules/zsh.nix
];
-
- home.packages = with pkgs; [
- just
- neovim
- zsh
- ];
-
- programs.bat.enable = true;
}
diff --git a/home-manager/modules/common.nix b/home-manager/modules/common.nix
new file mode 100644
index 0000000..0a77fe8
--- /dev/null
+++ b/home-manager/modules/common.nix
@@ -0,0 +1,9 @@
+{ config, lib, pkgs, ... }:
+{
+ home.packages = with pkgs; [
+ just
+ neovim
+ ];
+
+ programs.bat.enable = true;
+}
2022-09-27 17:37:05 +00:00
|
|
|
{ config, lib, pkgs, ... }:
|
|
|
|
{
|
|
|
|
home.packages = with pkgs; [
|
|
|
|
just
|
|
|
|
];
|
|
|
|
|
|
|
|
programs.bat.enable = true;
|
2022-09-28 07:23:10 +00:00
|
|
|
|
|
|
|
programs.neovim = {
|
|
|
|
enable = true;
|
|
|
|
vimAlias = true;
|
|
|
|
plugins = with pkgs; [
|
|
|
|
vimPlugins.comment-nvim
|
|
|
|
vimPlugins.git-worktree-nvim
|
|
|
|
vimPlugins.gitsigns-nvim
|
|
|
|
vimPlugins.harpoon
|
|
|
|
vimPlugins.impatient-nvim
|
|
|
|
vimPlugins.nvim-web-devicons
|
|
|
|
vimPlugins.refactoring-nvim
|
|
|
|
vimPlugins.rest-nvim
|
|
|
|
vimPlugins.vim-abolish
|
|
|
|
vimPlugins.vim-highlightedyank
|
|
|
|
vimPlugins.vim-polyglot
|
|
|
|
vimPlugins.vim-repeat
|
|
|
|
vimPlugins.vim-surround
|
|
|
|
vimPlugins.vim-test
|
|
|
|
|
|
|
|
# Treesitter
|
|
|
|
vimPlugins.nvim-treesitter
|
|
|
|
vimPlugins.nvim-treesitter-context
|
|
|
|
vimPlugins.nvim-treesitter-textobjects
|
|
|
|
|
|
|
|
# LSP
|
|
|
|
vimPlugins.null-ls-nvim
|
|
|
|
vimPlugins.nvim-lspconfig
|
|
|
|
vimPlugins.lsp-status-nvim
|
|
|
|
|
|
|
|
# Completion
|
|
|
|
vimPlugins.cmp-buffer
|
|
|
|
vimPlugins.cmp-cmdline
|
|
|
|
vimPlugins.cmp-nvim-lsp
|
|
|
|
vimPlugins.cmp-path
|
|
|
|
vimPlugins.cmp-treesitter
|
|
|
|
vimPlugins.cmp-vsnip
|
|
|
|
vimPlugins.cmp_luasnip
|
|
|
|
vimPlugins.lspkind-nvim
|
|
|
|
vimPlugins.nvim-cmp
|
|
|
|
|
|
|
|
vimPlugins.luasnip
|
|
|
|
|
|
|
|
# Telescope
|
|
|
|
vimPlugins.plenary-nvim
|
|
|
|
vimPlugins.popup-nvim
|
|
|
|
vimPlugins.telescope-file-browser-nvim
|
|
|
|
vimPlugins.telescope-fzf-native-nvim
|
|
|
|
vimPlugins.telescope-nvim
|
|
|
|
vimPlugins.telescope-ui-select-nvim
|
|
|
|
|
|
|
|
# Git
|
|
|
|
vimPlugins.neogit
|
|
|
|
|
|
|
|
# Databases
|
|
|
|
vimPlugins.vim-dadbod
|
|
|
|
vimPlugins.vim-dadbod-ui
|
|
|
|
vimPlugins.vim-dadbod-completion
|
|
|
|
|
|
|
|
# Themes
|
|
|
|
vimPlugins.nightfox-nvim
|
|
|
|
];
|
|
|
|
};
|
refactor: extract a common module
diff --git a/configuration/pop-os/default.nix b/configuration/pop-os/default.nix
index 9ed9e69..2287793 100644
--- a/configuration/pop-os/default.nix
+++ b/configuration/pop-os/default.nix
@@ -3,6 +3,7 @@
{
imports = [
../../home-manager/modules/alacritty.nix
+ ../../home-manager/modules/common.nix
../../home-manager/modules/git.nix
../../home-manager/modules/home-manager.nix
../../home-manager/modules/tmux.nix
@@ -15,9 +16,5 @@
docker
docker-compose
jetbrains-mono
- just
- neovim
];
-
- programs.bat.enable = true;
}
diff --git a/configuration/wsl2/default.nix b/configuration/wsl2/default.nix
index 84c1242..de6afe3 100644
--- a/configuration/wsl2/default.nix
+++ b/configuration/wsl2/default.nix
@@ -2,17 +2,10 @@
{
imports = [
+ ../../home-manager/modules/common.nix
../../home-manager/modules/git.nix
../../home-manager/modules/home-manager.nix
../../home-manager/modules/tmux.nix
../../home-manager/modules/zsh.nix
];
-
- home.packages = with pkgs; [
- just
- neovim
- zsh
- ];
-
- programs.bat.enable = true;
}
diff --git a/home-manager/modules/common.nix b/home-manager/modules/common.nix
new file mode 100644
index 0000000..0a77fe8
--- /dev/null
+++ b/home-manager/modules/common.nix
@@ -0,0 +1,9 @@
+{ config, lib, pkgs, ... }:
+{
+ home.packages = with pkgs; [
+ just
+ neovim
+ ];
+
+ programs.bat.enable = true;
+}
2022-09-27 17:37:05 +00:00
|
|
|
}
|