meta: Merge starship module with shell

I originally separated these modules to avoid "opinionated" options like
neovim as the default editor. Now I realize however that it's easier to
load all opinionated settings by default since users can change them
either through the original options or with module-specific options.

modules/shell.nix

@@ -13,13 +13,16 @@ in
     NODE_OPTIONS = "--max_old_space_size=16384";
     BAT_THEME = "base16";
     GATSBY_TELEMETRY_DISABLED = "1";
+    EDITOR = "nvim";
+    VISUAL = "nvim";
   };
 
   environment.systemPackages = builtins.attrValues {
     inherit (pkgs) wget jq eza fd fzf ripgrep;
   };
 
-  programs.fish = {
+  programs = {
+    fish = {
       enable = true;
 
       shellAliases = {
@@ -164,4 +167,96 @@ in
         z = "zathura";
       };
     };
+
+    neovim.enable = true;
+    direnv.enable = true;
+
+    starship = {
+      enable = true;
+
+      settings = {
+        add_newline = false;
+
+        directory = {
+          style = "purple";
+          read_only = " ro";
+        };
+
+        git_branch = {
+          style = "yellow";
+          symbol = "";
+        };
+
+        character = {
+          success_symbol = "[>](red)[>](green)[>](blue)";
+          error_symbol = "[>](cyan)[>](purple)[>](yellow)";
+          vicmd_symbol = "[<](bold green)";
+        };
+
+        line_break.disabled = true;
+
+        nodejs = {
+          format = "with [$symbol($version )]($style)";
+          symbol = "node ";
+          version_format = "\${major}";
+          disabled = true;
+        };
+
+        git_commit.tag_symbol = " tag ";
+
+        git_status = {
+          ahead = ">";
+          behind = "<";
+          diverged = "<>";
+          renamed = "r";
+          deleted = "x";
+        };
+
+        aws.symbol = "aws ";
+        cobol.symbol = "cobol ";
+        conda.symbol = "conda ";
+        crystal.symbol = "cr ";
+        cmake.symbol = "cmake ";
+        dart.symbol = "dart ";
+        deno.symbol = "deno ";
+        dotnet.symbol = ".NET ";
+        docker_context.symbol = "docker ";
+        elixir.symbol = "exs ";
+        elm.symbol = "elm ";
+        golang.symbol = "go ";
+        hg_branch.symbol = "hg ";
+        java.symbol = "java ";
+        julia.symbol = "jl ";
+        kotlin.symbol = "kt ";
+        memory_usage.symbol = "memory ";
+        nim.symbol = "nim ";
+
+        nix_shell = {
+          format = "❄️ ";
+          symbol = "nix ";
+        };
+
+        ocaml.symbol = "ml ";
+        package.symbol = "pkg ";
+        perl.symbol = "pl ";
+        php.symbol = "php ";
+        purescript.symbol = "purs ";
+        python.symbol = "python ";
+        ruby.symbol = "ruby ";
+
+        rust = {
+          symbol = "rust ";
+          disabled = true;
+        };
+
+        bun = {
+          symbol = "bun ";
+          disabled = true;
+        };
+
+        scala.symbol = "scala ";
+        swift.symbol = "swift ";
+      };
+    };
+  };
 }

modules/starship.nix

@@ -1,99 +0,0 @@
-{
-  programs = {
-    neovim.enable = true;
-    direnv.enable = true;
-  };
-
-  environment.sessionVariables = {
-    EDITOR = "nvim";
-    VISUAL = "nvim";
-  };
-
-  programs.starship = {
-    enable = true;
-
-    settings = {
-      add_newline = false;
-
-      directory = {
-        style = "purple";
-        read_only = " ro";
-      };
-
-      git_branch = {
-        style = "yellow";
-        symbol = "";
-      };
-
-      character = {
-        success_symbol = "[>](red)[>](green)[>](blue)";
-        error_symbol = "[>](cyan)[>](purple)[>](yellow)";
-        vicmd_symbol = "[<](bold green)";
-      };
-
-      line_break.disabled = true;
-
-      nodejs = {
-        format = "with [$symbol($version )]($style)";
-        symbol = "node ";
-        version_format = "\${major}";
-        disabled = true;
-      };
-
-      git_commit.tag_symbol = " tag ";
-
-      git_status = {
-        ahead = ">";
-        behind = "<";
-        diverged = "<>";
-        renamed = "r";
-        deleted = "x";
-      };
-
-      aws.symbol = "aws ";
-      cobol.symbol = "cobol ";
-      conda.symbol = "conda ";
-      crystal.symbol = "cr ";
-      cmake.symbol = "cmake ";
-      dart.symbol = "dart ";
-      deno.symbol = "deno ";
-      dotnet.symbol = ".NET ";
-      docker_context.symbol = "docker ";
-      elixir.symbol = "exs ";
-      elm.symbol = "elm ";
-      golang.symbol = "go ";
-      hg_branch.symbol = "hg ";
-      java.symbol = "java ";
-      julia.symbol = "jl ";
-      kotlin.symbol = "kt ";
-      memory_usage.symbol = "memory ";
-      nim.symbol = "nim ";
-
-      nix_shell = {
-        format = "❄️ ";
-        symbol = "nix ";
-      };
-
-      ocaml.symbol = "ml ";
-      package.symbol = "pkg ";
-      perl.symbol = "pl ";
-      php.symbol = "php ";
-      purescript.symbol = "purs ";
-      python.symbol = "python ";
-      ruby.symbol = "ruby ";
-
-      rust = {
-        symbol = "rust ";
-        disabled = true;
-      };
-
-      bun = {
-        symbol = "bun ";
-        disabled = true;
-      };
-
-      scala.symbol = "scala ";
-      swift.symbol = "swift ";
-    };
-  };
-}