Merge branch 'master' of https://github.com/raghavyuva/nixopus

Author: zhravan

CHANGELOG.md

@@ -1,3 +1,48 @@
+# [0.1.0-alpha.54](https://github.com/raghavyuva/nixopus/compare/v0.1.0-alpha.53...v0.1.0-alpha.54) (2025-10-28)
+
+
+### Features
+
+* configurable dashboard widgets with topbar  ([#541](https://github.com/raghavyuva/nixopus/issues/541)) ([b150d69](https://github.com/raghavyuva/nixopus/commit/b150d6937db92fa288b40bffe54f4579a95f252a))
+
+
+
+# [0.1.0-alpha.53](https://github.com/raghavyuva/nixopus/compare/v0.1.0-alpha.52...v0.1.0-alpha.53) (2025-10-27)
+
+
+### Features
+
+* dashboard with draggable layout, charts, and extended system metrics ([#536](https://github.com/raghavyuva/nixopus/issues/536)) ([e13c24a](https://github.com/raghavyuva/nixopus/commit/e13c24aeefeb67fb64da1809bc23695f3076bf46))
+
+
+
+# [0.1.0-alpha.52](https://github.com/raghavyuva/nixopus/compare/v0.1.0-alpha.51...v0.1.0-alpha.52) (2025-10-25)
+
+
+### Bug Fixes
+
+* disable just in time compilation (JIT) of postgres ([#539](https://github.com/raghavyuva/nixopus/issues/539)) ([b2c35bd](https://github.com/raghavyuva/nixopus/commit/b2c35bd29349f565aa66617a164d687faf060778))
+
+
+
+# [0.1.0-alpha.51](https://github.com/raghavyuva/nixopus/compare/v0.1.0-alpha.50...v0.1.0-alpha.51) (2025-10-25)
+
+
+### Bug Fixes
+
+* menu for closed sidebar items on hover ([#526](https://github.com/raghavyuva/nixopus/issues/526)) ([ca423ed](https://github.com/raghavyuva/nixopus/commit/ca423ed2e3a53c5a1e96048914316399274afcf0))
+
+
+
+# [0.1.0-alpha.50](https://github.com/raghavyuva/nixopus/compare/v0.1.0-alpha.49...v0.1.0-alpha.50) (2025-10-25)
+
+
+### Features
+
+* update command to not reference .env ([af13242](https://github.com/raghavyuva/nixopus/commit/af13242c25e2cc8b02e965e8b3645df84e372c9b))
+
+
+
 # [0.1.0-alpha.49](https://github.com/raghavyuva/nixopus/compare/v0.1.0-alpha.48...v0.1.0-alpha.49) (2025-10-22)
 
 
@@ -729,3 +774,4 @@
 * **vulnerability:** fixes CVE-2024-21538 (HIGH) and CVE-2025-30204 (HIGH) ([c25e0c7](https://github.com/raghavyuva/nixopus/commit/c25e0c7fa9ad742a25f95ae7e2a780a881cad573))
 
 
+

README.md

@@ -4,7 +4,7 @@
 
 
 <p align="center">
- Open Source Server management platform with Terminal integration, and Self Hosting capabilities.
+ Open Source alternative to vercel, heroku, netlify with Terminal integration, and Self Hosting capabilities. 
 </p>
 
 <p align="center">

api/api/versions.json

@@ -3,7 +3,7 @@
     {
       "version": "v1",
       "status": "active",
-      "release_date": "2025-10-22T16:45:33.662757+05:30",
+      "release_date": "2025-10-28T22:04:41.913593+05:30",
       "end_of_life": "0001-01-01T00:00:00Z",
       "changes": [
         "Initial API version"

api/internal/features/dashboard/system_stats.go

@@ -13,6 +13,7 @@ import (
 	"github.com/shirou/gopsutil/v3/disk"
 	"github.com/shirou/gopsutil/v3/host"
 	"github.com/shirou/gopsutil/v3/mem"
+	"github.com/shirou/gopsutil/v3/net"
 )
 
 const (
@@ -31,6 +32,8 @@ func formatBytes(bytes uint64, unit string) string {
 	}
 }
 
+// TODO: Add support for multi server management
+// solution: create a bridge between the gopsutil and the ssh client
 func (m *DashboardMonitor) GetSystemStats() {
 	osType, err := m.getCommandOutput("uname -s")
 	if err != nil {
@@ -42,24 +45,49 @@ func (m *DashboardMonitor) GetSystemStats() {
 	stats := SystemStats{
 		OSType:    osType,
 		Timestamp: time.Now(),
+		CPU:       CPUStats{PerCore: []CPUCore{}},
 		Memory:    MemoryStats{},
 		Load:      LoadStats{},
 		Disk:      DiskStats{AllMounts: []DiskMount{}},
+		Network:   NetworkStats{Interfaces: []NetworkInterface{}},
 	}
 
+	if hostname, err := m.getCommandOutput("hostname"); err == nil {
+		stats.Hostname = strings.TrimSpace(hostname)
+	}
+
+	if kernelVersion, err := m.getCommandOutput("uname -r"); err == nil {
+		stats.KernelVersion = strings.TrimSpace(kernelVersion)
+	}
+
+	if architecture, err := m.getCommandOutput("uname -m"); err == nil {
+		stats.Architecture = strings.TrimSpace(architecture)
+	}
+
+	var uptime string
 	if hostInfo, err := host.Info(); err == nil {
-		stats.Load.Uptime = time.Duration(hostInfo.Uptime * uint64(time.Second)).String()
+		uptime = time.Duration(hostInfo.Uptime * uint64(time.Second)).String()
 	}
 
 	if loadAvg, err := m.getCommandOutput("uptime"); err == nil {
 		loadAvgStr := strings.TrimSpace(loadAvg)
 		stats.Load = parseLoadAverage(loadAvgStr)
 	}
 
+	stats.Load.Uptime = uptime
+
 	if cpuInfo, err := cpu.Info(); err == nil && len(cpuInfo) > 0 {
 		stats.CPUInfo = cpuInfo[0].ModelName
 	}
 
+	if stats.CPUCores == 0 {
+		if coreCount, err := cpu.Counts(true); err == nil {
+			stats.CPUCores = coreCount
+		}
+	}
+
+	stats.CPU = m.getCPUStats()
+
 	if memInfo, err := mem.VirtualMemory(); err == nil {
 		stats.Memory = MemoryStats{
 			Total:      float64(memInfo.Total) / bytesInGB,
@@ -103,6 +131,8 @@ func (m *DashboardMonitor) GetSystemStats() {
 		stats.Disk = diskStats
 	}
 
+	stats.Network = m.getNetworkStats()
+
 	m.Broadcast(string(GetSystemStats), stats)
 }
 
@@ -126,6 +156,74 @@ func parseLoadAverage(loadStr string) LoadStats {
 	return loadStats
 }
 
+func (m *DashboardMonitor) getCPUStats() CPUStats {
+	cpuStats := CPUStats{
+		Overall: 0.0,
+		PerCore: []CPUCore{},
+	}
+
+	perCorePercent, err := cpu.Percent(time.Second, true)
+	if err == nil && len(perCorePercent) > 0 {
+		cpuStats.PerCore = make([]CPUCore, len(perCorePercent))
+		var totalUsage float64 = 0
+
+		for i, usage := range perCorePercent {
+			cpuStats.PerCore[i] = CPUCore{
+				CoreID: i,
+				Usage:  usage,
+			}
+			totalUsage += usage
+		}
+
+		cpuStats.Overall = totalUsage / float64(len(perCorePercent))
+	} else {
+
+		if overallPercent, err := cpu.Percent(time.Second, false); err == nil && len(overallPercent) > 0 {
+			cpuStats.Overall = overallPercent[0]
+		}
+	}
+
+	return cpuStats
+}
+
+func (m *DashboardMonitor) getNetworkStats() NetworkStats {
+	networkStats := NetworkStats{
+		Interfaces: []NetworkInterface{},
+	}
+
+	if ioCounters, err := net.IOCounters(true); err == nil {
+		var totalSent, totalRecv, totalPacketsSent, totalPacketsRecv uint64
+
+		for _, counter := range ioCounters {
+			interfaces := NetworkInterface{
+				Name:        counter.Name,
+				BytesSent:   counter.BytesSent,
+				BytesRecv:   counter.BytesRecv,
+				PacketsSent: counter.PacketsSent,
+				PacketsRecv: counter.PacketsRecv,
+				ErrorIn:     counter.Errin,
+				ErrorOut:    counter.Errout,
+				DropIn:      counter.Dropin,
+				DropOut:     counter.Dropout,
+			}
+
+			networkStats.Interfaces = append(networkStats.Interfaces, interfaces)
+
+			totalSent += counter.BytesSent
+			totalRecv += counter.BytesRecv
+			totalPacketsSent += counter.PacketsSent
+			totalPacketsRecv += counter.PacketsRecv
+		}
+
+		networkStats.TotalBytesSent = totalSent
+		networkStats.TotalBytesRecv = totalRecv
+		networkStats.TotalPacketsSent = totalPacketsSent
+		networkStats.TotalPacketsRecv = totalPacketsRecv
+	}
+
+	return networkStats
+}
+
 func (m *DashboardMonitor) getCommandOutput(cmd string) (string, error) {
 	session, err := m.client.NewSession()
 	if err != nil {

api/internal/features/dashboard/types.go

@@ -43,12 +43,28 @@ type DashboardMonitor struct {
 }
 
 type SystemStats struct {
-	OSType    string      `json:"os_type"`
-	CPUInfo   string      `json:"cpu_info"`
-	Memory    MemoryStats `json:"memory"`
-	Load      LoadStats   `json:"load"`
-	Disk      DiskStats   `json:"disk"`
-	Timestamp time.Time   `json:"timestamp"`
+	OSType        string       `json:"os_type"`
+	Hostname      string       `json:"hostname"`
+	CPUInfo       string       `json:"cpu_info"`
+	CPUCores      int          `json:"cpu_cores"`
+	CPU           CPUStats     `json:"cpu"`
+	Memory        MemoryStats  `json:"memory"`
+	Load          LoadStats    `json:"load"`
+	Disk          DiskStats    `json:"disk"`
+	Network       NetworkStats `json:"network"`
+	KernelVersion string       `json:"kernel_version"`
+	Architecture  string       `json:"architecture"`
+	Timestamp     time.Time    `json:"timestamp"`
+}
+
+type CPUCore struct {
+	CoreID int     `json:"core_id"`
+	Usage  float64 `json:"usage"`
+}
+
+type CPUStats struct {
+	Overall float64   `json:"overall"`
+	PerCore []CPUCore `json:"per_core"`
 }
 
 type MemoryStats struct {
@@ -82,3 +98,25 @@ type DiskStats struct {
 	MountPoint string      `json:"mountPoint"`
 	AllMounts  []DiskMount `json:"allMounts"`
 }
+
+type NetworkInterface struct {
+	Name        string `json:"name"`
+	BytesSent   uint64 `json:"bytesSent"`
+	BytesRecv   uint64 `json:"bytesRecv"`
+	PacketsSent uint64 `json:"packetsSent"`
+	PacketsRecv uint64 `json:"packetsRecv"`
+	ErrorIn     uint64 `json:"errorIn"`
+	ErrorOut    uint64 `json:"errorOut"`
+	DropIn      uint64 `json:"dropIn"`
+	DropOut     uint64 `json:"dropOut"`
+}
+
+type NetworkStats struct {
+	TotalBytesSent   uint64             `json:"totalBytesSent"`
+	TotalBytesRecv   uint64             `json:"totalBytesRecv"`
+	TotalPacketsSent uint64             `json:"totalPacketsSent"`
+	TotalPacketsRecv uint64             `json:"totalPacketsRecv"`
+	Interfaces       []NetworkInterface `json:"interfaces"`
+	UploadSpeed      float64            `json:"uploadSpeed"`
+	DownloadSpeed    float64            `json:"downloadSpeed"`
+}

api/internal/features/deploy/proxy/caddy.go

@@ -80,12 +80,12 @@ func (c *Caddy) Serve() error {
 
 	// Replace the route for our domain
 	server := config.Apps.HTTP.Servers["nixopus"]
-	
+
 	// Ensure server has listen directive
 	if len(server.Listen) == 0 {
 		server.Listen = []string{":80"}
 	}
-	
+
 	var newRoutes []Route
 	for _, route := range server.Routes {
 		if len(route.Match) > 0 && len(route.Match[0].Host) > 0 && route.Match[0].Host[0] != c.Domain {

cli/app/commands/service/base.py

@@ -39,14 +39,13 @@ def build_command(action: str, name: str = "all", env_file: str = None, compose_
         cmd = ["docker", "compose"]
         if compose_file:
             cmd.extend(["-f", compose_file])
+        if env_file:
+            cmd.extend(["--env-file", env_file])
         cmd.append(action)
 
         if action == "up" and kwargs.get("detach", False):
             cmd.append("-d")
 
-        if env_file:
-            cmd.extend(["--env-file", env_file])
-
         if name != "all":
             cmd.append(name)
 
@@ -58,11 +57,14 @@ def build_cleanup_command(
         remove_images: str = "all",
         remove_volumes: bool = True,
         remove_orphans: bool = True,
+        env_file: str = None,
     ) -> list[str]:
         """Build a docker compose cleanup command (down with prune flags)."""
         cmd = ["docker", "compose"]
         if compose_file:
             cmd.extend(["-f", compose_file])
+        if env_file:
+            cmd.extend(["--env-file", env_file])
         cmd.append("down")
 
         if remove_images:

cli/app/commands/update/run.py

@@ -28,13 +28,12 @@ def __init__(self, logger: Logger):
     def run(self):
         compose_file = self.config.get_yaml_value(DEFAULT_COMPOSE_FILE)
         compose_file_path = self.config.get_yaml_value(NIXOPUS_CONFIG_DIR) + "/" + compose_file
-        env_file_path = self.config.get_yaml_value(NIXOPUS_CONFIG_DIR) + "/.env"
         self.logger.info(updating_nixopus)
 
         docker_service = BaseDockerService(self.logger, "pull")
 
         self.logger.debug(pulling_latest_images)
-        success, output = docker_service.execute_services(compose_file=compose_file_path, env_file=env_file_path)
+        success, output = docker_service.execute_services(compose_file=compose_file_path)
 
         if not success:
             self.logger.error(failed_to_pull_images.format(error=output))
@@ -44,7 +43,7 @@ def run(self):
 
         docker_service_up = BaseDockerService(self.logger, "up")
         self.logger.debug(starting_services)
-        success, output = docker_service_up.execute_services(compose_file=compose_file_path, env_file=env_file_path, detach=True)
+        success, output = docker_service_up.execute_services(compose_file=compose_file_path, detach=True)
 
         if not success:
             self.logger.error(failed_to_start_services.format(error=output))

cli/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nixopus"
-version = "0.1.18"
+version = "0.1.20"
 description = "A CLI for Nixopus"
 authors = ["Nixopus <[email protected]>"]
 readme = "README.md"

docker-compose.yml

@@ -32,7 +32,7 @@ services:
       - POSTGRES_PASSWORD=${PASSWORD}
       - POSTGRES_DB=${DB_NAME}
       - POSTGRES_HOST_AUTH_METHOD=trust
-
+    command: ["postgres", "-c", "jit=0"]
     ports:
       - "${DB_PORT:-5432}:5432"
     volumes: