nix: Merge dev with common

common.nix

@@ -47,6 +47,34 @@
     slade
     typespeed
     osu-lazer-bin
+
+    # dev
+    marksman
+    lua-language-server
+    clang-tools
+    texlab
+
+    # go
+    go
+    gopls
+
+    # nix
+    nil
+    nixfmt
+    nixos-generators
+
+    # node/yarn/deno
+    nodejs
+    yarn
+    deno
+
+    # rust
+    gcc
+    rustc
+    rustfmt
+    cargo
+    rust-analyzer
+    bacon
   ];
 
   nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
@@ -72,6 +100,38 @@
 
     sharedModules = [{
       home.stateVersion = "22.11";
+
+      editorconfig = {
+        enable = true;
+
+        settings = {
+          "*" = {
+            charset = "utf-8";
+            end_of_line = "lf";
+            insert_final_newline = true;
+            indent_size = 2;
+            indent_style = "space";
+            trim_trailing_whitespace = true;
+          };
+
+          "*.md".indent_style = "tab";
+
+          "Makefile" = {
+            indent_style = "tab";
+            indent_size = 4;
+          };
+
+          "*.html" = {
+            indent_style = "tab";
+            indent_size = 4;
+          };
+
+          "*.go" = {
+            indent_style = "tab";
+            indent_size = 4;
+          };
+        };
+      };
     }];
   };
 
@@ -102,4 +162,7 @@
     home.username = "user";
     home.homeDirectory = "/home/user";
   };
+
+  # dev
+  programs.npm.enable = true;
 }

dev/default.nix

@@ -1,68 +0,0 @@
-{ pkgs, ... }:
-
-{
-  programs.npm.enable = true;
-
-  home-manager.sharedModules = [{
-    editorconfig = {
-      enable = true;
-
-      settings = {
-        "*" = {
-          charset = "utf-8";
-          end_of_line = "lf";
-          insert_final_newline = true;
-          indent_size = 2;
-          indent_style = "space";
-          trim_trailing_whitespace = true;
-        };
-
-        "*.md".indent_style = "tab";
-
-        "Makefile" = {
-          indent_style = "tab";
-          indent_size = 4;
-        };
-
-        "*.html" = {
-          indent_style = "tab";
-          indent_size = 4;
-        };
-
-        "*.go" = {
-          indent_style = "tab";
-          indent_size = 4;
-        };
-      };
-    };
-  }];
-
-  environment.systemPackages = with pkgs; [
-    marksman
-    lua-language-server
-    clang-tools
-    texlab
-
-    # go
-    go
-    gopls
-
-    # nix
-    nil
-    nixfmt
-    nixos-generators
-
-    # node/yarn/deno
-    nodejs
-    yarn
-    deno
-
-    # rust
-    gcc
-    rustc
-    rustfmt
-    cargo
-    rust-analyzer
-    bacon
-  ];
-}