refactor: move some other stuff into common bash

common/modules/bash/default.nix

@@ -1,9 +1,16 @@
 # Home-manager module
 
-{ lib, ... }:
+{ lib, ... }: {
+  programs = {
 
-{
-  programs.starship = let
+    fzf = {
+      enable = true;
+      enableBashIntegration = true;
+    };
+    jq.enable = true;
+    ripgrep.enable = true;
+
+    starship = let
       textColor   = "#e3e5e5";
       firstColor  = "#bd93f9";
       secondColor = "#715895";
@@ -87,7 +94,7 @@
       };
     };
 
-  programs.bash = {
+    bash = {
       enable = true;
       enableCompletion = true;
 
@@ -159,4 +166,5 @@
       #logoutExtra = ''
       #'';
     };
+  };
 }

common/modules/neovim/default.nix

@@ -18,7 +18,14 @@ in
     '';
   };
 
-  programs.neovim = {
+  programs = {
+
+    java = {
+      enable = true;
+      package = pkgs.temurin-bin-17;
+    };
+
+    neovim = {
       enable = true;
       viAlias = true;
       vimAlias = true;
@@ -115,4 +122,5 @@ in
         todo-comments-nvim
       ];
     };
+  };
 }

hosts/wim/home/dotfiles.nix

@@ -30,10 +30,6 @@ in
   };
 
   programs = {
-    fzf = {
-      enable = true;
-      enableBashIntegration = true;
-    };
 
     wofi = {
       enable = true;

hosts/wim/home/packages.nix

@@ -12,17 +12,6 @@ in
     };
 
     btop.enable = true;
-
-    jq.enable = true;
-
-    ripgrep = {
-      enable = true;
-    };
-
-    java = {
-      enable = true;
-      package = pkgs.temurin-bin-17;
-    };
   };
 
   home.packages = [