diff --git a/hosts/pc/configuration.nix b/hosts/pc/configuration.nix
index 0fc6ff3..fe3b4c0 100755
--- a/hosts/pc/configuration.nix
+++ b/hosts/pc/configuration.nix
@@ -18,6 +18,7 @@
     ../../modules/ollama
     ../../modules/development
     ../../modules/development/claude.nix
+    ../../modules/development/go.nix
     ../../modules/additionalUsers/aariz.nix
     ../../modules/obs
 
diff --git a/modules/development/go.nix b/modules/development/go.nix
new file mode 100644
index 0000000..434d78a
--- /dev/null
+++ b/modules/development/go.nix
@@ -0,0 +1,22 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    go
+
+    # Language server
+    gopls
+
+    # Formatter with automatic import management
+    gotools
+
+    # Linting
+    golangci-lint
+
+    # Debugger
+    delve
+
+    # Useful extras
+    air # Live reload for web apps
+  ];
+}