rename to nixose and move package to root

Makefile

@@ -1,4 +1,4 @@
 build:
-	mkdir -p bin/ && go build -o bin/ ./cmd/compose2nixos
+	mkdir -p bin/ && go build -o bin/ ./cmd/nixose
 
 .PHONY: build run

cmd/compose2nixos/main.go → cmd/nixose/main.go

@@ -3,19 +3,21 @@ package main
 import (
 	"context"
 	"flag"
+	"fmt"
 	"log"
 	"os"
 	"strings"
+	"time"
 
-	compose2nixos "github.com/aksiksi/compose2nixos/pkg/lib"
+	"github.com/aksiksi/nixose"
 )
 
 var paths = flag.String("paths", "", "paths to Compose files")
 var envFiles = flag.String("env_files", "", "paths to .env files")
 var envFilesOnly = flag.Bool("env_files_only", false, "only use env files in the NixOS container definitions")
 var output = flag.String("output", "", "path to output Nix file")
 var project = flag.String("project", "", "project name used as a prefix for generated resources")
-var projectSeparator = flag.String("project_separator", compose2nixos.DefaultProjectSeparator, "seperator for project prefix")
+var projectSeparator = flag.String("project_separator", nixose.DefaultProjectSeparator, "seperator for project prefix")
 var autoStart = flag.Bool("auto_start", true, "control auto-start setting for containers")
 var runtime = flag.String("runtime", "podman", `"podman" or "docker"`)
 
@@ -25,23 +27,24 @@ func main() {
 	ctx := context.Background()
 
 	if *paths == "" {
-		log.Fatalf("one or more paths must be specified")
+		log.Fatalf("One or more paths must be specified")
 	}
 
 	paths := strings.Split(*paths, ",")
 	envFiles := strings.Split(*envFiles, ",")
 
-	var containerRuntime compose2nixos.ContainerRuntime
+	var containerRuntime nixose.ContainerRuntime
 	if *runtime == "podman" {
-		containerRuntime = compose2nixos.ContainerRuntimePodman
+		containerRuntime = nixose.ContainerRuntimePodman
 	} else if *runtime == "docker" {
-		containerRuntime = compose2nixos.ContainerRuntimeDocker
+		containerRuntime = nixose.ContainerRuntimeDocker
 	} else {
-		log.Fatalf("invalid --runtime: %q", *runtime)
+		log.Fatalf("Invalid --runtime: %q", *runtime)
 	}
 
-	g := compose2nixos.Generator{
-		Project:      compose2nixos.NewProject(*project, *projectSeparator),
+	start := time.Now()
+	g := nixose.Generator{
+		Project:      nixose.NewProject(*project, *projectSeparator),
 		Runtime:      containerRuntime,
 		Paths:        paths,
 		EnvFiles:     envFiles,
@@ -52,10 +55,12 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
+	fmt.Printf("Generated NixOS config in %v\n", time.Since(start))
 
 	if *output != "" {
 		if err := os.WriteFile(*output, []byte(containerConfig.String()), os.FileMode(0644)); err != nil {
 			log.Fatal(err)
 		}
+		fmt.Printf("Wrote NixOS config to %s\n", *output)
 	}
 }

pkg/lib/compose.go → compose.go

@@ -1,4 +1,4 @@
-package compose2nixos
+package nixose
 
 import (
 	"cmp"
@@ -13,29 +13,6 @@ import (
 	"golang.org/x/exp/maps"
 )
 
-const DefaultProjectSeparator = "-"
-
-type ContainerRuntime int
-
-const (
-	ContainerRuntimeInvalid ContainerRuntime = iota
-	ContainerRuntimeDocker
-	ContainerRuntimePodman
-)
-
-func (c ContainerRuntime) String() string {
-	switch c {
-	case ContainerRuntimeDocker:
-		return "docker"
-	case ContainerRuntimePodman:
-		return "podman"
-	case ContainerRuntimeInvalid:
-		return "invalid-container-runtime"
-	default:
-		panic("unreachable")
-	}
-}
-
 func composeEnvironmentToMap(env types.MappingWithEquals) map[string]string {
 	m := make(map[string]string)
 	for k, v := range env {
@@ -70,32 +47,6 @@ func portConfigsToPortStrings(portConfigs []types.ServicePortConfig) []string {
 	return ports
 }
 
-type Project struct {
-	name      string
-	separator string
-}
-
-func NewProject(name, separator string) *Project {
-	if name == "" {
-		return nil
-	}
-	if separator == "" {
-		separator = DefaultProjectSeparator
-	}
-	return &Project{name, separator}
-}
-
-func (c *Project) Name() string {
-	return c.name
-}
-
-func (c *Project) With(s string) string {
-	if c == nil {
-		return s
-	}
-	return fmt.Sprintf("%s%s%s", c.name, c.separator, s)
-}
-
 type Generator struct {
 	Project      *Project
 	Runtime      ContainerRuntime
@@ -228,7 +179,7 @@ func (g *Generator) buildNixVolumes(containers []NixContainer) []NixVolume {
 		if g.Runtime == ContainerRuntimePodman && v.Driver == "" {
 			bindPath := v.DriverOpts["device"]
 			if bindPath == "" {
-				log.Fatalf("volume %q has no device set", name)
+				log.Fatalf("Volume %q has no device set", name)
 			}
 			for _, c := range containers {
 				if volumeString, ok := c.Volumes[name]; ok {

go.mod

@@ -1,4 +1,4 @@
-module github.com/aksiksi/compose2nixos
+module github.com/aksiksi/nixose
 
 go 1.21
 

pkg/lib/helpers.go → helpers.go

@@ -1,4 +1,4 @@
-package compose2nixos
+package nixose
 
 import (
 	"bufio"

pkg/lib/nix.go → nixose.go

@@ -1,4 +1,4 @@
-package compose2nixos
+package nixose
 
 import (
 	"embed"
@@ -34,6 +34,51 @@ var funcMap template.FuncMap = template.FuncMap{
 	"mapToKeyValArray":     mapToKeyValArray,
 }
 
+const DefaultProjectSeparator = "-"
+
+type ContainerRuntime int
+
+const (
+	ContainerRuntimeInvalid ContainerRuntime = iota
+	ContainerRuntimeDocker
+	ContainerRuntimePodman
+)
+
+func (c ContainerRuntime) String() string {
+	switch c {
+	case ContainerRuntimeDocker:
+		return "docker"
+	case ContainerRuntimePodman:
+		return "podman"
+	case ContainerRuntimeInvalid:
+		return "invalid-container-runtime"
+	default:
+		panic("Unreachable")
+	}
+}
+
+type Project struct {
+	Name      string
+	separator string
+}
+
+func NewProject(name, separator string) *Project {
+	if name == "" {
+		return nil
+	}
+	if separator == "" {
+		separator = DefaultProjectSeparator
+	}
+	return &Project{name, separator}
+}
+
+func (p *Project) With(name string) string {
+	if p == nil {
+		return name
+	}
+	return fmt.Sprintf("%s%s%s", p.Name, p.separator, name)
+}
+
 type NixNetwork struct {
 	Project    *Project
 	Runtime    ContainerRuntime

pkg/lib/templates/container.tmpl → templates/container.tmpl

@@ -10,59 +10,59 @@ virtualisation.oci-containers.containers."{{$name}}" = {
     {{$k}} = "{{$v}}";
     {{- end}}
   };
-  {{- end -}}
+  {{- end}}
 
   {{- if .EnvFiles}}
   environmentFiles = [
     {{- range .EnvFiles}}
     "${./{{.}}}"
     {{- end}}
   ];
-  {{- end -}}
+  {{- end}}
 
   {{- if .Volumes}}
   volumes = [
     {{- range $k, $v := .Volumes}}
     "{{$v}}"
     {{- end}}
   ];
-  {{- end -}}
+  {{- end}}
 
   {{- if .Ports}}
   ports = [
     {{- range .Ports}}
     "{{.}}"
     {{- end}}
   ];
-  {{- end -}}
+  {{- end}}
 
   {{- if .Labels}}
   labels = {
     {{- range $k, $v := .Labels}}
     "{{$k}}" = "{{$v}}";
     {{- end}}
   };
-  {{- end -}}
+  {{- end}}
 
   {{- if .DependsOn}}
   dependsOn = [
     {{- range .DependsOn}}
     "{{.}}"
     {{- end}}
   ];
-  {{- end -}}
+  {{- end}}
 
   {{- if .ExtraOptions}}
   extraOptions = [
     {{- range .ExtraOptions}}
     "{{.}}"
     {{- end}}
   ];
-  {{- end -}}
+  {{- end}}
 
   {{- if .User}}
   user = "{{.User}}";
-  {{- end -}}
+  {{- end}}
 
   {{- if not .AutoStart}}
   autoStart = false;

pkg/lib/templates/network.tmpl → templates/network.tmpl

@@ -4,20 +4,20 @@
 systemd.services."create-{{$runtime}}-network-{{$name}}" = {
   serviceConfig.Type = "oneshot";
   path = [ pkgs.{{$runtime}} ];
-  {{if eq $runtime "docker" -}}
+  {{- if eq $runtime "docker"}}
   script = ''
     docker network inspect {{$name}} || docker network create {{$name}}{{ $labels | join " "}}
   '';
-  {{else -}}
+  {{- else}}
   script = ''
     podman network create {{$name}} --opt isolate=true --ignore{{ $labels | join " "}}
   '';
-  {{end -}}
-  {{if .Containers -}}
+  {{- end}}
+  {{- if .Containers}}
   wantedBy = [
-  {{range .Containers}}
-  {{- . | printf "\"%s.service\"" | indent 2}}
-  {{end -}}
+  {{- range .Containers}}
+  {{. | printf "\"%s.service\"" | indent 2}}
+  {{- end}}
   ];
   {{- end}}
 };

pkg/lib/templates/volume.tmpl → templates/volume.tmpl

@@ -5,7 +5,7 @@
 systemd.services."create-{{$runtime}}-volume-{{$name}}" = {
   serviceConfig.Type = "oneshot";
   path = [ pkgs.{{$runtime}} ];
-  {{if eq $runtime "docker" -}}
+  {{- if eq $runtime "docker"}}
   script = ''
     {{- if eq .Driver ""}}
     docker volume inspect {{$name}} || docker volume create {{$name}} --opt {{$driverOptsString}}
@@ -21,12 +21,12 @@ systemd.services."create-{{$runtime}}-volume-{{$name}}" = {
 	podman volume create {{$name}} --driver {{.Driver}} --opt {{$driverOptsString}} --ignore
     {{- end}}
   '';
-  {{end}}
+  {{- end}}
   {{- if .Containers}}
   wantedBy = [
-  {{range .Containers}}
-  {{- . | printf "\"%s.service\"" | indent 2}}
-  {{end -}}
+  {{- range .Containers}}
+  {{. | printf "\"%s.service\"" | indent 2}}
+  {{- end}}
   ];
   {{- end}}
 };