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"
|
|
|
|
];
|
|
|
|
|
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; [
|
|
|
|
just
|
2022-09-29 18:25:48 +00:00
|
|
|
|
|
|
|
# LSP
|
2022-09-29 19:59:38 +00:00
|
|
|
# TODO: nodePackages."@ansible/ansible-language-server"
|
|
|
|
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
|
|
|
|
shellcheck
|
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-10-03 16:46:49 +00:00
|
|
|
extraConfig = ''
|
|
|
|
lua << EOF
|
|
|
|
vim.opt.number = true
|
|
|
|
vim.opt.relativenumber = true
|
|
|
|
EOF
|
|
|
|
'';
|
2022-09-28 07:23:10 +00:00
|
|
|
|
2022-10-03 16:46:49 +00:00
|
|
|
plugins = with pkgs.vimPlugins; [
|
|
|
|
plenary-nvim
|
|
|
|
telescope-nvim
|
2022-09-28 07:23:10 +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
|
|
|
}
|