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-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
|
|
|
];
|
|
|
|
|
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
|
|
|
home.packages = with pkgs; [
|
2022-10-04 07:17:18 +00:00
|
|
|
bottom
|
|
|
|
ctop
|
|
|
|
delta
|
|
|
|
file
|
|
|
|
fzf
|
|
|
|
gcc
|
|
|
|
gh
|
|
|
|
git
|
|
|
|
git-crypt
|
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
|
|
|
just
|
2022-10-04 07:17:18 +00:00
|
|
|
tree-sitter
|
|
|
|
htop
|
|
|
|
jq
|
|
|
|
lua
|
|
|
|
neofetch
|
2022-12-09 09:18:24 +00:00
|
|
|
nodejs
|
|
|
|
php81
|
2022-10-04 07:17:18 +00:00
|
|
|
platformsh
|
2022-12-19 09:41:30 +00:00
|
|
|
postman
|
2022-12-09 09:18:24 +00:00
|
|
|
pulumi-bin
|
2022-10-04 07:17:18 +00:00
|
|
|
pv
|
|
|
|
ripgrep
|
|
|
|
tldr
|
|
|
|
tmuxinator
|
|
|
|
tree
|
|
|
|
unzip
|
|
|
|
wget
|
2022-12-09 09:18:24 +00:00
|
|
|
yarn
|
2022-10-12 06:59:47 +00:00
|
|
|
zoxide
|
2022-09-29 18:25:48 +00:00
|
|
|
|
|
|
|
# LSP
|
2022-10-04 07:17:18 +00:00
|
|
|
html-tidy
|
2022-10-31 23:37:55 +00:00
|
|
|
nodePackages."@ansible/ansible-language-server"
|
2022-09-29 19:59:38 +00:00
|
|
|
nodePackages."@tailwindcss/language-server"
|
|
|
|
nodePackages.bash-language-server
|
|
|
|
nodePackages.dockerfile-language-server-nodejs
|
|
|
|
nodePackages.eslint
|
|
|
|
nodePackages.intelephense
|
2022-09-29 18:25:48 +00:00
|
|
|
nodePackages.markdownlint-cli
|
2022-09-29 19:59:38 +00:00
|
|
|
nodePackages.prettier
|
|
|
|
nodePackages.typescript
|
|
|
|
nodePackages.typescript-language-server
|
|
|
|
nodePackages.vls
|
|
|
|
nodePackages.vscode-langservers-extracted
|
|
|
|
nodePackages.yaml-language-server
|
|
|
|
php81Packages.phpcbf
|
|
|
|
php81Packages.phpcs
|
|
|
|
php81Packages.phpstan
|
2022-10-03 16:47:17 +00:00
|
|
|
rnix-lsp
|
2022-09-29 19:59:38 +00:00
|
|
|
shellcheck
|
2022-12-17 12:48:51 +00:00
|
|
|
sumneko-lua-language-server
|
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;
|
2022-12-04 15:52:32 +00:00
|
|
|
plugins = let
|
|
|
|
phpactor = pkgs.vimUtils.buildVimPlugin {
|
|
|
|
name = "phpactor";
|
|
|
|
src = pkgs.fetchFromGitHub {
|
|
|
|
owner = "phpactor";
|
|
|
|
repo = "phpactor";
|
|
|
|
rev = "master";
|
|
|
|
sha256 = "j2rGPMiST85feqk5Nj4KrjxyhfbUjYEKAec+bzPEJZQ=";
|
|
|
|
};
|
|
|
|
};
|
|
|
|
in
|
|
|
|
with pkgs.vimPlugins; [
|
|
|
|
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
|
2022-09-28 07:23:10 +00:00
|
|
|
|
2022-10-14 09:54:25 +00:00
|
|
|
# Debugging
|
2022-12-04 15:52:32 +00:00
|
|
|
nvim-dap
|
|
|
|
nvim-dap-ui
|
|
|
|
nvim-dap-virtual-text
|
2022-10-14 09:54:25 +00:00
|
|
|
|
2022-10-04 08:21:39 +00:00
|
|
|
# Treesitter
|
2022-12-04 15:52:32 +00:00
|
|
|
nvim-treesitter
|
|
|
|
nvim-treesitter-context
|
|
|
|
nvim-treesitter-textobjects
|
2022-09-28 07:23:10 +00:00
|
|
|
|
2022-10-04 08:21:39 +00:00
|
|
|
# LSP
|
2022-12-04 15:52:32 +00:00
|
|
|
null-ls-nvim
|
|
|
|
nvim-lspconfig
|
|
|
|
lsp-status-nvim
|
|
|
|
phpactor
|
2022-10-04 08:21:39 +00:00
|
|
|
|
|
|
|
# Completion
|
2022-12-04 15:52:32 +00:00
|
|
|
cmp-buffer
|
|
|
|
cmp-cmdline
|
|
|
|
cmp-nvim-lsp
|
|
|
|
cmp-path
|
|
|
|
cmp-tabnine
|
|
|
|
cmp-treesitter
|
|
|
|
cmp-vsnip
|
|
|
|
cmp_luasnip
|
|
|
|
lspkind-nvim
|
|
|
|
nvim-cmp
|
|
|
|
|
|
|
|
# Snippets
|
|
|
|
luasnip
|
2022-10-04 08:21:39 +00:00
|
|
|
|
|
|
|
# Telescope
|
2022-12-04 15:52:32 +00:00
|
|
|
plenary-nvim
|
|
|
|
popup-nvim
|
|
|
|
telescope-file-browser-nvim
|
|
|
|
telescope-fzf-native-nvim
|
|
|
|
telescope-nvim
|
|
|
|
telescope-ui-select-nvim
|
2022-10-04 08:21:39 +00:00
|
|
|
|
|
|
|
# Databases
|
2022-12-04 15:52:32 +00:00
|
|
|
vim-dadbod
|
|
|
|
vim-dadbod-ui
|
|
|
|
vim-dadbod-completion
|
2022-10-04 08:21:39 +00:00
|
|
|
|
|
|
|
# Themes
|
2022-12-04 15:52:32 +00:00
|
|
|
nightfox-nvim
|
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 = {
|
|
|
|
source = ../../../bin;
|
|
|
|
recursive = true;
|
|
|
|
};
|
|
|
|
|
2022-10-04 08:26:08 +00:00
|
|
|
xdg.configFile.nvim = {
|
|
|
|
source = ../../../config/neovim;
|
|
|
|
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
|
|
|
}
|