update registry

Author: atomikpanda

.claude/settings.local.json

@@ -3,7 +3,10 @@
     "allow": [
       "Bash(go mod:*)",
       "Bash(go test:*)",
-      "Bash(go tool:*)"
+      "Bash(go tool:*)",
+      "Bash(grep:*)",
+      "Bash(go vet:*)",
+      "Bash(make build:*)"
     ]
   }
 }

README.md

@@ -345,7 +345,7 @@ Reuse and share module definitions:
 
 ```yaml
 modules:
-  - from: dotular.dev/modules/neovim@1.0.0
+  - from: neovim
     with:
       neovim_version: "0.10.2"
     override:
@@ -365,11 +365,11 @@ modules:
 
 | Source | Trust |
 |--------|-------|
-| `dotular.dev/modules/` | Official |
-| `dotular.dev/community/` | Community |
-| GitHub / arbitrary URL | Private |
+| `github.com/atomikpanda/dotular/...` or bare name | Official |
+| Other `github.com/...` repos | GitHub |
+| Other URLs | External |
 
-GitHub refs (`github.com/user/repo@ref`) are automatically rewritten to `raw.githubusercontent.com`.
+Bare names (e.g. `neovim`) expand to `github.com/atomikpanda/dotular/modules/neovim@main`. GitHub refs are automatically rewritten to `raw.githubusercontent.com`.
 
 ### Cache
 

cmd/dotular/main.go

@@ -649,10 +649,10 @@ func registryCmd() *cobra.Command {
 					switch trustStr {
 					case "official":
 						trustStr = color.BoldGreen(trustStr)
-					case "community":
-						trustStr = color.Yellow(trustStr)
-					default:
+					case "github":
 						trustStr = color.Dim(trustStr)
+					case "external":
+						trustStr = color.Yellow(trustStr)
 					}
 					rows = append(rows, []string{
 						ref.Raw,

dotular.yaml

@@ -13,7 +13,7 @@ modules:
         verify: brew --version
 
   # --- registry module --------------------------------------------------------
-  # - from: dotular.dev/modules/neovim@1.0.0
+  # - from: neovim
   #   with:
   #     neovim_version: "0.10.2"
   #   override:

internal/config/config.go

@@ -35,7 +35,7 @@ type Module struct {
 
 	// Registry module reference (mutually exclusive with Items in source YAML;
 	// after resolution Items is populated from the registry module).
-	From     string         `yaml:"from,omitempty"`     // e.g. "dotular.dev/modules/neovim@1.0.0"
+	From     string         `yaml:"from,omitempty"`     // e.g. "github.com/atomikpanda/dotular/modules/neovim@main"
 	With     map[string]any `yaml:"with,omitempty"`     // parameter overrides
 	Override []Item         `yaml:"override,omitempty"` // items that replace matching registry items
 }

internal/config/config_test.go

@@ -268,7 +268,7 @@ func TestConfigModule(t *testing.T) {
 }
 
 func TestModuleIsRegistry(t *testing.T) {
-	m := Module{From: "dotular.dev/modules/foo"}
+	m := Module{From: "github.com/user/repo"}
 	if !m.IsRegistry() {
 		t.Error("expected IsRegistry() true")
 	}

internal/registry/fetch.go

@@ -106,9 +106,9 @@ func download(ctx context.Context, url string) ([]byte, error) {
 func parseModule(data []byte) (*RemoteModule, TrustLevel, error) {
 	var mod RemoteModule
 	if err := yaml.Unmarshal(data, &mod); err != nil {
-		return nil, Private, fmt.Errorf("parse registry module: %w", err)
+		return nil, External, fmt.Errorf("parse registry module: %w", err)
 	}
-	return &mod, Private, nil
+	return &mod, External, nil
 }
 
 func moduleCachePath(rawRef string) string {

internal/registry/fetch_test.go

@@ -9,7 +9,7 @@ import (
 )
 
 func TestModuleCachePath(t *testing.T) {
-	got := moduleCachePath("dotular.dev/modules/neovim@1.0.0")
+	got := moduleCachePath("github.com/atomikpanda/dotular/modules/neovim@main")
 	if got == "" {
 		t.Error("expected non-empty cache path")
 	}
@@ -42,15 +42,15 @@ func TestCollectActiveRefs(t *testing.T) {
 	cfg := config.Config{
 		Modules: []config.Module{
 			{Name: "local", Items: []config.Item{{Package: "git"}}},
-			{Name: "remote", From: "dotular.dev/modules/neovim@1.0.0"},
+			{Name: "remote", From: "github.com/atomikpanda/dotular/modules/neovim@main"},
 			{Name: "remote2", From: "github.com/user/repo"},
 		},
 	}
 	refs := CollectActiveRefs(cfg)
 	if len(refs) != 2 {
 		t.Fatalf("expected 2 refs, got %d", len(refs))
 	}
-	if !refs["dotular.dev/modules/neovim@1.0.0"] {
+	if !refs["github.com/atomikpanda/dotular/modules/neovim@main"] {
 		t.Error("missing neovim ref")
 	}
 	if !refs["github.com/user/repo"] {

internal/registry/lock_test.go

@@ -34,10 +34,10 @@ func TestSaveAndLoadLock(t *testing.T) {
 
 	lf := &LockFile{
 		Registry: map[string]LockEntry{
-			"dotular.dev/modules/neovim@1.0.0": {
+			"github.com/atomikpanda/dotular/modules/neovim@main": {
 				SHA256:    "abc123",
 				FetchedAt: time.Date(2024, 6, 15, 0, 0, 0, 0, time.UTC),
-				URL:       "https://dotular.dev/modules/neovim/1.0.0.yaml",
+				URL:       "https://raw.githubusercontent.com/atomikpanda/dotular/main/modules/neovim.yaml",
 			},
 		},
 	}
@@ -51,14 +51,14 @@ func TestSaveAndLoadLock(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	entry, ok := loaded.Registry["dotular.dev/modules/neovim@1.0.0"]
+	entry, ok := loaded.Registry["github.com/atomikpanda/dotular/modules/neovim@main"]
 	if !ok {
 		t.Fatal("expected entry in loaded lock")
 	}
 	if entry.SHA256 != "abc123" {
 		t.Errorf("SHA256 = %q", entry.SHA256)
 	}
-	if entry.URL != "https://dotular.dev/modules/neovim/1.0.0.yaml" {
+	if entry.URL != "https://raw.githubusercontent.com/atomikpanda/dotular/main/modules/neovim.yaml" {
 		t.Errorf("URL = %q", entry.URL)
 	}
 }

internal/registry/module.go

@@ -12,23 +12,22 @@ import (
 type TrustLevel int
 
 const (
-	// Official modules are maintained by Dotular and hosted at dotular.dev/modules.
+	// Official modules are from the DefaultRegistry (github.com/atomikpanda/dotular).
 	Official TrustLevel = iota
-	// Community modules are published by third parties via dotular.dev/community.
-	// They are not reviewed and should be treated as untrusted.
-	Community
-	// Private modules are hosted on arbitrary URLs or GitHub repositories.
-	Private
+	// GitHub modules are from other github.com repositories.
+	GitHub
+	// External modules are from arbitrary URLs.
+	External
 )
 
 func (t TrustLevel) String() string {
 	switch t {
 	case Official:
 		return "official"
-	case Community:
-		return "community"
+	case GitHub:
+		return "github"
 	default:
-		return "private"
+		return "external"
 	}
 }
 
@@ -46,7 +45,7 @@ type RemoteModule struct {
 	Items   []config.Item     `yaml:"items"`
 }
 
-// Ref holds a parsed registry reference string (e.g. "dotular.dev/modules/neovim@1.0.0").
+// Ref holds a parsed registry reference string (e.g. "github.com/atomikpanda/dotular/modules/neovim@main").
 type Ref struct {
 	Raw     string
 	Host    string
@@ -94,26 +93,6 @@ func ParseRef(raw string) Ref {
 
 func resolveTrustAndURL(host, path, version string) (TrustLevel, string) {
 	switch host {
-	case "dotular.dev":
-		if strings.HasPrefix(path, "modules/") {
-			// Official: https://dotular.dev/modules/<name>/<version>.yaml
-			v := version
-			if v == "" {
-				v = "latest"
-			}
-			modName := strings.TrimPrefix(path, "modules/")
-			url := "https://dotular.dev/modules/" + modName + "/" + v + ".yaml"
-			return Official, url
-		}
-		if strings.HasPrefix(path, "community/") {
-			url := "https://dotular.dev/" + path
-			if version != "" {
-				url += "@" + version
-			}
-			return Community, url
-		}
-		return Private, "https://" + host + "/" + path
-
 	case "github.com":
 		// github.com/user/repo@ref → raw file URL.
 		// Supports two forms:
@@ -134,14 +113,20 @@ func resolveTrustAndURL(host, path, version string) (TrustLevel, string) {
 			subPath := parts[2]
 			url = "https://raw.githubusercontent.com/" + repoPath + "/" + ref + "/" + subPath + ".yaml"
 		}
-		return Private, url
+
+		// Determine trust: official if from the DefaultRegistry repo.
+		trust := GitHub
+		if strings.HasPrefix(path, "atomikpanda/dotular") {
+			trust = Official
+		}
+		return trust, url
 
 	default:
 		// Fallback: treat as a direct HTTPS URL.
 		url := "https://" + host + "/" + path
 		if version != "" {
 			url += "@" + version
 		}
-		return Private, url
+		return External, url
 	}
 }