opdavies/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: extract a common module

Browse source 
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;
+}
This commit is contained in:
Oliver Davies 2022-09-27 18:37:05 +01:00
parent ecab676b75
commit a02f5bb68b
3 changed files with 11 additions and 12 deletions
configuration
pop-os
default.nix
wsl2
default.nix
home-manager/modules
common.nix

5
configuration/pop-os/default.nix
View file

@ -3,6 +3,7 @@
{ {
imports = [ imports = [
../../home-manager/modules/alacritty.nix ../../home-manager/modules/alacritty.nix
../../home-manager/modules/common.nix
../../home-manager/modules/git.nix ../../home-manager/modules/git.nix
../../home-manager/modules/home-manager.nix ../../home-manager/modules/home-manager.nix
../../home-manager/modules/tmux.nix ../../home-manager/modules/tmux.nix
@ -15,9 +16,5 @@
docker docker
docker-compose docker-compose
jetbrains-mono jetbrains-mono
just
neovim
]; ];
programs.bat.enable = true;
} }

9
configuration/wsl2/default.nix
View file

@ -2,17 +2,10 @@
{ {
imports = [ imports = [
../../home-manager/modules/common.nix
../../home-manager/modules/git.nix ../../home-manager/modules/git.nix
../../home-manager/modules/home-manager.nix ../../home-manager/modules/home-manager.nix
../../home-manager/modules/tmux.nix ../../home-manager/modules/tmux.nix
../../home-manager/modules/zsh.nix ../../home-manager/modules/zsh.nix
]; ];
home.packages = with pkgs; [
just
neovim
zsh
];
programs.bat.enable = true;
} }

9
home-manager/modules/common.nix Normal file
View file

@ -0,0 +1,9 @@
{ config, lib, pkgs, ... }:
{
home.packages = with pkgs; [
just
neovim
];
programs.bat.enable = true;
}