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, ... }:
|
2022-12-27 17:01:25 +00:00
|
|
|
let
|
|
|
|
in {
|
2022-09-29 19:59:38 +00:00
|
|
|
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
|
|
|
"intelephense"
|
2022-12-19 09:41:30 +00:00
|
|
|
"postman"
|
2022-09-29 19:59:38 +00:00
|
|
|
];
|
|
|
|
|
2023-03-22 22:56:56 +00:00
|
|
|
home.packages = (import ./packages.nix) { inherit pkgs; };
|
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
|
|
|
|
2023-04-27 18:01:36 +00:00
|
|
|
home.file."nodemon.json".text = ''
|
|
|
|
{
|
|
|
|
"ignore": [
|
|
|
|
".git"
|
|
|
|
],
|
|
|
|
"verbose": true,
|
|
|
|
"events": {
|
|
|
|
"start": "clear"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
'';
|
|
|
|
|
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
|
|
|
programs.bat.enable = true;
|
2022-09-28 07:23:10 +00:00
|
|
|
|
|
|
|
programs.neovim = {
|
|
|
|
enable = true;
|
2023-02-07 20:23:05 +00:00
|
|
|
package = pkgs.neovim-nightly;
|
2023-04-05 17:00:00 +00:00
|
|
|
viAlias = true;
|
|
|
|
vimAlias = true;
|
2023-02-07 20:23:05 +00:00
|
|
|
|
2023-03-22 23:21:57 +00:00
|
|
|
plugins = with pkgs; [
|
2023-04-05 17:00:00 +00:00
|
|
|
customVim.tabline-vim
|
|
|
|
customVim.vim-astro
|
|
|
|
customVim.vim-caser
|
|
|
|
customVim.vim-heritage
|
|
|
|
customVim.vim-just
|
|
|
|
customVim.vim-textobj-xmlattr
|
|
|
|
customVim.vim-visual-star-search
|
2023-01-04 22:16:14 +00:00
|
|
|
|
2022-12-27 17:01:25 +00:00
|
|
|
vimPlugins.comment-nvim
|
|
|
|
vimPlugins.dial-nvim
|
|
|
|
vimPlugins.git-worktree-nvim
|
|
|
|
vimPlugins.gitsigns-nvim
|
|
|
|
vimPlugins.harpoon
|
|
|
|
vimPlugins.impatient-nvim
|
|
|
|
vimPlugins.indent-blankline-nvim
|
2023-01-04 22:16:14 +00:00
|
|
|
vimPlugins.nvim-autopairs
|
|
|
|
vimPlugins.nvim-lastplace
|
2023-01-30 22:07:04 +00:00
|
|
|
vimPlugins.nvim-ts-autotag
|
2022-12-27 17:01:25 +00:00
|
|
|
vimPlugins.nvim-web-devicons
|
|
|
|
vimPlugins.refactoring-nvim
|
|
|
|
vimPlugins.rest-nvim
|
|
|
|
vimPlugins.splitjoin-vim
|
|
|
|
vimPlugins.vim-abolish
|
2023-01-04 22:16:14 +00:00
|
|
|
vimPlugins.vim-eunuch
|
2022-12-28 17:35:11 +00:00
|
|
|
vimPlugins.vim-floaterm
|
2022-12-27 17:01:25 +00:00
|
|
|
vimPlugins.vim-highlightedyank
|
2023-03-22 22:22:08 +00:00
|
|
|
vimPlugins.vim-nix
|
2023-01-04 22:16:14 +00:00
|
|
|
vimPlugins.vim-pasta
|
2022-12-27 17:01:25 +00:00
|
|
|
vimPlugins.vim-polyglot
|
|
|
|
vimPlugins.vim-repeat
|
2023-01-04 22:16:14 +00:00
|
|
|
vimPlugins.vim-sleuth
|
2022-12-27 17:01:25 +00:00
|
|
|
vimPlugins.vim-surround
|
2023-04-11 19:03:06 +00:00
|
|
|
vimPlugins.vim-terraform
|
2022-12-27 17:01:25 +00:00
|
|
|
vimPlugins.vim-test
|
2023-01-04 22:16:14 +00:00
|
|
|
vimPlugins.vim-textobj-user
|
2022-12-27 17:01:25 +00:00
|
|
|
vimPlugins.vim-tmux-navigator
|
2023-01-04 22:16:14 +00:00
|
|
|
vimPlugins.vim-unimpaired
|
2022-12-27 17:01:25 +00:00
|
|
|
vimPlugins.vimux
|
2022-09-28 07:23:10 +00:00
|
|
|
|
2023-02-09 07:37:05 +00:00
|
|
|
# Git
|
|
|
|
vimPlugins.vim-fugitive
|
|
|
|
vimPlugins.vim-rhubarb
|
|
|
|
vimPlugins.neogit
|
|
|
|
|
2022-10-14 09:54:25 +00:00
|
|
|
# Debugging
|
2022-12-27 17:01:25 +00:00
|
|
|
vimPlugins.nvim-dap
|
|
|
|
vimPlugins.nvim-dap-ui
|
|
|
|
vimPlugins.nvim-dap-virtual-text
|
2022-10-14 09:54:25 +00:00
|
|
|
|
2022-10-04 08:21:39 +00:00
|
|
|
# Treesitter
|
2023-04-17 16:56:53 +00:00
|
|
|
vimPlugins.nvim-treesitter.withAllGrammars
|
2022-12-27 17:01:25 +00:00
|
|
|
vimPlugins.nvim-treesitter-context
|
|
|
|
vimPlugins.nvim-treesitter-textobjects
|
2022-09-28 07:23:10 +00:00
|
|
|
|
2022-10-04 08:21:39 +00:00
|
|
|
# LSP
|
2022-12-27 17:01:25 +00:00
|
|
|
vimPlugins.null-ls-nvim
|
|
|
|
vimPlugins.nvim-lspconfig
|
|
|
|
vimPlugins.lsp-status-nvim
|
2023-04-18 10:43:50 +00:00
|
|
|
vimPlugins.lsp-zero-nvim
|
2022-10-04 08:21:39 +00:00
|
|
|
|
|
|
|
# Completion
|
2022-12-27 17:01:25 +00:00
|
|
|
vimPlugins.cmp-buffer
|
|
|
|
vimPlugins.cmp-cmdline
|
|
|
|
vimPlugins.cmp-nvim-lsp
|
|
|
|
vimPlugins.cmp-nvim-lsp-signature-help
|
|
|
|
vimPlugins.cmp-path
|
|
|
|
vimPlugins.cmp-tabnine
|
|
|
|
vimPlugins.cmp-treesitter
|
|
|
|
vimPlugins.cmp-vsnip
|
|
|
|
vimPlugins.cmp_luasnip
|
|
|
|
vimPlugins.lspkind-nvim
|
|
|
|
vimPlugins.nvim-cmp
|
2022-12-04 15:52:32 +00:00
|
|
|
|
|
|
|
# Snippets
|
2022-12-27 17:01:25 +00:00
|
|
|
vimPlugins.luasnip
|
2022-10-04 08:21:39 +00:00
|
|
|
|
|
|
|
# Telescope
|
2022-12-27 17:01:25 +00:00
|
|
|
vimPlugins.plenary-nvim
|
|
|
|
vimPlugins.popup-nvim
|
|
|
|
vimPlugins.telescope-file-browser-nvim
|
2023-03-22 22:22:08 +00:00
|
|
|
vimPlugins.telescope-frecency-nvim
|
2022-12-27 17:01:25 +00:00
|
|
|
vimPlugins.telescope-fzf-native-nvim
|
2023-02-07 20:23:44 +00:00
|
|
|
vimPlugins.telescope-live-grep-args-nvim
|
2022-12-27 17:01:25 +00:00
|
|
|
vimPlugins.telescope-nvim
|
|
|
|
vimPlugins.telescope-ui-select-nvim
|
2022-12-20 19:58:39 +00:00
|
|
|
|
2022-10-04 08:21:39 +00:00
|
|
|
# Databases
|
2022-12-27 17:01:25 +00:00
|
|
|
vimPlugins.vim-dadbod
|
|
|
|
vimPlugins.vim-dadbod-ui
|
|
|
|
vimPlugins.vim-dadbod-completion
|
2022-10-04 08:21:39 +00:00
|
|
|
|
|
|
|
# Themes
|
2023-03-22 22:46:08 +00:00
|
|
|
vimPlugins.catppuccin-nvim
|
|
|
|
];
|
|
|
|
|
|
|
|
extraPackages = with pkgs; [
|
|
|
|
ansible-language-server
|
|
|
|
black
|
|
|
|
gopls
|
|
|
|
html-tidy
|
|
|
|
lua53Packages.lua-lsp
|
|
|
|
nodePackages."@astrojs/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
|
2023-04-18 10:43:50 +00:00
|
|
|
nodePackages.vue-language-server
|
2023-03-22 22:46:08 +00:00
|
|
|
nodePackages.vls
|
|
|
|
nodePackages.vscode-langservers-extracted
|
|
|
|
nodePackages.yaml-language-server
|
|
|
|
php81Packages.phpcbf
|
|
|
|
php81Packages.phpcs
|
|
|
|
php81Packages.phpstan
|
|
|
|
proselint
|
|
|
|
rnix-lsp
|
|
|
|
shellcheck
|
2022-09-28 07:23:10 +00:00
|
|
|
];
|
|
|
|
};
|
2022-10-04 08:26:08 +00:00
|
|
|
|
2022-10-12 06:59:47 +00:00
|
|
|
home.sessionPath = [
|
|
|
|
"$HOME/.config/bin"
|
|
|
|
];
|
|
|
|
|
|
|
|
xdg.configFile.bin = {
|
2022-12-21 11:40:36 +00:00
|
|
|
source = ../../bin;
|
2022-10-12 06:59:47 +00:00
|
|
|
recursive = true;
|
|
|
|
};
|
|
|
|
|
2022-10-04 08:26:08 +00:00
|
|
|
xdg.configFile.nvim = {
|
2022-12-21 11:40:36 +00:00
|
|
|
source = ../../config/neovim;
|
2022-10-04 08:26:08 +00:00
|
|
|
recursive = true;
|
|
|
|
};
|
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
|
|
|
}
|