diff --git a/modules/generic/base-pkgs.nix b/modules/generic/base-pkgs.nix
new file mode 100644
index 0000000..16d887c
--- /dev/null
+++ b/modules/generic/base-pkgs.nix
@@ -0,0 +1,15 @@
+{ pkgs, ... }: {
+  environment.systemPackages = builtins.attrValues {
+    inherit (pkgs)
+      ripgrep
+      fd
+      git
+      git-lfs
+      jujutsu
+      vim
+      curl
+      htop
+      btop
+    ;
+  };
+};
diff --git a/modules/generic/direnv.nix b/modules/generic/direnv.nix
new file mode 100644
index 0000000..591832d
--- /dev/null
+++ b/modules/generic/direnv.nix
@@ -0,0 +1,6 @@
+{
+  programs.direnv = {
+    enable = true;
+    package = pkgs.nix-direnv;
+  };
+}
diff --git a/modules/linux/base-pkgs.nix b/modules/linux/base-pkgs.nix
new file mode 100644
index 0000000..2036745
--- /dev/null
+++ b/modules/linux/base-pkgs.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }
+  environment.systemPackages = builtins.attrValues {
+    inherit (pkgs)
+      xdg-utils
+    ;
+  };
+}
diff --git a/modules/linux/fonts.nix b/modules/linux/fonts.nix
new file mode 100644
index 0000000..37d4df1
--- /dev/null
+++ b/modules/linux/fonts.nix
@@ -0,0 +1,22 @@
+{ pkgs, ... }: {
+  fonts = {
+    enableDefaultPackages = true;
+
+    packages = builtins.attrValues {
+      inherit (pkgs)
+        dejavu_fonts
+        noto-fonts
+        noto-fonts-cjk-sans
+        material-symbols
+        font-awesome
+        corefonts
+        vistafonts
+      ;
+    }
+  };
+
+  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+    "corefonts"
+    "vista-fonts"
+  ];
+}