chore: refactor Makefile with build and install improvements

- fix typo in INSTALLED_BIN variable name - add GENERATE flag to optionally skip go generate - add CREATE_SYSTEM_RESOURCES flag for user/dir creation control - make GIT_VERSION optional with ?= operator - add informative messages for skipped operations
feat: config command
2025-06-30 08:27:14 +03:00 · 2025-06-29 21:26:00 +03:00 · 2025-06-28 20:19:07 +03:00 · 2025-06-28 01:01:06 +03:00 · 2025-06-27 20:22:10 +00:00 · 2025-06-25 19:52:54 +03:00
50 changed files with 3151 additions and 787 deletions
--- a/.gitea/workflows/release.yaml
+++ b/.gitea/workflows/release.yaml
@ -84,31 +84,31 @@ jobs:
          sed -i "s/version='[0-9]\+\.[0-9]\+\.[0-9]\+'/version='${{ env.VERSION }}'/g" alr-default/alr-bin/alr.sh
          sed -i "s/release='[0-9]\+'/release='1'/g" alr-default/alr-bin/alr.sh

-      - name: Install alr
-        run: |
-          make install
+#      - name: Install alr
+#        run: |
+#          make install
+#
+#          # temporary fix
+#          groupadd wheel
+#          usermod -aG wheel root

-          # temporary fix
-          groupadd wheel
-          usermod -aG wheel root
+#      - name: Build packages
+#        run: |
+#          SCRIPT_PATH=alr-default/alr-bin/alr.sh
+#          ALR_DISTRO=altlinux ALR_PKG_FORMAT=rpm alr build -s "$SCRIPT_PATH"
+#          ALR_PKG_FORMAT=rpm alr build -s "$SCRIPT_PATH"
+#          ALR_PKG_FORMAT=deb alr build -s "$SCRIPT_PATH"
+#          ALR_PKG_FORMAT=archlinux alr build -s "$SCRIPT_PATH"

-      - name: Build packages
-        run: |
-          SCRIPT_PATH=alr-default/alr-bin/alr.sh
-          ALR_DISTRO=altlinux ALR_PKG_FORMAT=rpm alr build -s "$SCRIPT_PATH"
-          ALR_PKG_FORMAT=rpm alr build -s "$SCRIPT_PATH"
-          ALR_PKG_FORMAT=deb alr build -s "$SCRIPT_PATH"
-          ALR_PKG_FORMAT=archlinux alr build -s "$SCRIPT_PATH"
-
-      - name: Upload assets
-        uses: akkuman/gitea-release-action@v1
-        with:
-          body: ${{ steps.changes.outputs.changes }}
-          files: |-
-            alr-bin+alr-default_${{ env.VERSION }}-1.red80_amd64.deb \
-            alr-bin+alr-default-${{ env.VERSION }}-1-x86_64.pkg.tar.zst \
-            alr-bin+alr-default-${{ env.VERSION }}-1.red80.x86_64.rpm \
-            alr-bin+alr-default-${{ env.VERSION }}-alt1.x86_64.rpm
+#      - name: Upload assets
+#        uses: akkuman/gitea-release-action@v1
+#        with:
+#          body: ${{ steps.changes.outputs.changes }}
+#          files: |-
+#            alr-bin+alr-default_${{ env.VERSION }}-1.red80_amd64.deb \
+#            alr-bin+alr-default-${{ env.VERSION }}-1-x86_64.pkg.tar.zst \
+#            alr-bin+alr-default-${{ env.VERSION }}-1.red80.x86_64.rpm \
+#            alr-bin+alr-default-${{ env.VERSION }}-alt1.x86_64.rpm

      - name: Commit changes
        run: |
--- a/30
+++ b/30
@ -1,16 +1,21 @@
 NAME := alr
-GIT_VERSION = $(shell git describe --tags )
+GIT_VERSION ?= $(shell git describe --tags )
 IGNORE_ROOT_CHECK ?= 0
 DESTDIR ?=
 PREFIX ?= /usr/local
 BIN := ./$(NAME)
-INSTALED_BIN := $(DESTDIR)/$(PREFIX)/bin/$(NAME)
+INSTALLED_BIN := $(DESTDIR)/$(PREFIX)/bin/$(NAME)
 COMPLETIONS_DIR := ./scripts/completion
 BASH_COMPLETION := $(COMPLETIONS_DIR)/bash
 ZSH_COMPLETION := $(COMPLETIONS_DIR)/zsh
 INSTALLED_BASH_COMPLETION := $(DESTDIR)$(PREFIX)/share/bash-completion/completions/$(NAME)
 INSTALLED_ZSH_COMPLETION := $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_$(NAME)

+GENERATE ?= 1
+
+CREATE_SYSTEM_RESOURCES ?= 1
+ROOT_DIRS := /var/cache/alr /etc/alr
+
 ADD_LICENSE_BIN := go run github.com/google/addlicense@4caba19b7ed7818bb86bc4cd20411a246aa4a524
 GOLANGCI_LINT_BIN := go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.63.4
 XGOTEXT_BIN := go run github.com/Tom5521/xgotext@v1.2.0
@ -21,6 +26,11 @@ build: check-no-root $(BIN)

 export CGO_ENABLED := 0
 $(BIN):
+ifeq ($(GENERATE),1)
+	go generate ./...
+else
+	@echo "Skipping go generate (GENERATE=0)"
+endif
 	go build -ldflags="-X 'gitea.plemya-x.ru/Plemya-x/ALR/internal/config.Version=$(GIT_VERSION)'" -o $@

 check-no-root:
@ -31,20 +41,26 @@ check-no-root:
 	fi

 install: \
-	$(INSTALED_BIN) \
+	$(INSTALLED_BIN) \
 	$(INSTALLED_BASH_COMPLETION) \
 	$(INSTALLED_ZSH_COMPLETION)
 	@echo "Installation done!"

-$(INSTALED_BIN): $(BIN)
+$(INSTALLED_BIN): $(BIN)
 	install -Dm755 $< $@
-	setcap cap_setuid,cap_setgid+ep $(INSTALED_BIN)
+ifeq ($(CREATE_SYSTEM_RESOURCES),1)
+	setcap cap_setuid,cap_setgid+ep $(INSTALLED_BIN)
 	@if id alr >/dev/null 2>&1; then \
 		echo "User 'alr' already exists. Skipping."; \
 	else \
 		useradd -r -s /usr/sbin/nologin alr; \
 	fi
-	install -d -o alr -g alr -m 755 /var/cache/alr /etc/alr
+	@for dir in $(ROOT_DIRS); do \
+		install -d -o alr -g alr -m 755 $$dir; \
+	done
+else
+	@echo "Skipping user and root dir creation (CREATE_SYSTEM_RESOURCES=0)"
+endif

 $(INSTALLED_BASH_COMPLETION): $(BASH_COMPLETION)
 	install -Dm755 $< $@
@ -54,7 +70,7 @@ $(INSTALLED_ZSH_COMPLETION): $(ZSH_COMPLETION)

 uninstall:
 	rm -f \
-		$(INSTALED_BIN) \
+		$(INSTALLED_BIN) \
 		$(INSTALLED_BASH_COMPLETION) \
 		$(INSTALLED_ZSH_COMPLETION)

--- a/assets/coverage-badge.svg
+++ b/assets/coverage-badge.svg
@ -11,7 +11,7 @@
    <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
        <text x="33.5" y="15" fill="#010101" fill-opacity=".3">coverage</text>
        <text x="33.5" y="14">coverage</text>
-        <text x="86" y="15" fill="#010101" fill-opacity=".3">19.0%</text>
-        <text x="86" y="14">19.0%</text>
+        <text x="86" y="15" fill="#010101" fill-opacity=".3">19.2%</text>
+        <text x="86" y="14">19.2%</text>
    </g>
 </svg>
--- a/config.go
+++ b/config.go
@ -0,0 +1,227 @@
+// ALR - Any Linux Repository
+// Copyright (C) 2025 The ALR Authors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package main
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+
+	"github.com/goccy/go-yaml"
+	"github.com/leonelquinteros/gotext"
+	"github.com/urfave/cli/v2"
+
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
+	appbuilder "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils/app_builder"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/utils"
+)
+
+func ConfigCmd() *cli.Command {
+	return &cli.Command{
+		Name:  "config",
+		Usage: gotext.Get("Manage config"),
+		Subcommands: []*cli.Command{
+			ShowCmd(),
+			SetConfig(),
+			GetConfig(),
+		},
+	}
+}
+
+func ShowCmd() *cli.Command {
+	return &cli.Command{
+		Name:  "show",
+		Usage: gotext.Get("Show config"),
+		BashComplete: cliutils.BashCompleteWithError(func(c *cli.Context) error {
+			return nil
+		}),
+		Action: func(c *cli.Context) error {
+			deps, err := appbuilder.
+				New(c.Context).
+				WithConfig().
+				Build()
+			if err != nil {
+				return err
+			}
+			defer deps.Defer()
+
+			content, err := deps.Cfg.ToYAML()
+			if err != nil {
+				return err
+			}
+			fmt.Println(content)
+			return nil
+		},
+	}
+}
+
+var configKeys = []string{
+	"rootCmd",
+	"useRootCmd",
+	"pagerStyle",
+	"autoPull",
+	"logLevel",
+	"ignorePkgUpdates",
+}
+
+func SetConfig() *cli.Command {
+	return &cli.Command{
+		Name:      "set",
+		Usage:     gotext.Get("Set config value"),
+		ArgsUsage: gotext.Get("<key> <value>"),
+		BashComplete: cliutils.BashCompleteWithError(func(c *cli.Context) error {
+			if c.Args().Len() == 0 {
+				for _, key := range configKeys {
+					fmt.Println(key)
+				}
+				return nil
+			}
+			return nil
+		}),
+		Action: utils.RootNeededAction(func(c *cli.Context) error {
+			if c.Args().Len() < 2 {
+				return cliutils.FormatCliExit("missing args", nil)
+			}
+
+			key := c.Args().Get(0)
+			value := c.Args().Get(1)
+
+			deps, err := appbuilder.
+				New(c.Context).
+				WithConfig().
+				Build()
+			if err != nil {
+				return err
+			}
+			defer deps.Defer()
+
+			switch key {
+			case "rootCmd":
+				deps.Cfg.System.SetRootCmd(value)
+			case "useRootCmd":
+				boolValue, err := strconv.ParseBool(value)
+				if err != nil {
+					return cliutils.FormatCliExit(gotext.Get("invalid boolean value for %s: %s", key, value), err)
+				}
+				deps.Cfg.System.SetUseRootCmd(boolValue)
+			case "pagerStyle":
+				deps.Cfg.System.SetPagerStyle(value)
+			case "autoPull":
+				boolValue, err := strconv.ParseBool(value)
+				if err != nil {
+					return cliutils.FormatCliExit(gotext.Get("invalid boolean value for %s: %s", key, value), err)
+				}
+				deps.Cfg.System.SetAutoPull(boolValue)
+			case "logLevel":
+				deps.Cfg.System.SetLogLevel(value)
+			case "ignorePkgUpdates":
+				var updates []string
+				if value != "" {
+					updates = strings.Split(value, ",")
+					for i, update := range updates {
+						updates[i] = strings.TrimSpace(update)
+					}
+				}
+				deps.Cfg.System.SetIgnorePkgUpdates(updates)
+			case "repo", "repos":
+				return cliutils.FormatCliExit(gotext.Get("use 'repo add/remove' commands to manage repositories"), nil)
+			default:
+				return cliutils.FormatCliExit(gotext.Get("unknown config key: %s", key), nil)
+			}
+
+			if err := deps.Cfg.System.Save(); err != nil {
+				return cliutils.FormatCliExit(gotext.Get("failed to save config"), err)
+			}
+
+			fmt.Println(gotext.Get("Successfully set %s = %s", key, value))
+			return nil
+		}),
+	}
+}
+
+func GetConfig() *cli.Command {
+	return &cli.Command{
+		Name:      "get",
+		Usage:     gotext.Get("Get config value"),
+		ArgsUsage: gotext.Get("<key>"),
+		BashComplete: cliutils.BashCompleteWithError(func(c *cli.Context) error {
+			if c.Args().Len() == 0 {
+				for _, key := range configKeys {
+					fmt.Println(key)
+				}
+				return nil
+			}
+			return nil
+		}),
+		Action: func(c *cli.Context) error {
+			deps, err := appbuilder.
+				New(c.Context).
+				WithConfig().
+				Build()
+			if err != nil {
+				return err
+			}
+			defer deps.Defer()
+
+			if c.Args().Len() == 0 {
+				content, err := deps.Cfg.ToYAML()
+				if err != nil {
+					return cliutils.FormatCliExit("failed to serialize config", err)
+				}
+				fmt.Print(content)
+				return nil
+			}
+
+			key := c.Args().Get(0)
+
+			switch key {
+			case "rootCmd":
+				fmt.Println(deps.Cfg.RootCmd())
+			case "useRootCmd":
+				fmt.Println(deps.Cfg.UseRootCmd())
+			case "pagerStyle":
+				fmt.Println(deps.Cfg.PagerStyle())
+			case "autoPull":
+				fmt.Println(deps.Cfg.AutoPull())
+			case "logLevel":
+				fmt.Println(deps.Cfg.LogLevel())
+			case "ignorePkgUpdates":
+				updates := deps.Cfg.IgnorePkgUpdates()
+				if len(updates) == 0 {
+					fmt.Println("[]")
+				} else {
+					fmt.Println(strings.Join(updates, ", "))
+				}
+			case "repo", "repos":
+				repos := deps.Cfg.Repos()
+				if len(repos) == 0 {
+					fmt.Println("[]")
+				} else {
+					repoData, err := yaml.Marshal(repos)
+					if err != nil {
+						return cliutils.FormatCliExit("failed to serialize repos", err)
+					}
+					fmt.Print(string(repoData))
+				}
+			default:
+				return cliutils.FormatCliExit(gotext.Get("unknown config key: %s", key), nil)
+			}
+
+			return nil
+		},
+	}
+}
--- a/e2e-tests/addrepo_test.go
+++ b/e2e-tests/addrepo_test.go
@ -66,7 +66,7 @@ func TestE2EAlrAddRepo(t *testing.T) {
 				"cat /etc/alr/alr.toml",
 			), e2e.WithExecOptionStdout(&buf))
 			assert.NoError(t, err)
-			assert.Contains(t, buf.String(), "rootCmd")
+			assert.Contains(t, buf.String(), "repo = []")
 		},
 	)
 }
--- a/e2e-tests/issue_78_mirrors_test.go
+++ b/e2e-tests/issue_78_mirrors_test.go
@ -0,0 +1,53 @@
+// ALR - Any Linux Repository
+// Copyright (C) 2025 The ALR Authors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+//go:build e2e
+
+package e2etests_test
+
+import (
+	"testing"
+
+	"github.com/efficientgo/e2e"
+)
+
+func TestE2EIssue78Mirrors(t *testing.T) {
+	dockerMultipleRun(
+		t,
+		"issue-78-mirrors",
+		COMMON_SYSTEMS,
+		func(t *testing.T, r e2e.Runnable) {
+			defaultPrepare(t, r)
+			execShouldNoError(t, r, "sudo", "alr", "repo", "mirror", "add", REPO_NAME_FOR_E2E_TESTS, "https://gitea.plemya-x.ru/Maks1mS/repo-for-tests.git")
+			execShouldNoError(t, r, "sudo", "alr", "repo", "set-url", REPO_NAME_FOR_E2E_TESTS, "https://example.com")
+			execShouldNoError(t, r, "sudo", "alr", "ref")
+			execShouldNoError(t, r, "sudo", "alr", "repo", "mirror", "clear", REPO_NAME_FOR_E2E_TESTS)
+			execShouldError(t, r, "sudo", "alr", "ref")
+
+			execShouldNoError(t, r, "sudo", "alr", "repo", "mirror", "add", REPO_NAME_FOR_E2E_TESTS, "https://gitea.plemya-x.ru/Maks1mS/repo-for-tests.git")
+			execShouldNoError(t, r, "sudo", "alr", "repo", "mirror", "rm", "--partial", REPO_NAME_FOR_E2E_TESTS, "gitea.plemya-x.ru/Maks1mS")
+			execShouldError(t, r, "sudo", "alr", "ref")
+
+			execShouldNoError(t, r, "sudo", "alr", "repo", "mirror", "add", REPO_NAME_FOR_E2E_TESTS, "https://gitea.plemya-x.ru/Maks1mS/repo-for-tests.git")
+			execShouldNoError(t, r, "sudo", "alr", "repo", "mirror", "rm", REPO_NAME_FOR_E2E_TESTS, "https://gitea.plemya-x.ru/Maks1mS/repo-for-tests.git")
+			execShouldError(t, r, "sudo", "alr", "ref")
+
+			execShouldNoError(t, r, "sudo", "alr", "repo", "mirror", "add", REPO_NAME_FOR_E2E_TESTS, "https://gitea.plemya-x.ru/Maks1mS/repo-for-tests.git")
+			execShouldNoError(t, r, "sudo", "alr", "repo", "mirror", "rm", REPO_NAME_FOR_E2E_TESTS, "https://gitea.plemya-x.ru/Maks1mS/repo-for-tests.git")
+			execShouldError(t, r, "sudo", "alr", "ref")
+		},
+	)
+}
--- a/e2e-tests/issue_95_config_command_test.go
+++ b/e2e-tests/issue_95_config_command_test.go
@ -0,0 +1,47 @@
+// ALR - Any Linux Repository
+// Copyright (C) 2025 The ALR Authors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+//go:build e2e
+
+package e2etests_test
+
+import (
+	"testing"
+
+	"github.com/efficientgo/e2e"
+)
+
+func TestE2EIssue95ConfigCommand(t *testing.T) {
+	dockerMultipleRun(
+		t,
+		"issue-95-config-command",
+		COMMON_SYSTEMS,
+		func(t *testing.T, r e2e.Runnable) {
+			defaultPrepare(t, r)
+			execShouldNoError(t, r, "sh", "-c", "alr config show | grep \"autoPull: true\"")
+			execShouldNoError(t, r, "sh", "-c", "alr config get | grep \"autoPull: true\"")
+			execShouldError(t, r, "sh", "-c", "cat /etc/alr/alr.toml | grep \"autoPull\"")
+			execShouldNoError(t, r, "alr", "config", "get", "autoPull")
+			execShouldError(t, r, "alr", "config", "set", "autoPull")
+			execShouldNoError(t, r, "sudo", "alr", "config", "set", "autoPull", "false")
+			execShouldNoError(t, r, "sh", "-c", "alr config show | grep \"autoPull: false\"")
+			execShouldNoError(t, r, "sh", "-c", "alr config get | grep \"autoPull: false\"")
+			execShouldNoError(t, r, "sh", "-c", "cat /etc/alr/alr.toml | grep \"autoPull = false\"")
+			execShouldNoError(t, r, "alr", "config", "set", "autoPull", "true")
+			execShouldNoError(t, r, "sh", "-c", "cat /etc/alr/alr.toml | grep \"autoPull = true\"")
+		},
+	)
+}
--- a/generators/alrsh-package/main.go
+++ b/generators/alrsh-package/main.go
@ -0,0 +1,251 @@
+// ALR - Any Linux Repository
+// Copyright (C) 2025 The ALR Authors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"go/ast"
+	"go/format"
+	"go/parser"
+	"go/token"
+	"log"
+	"os"
+	"reflect"
+	"strings"
+	"text/template"
+)
+
+func resolvedStructGenerator(buf *bytes.Buffer, fields []*ast.Field) {
+	contentTemplate := template.Must(template.New("").Parse(`
+type {{ .EntityNameLower }}Resolved struct {
+{{ .StructFields }}
+}
+`))
+
+	var structFieldsBuilder strings.Builder
+
+	for _, field := range fields {
+		for _, name := range field.Names {
+			// Поле с типом
+			fieldTypeStr := exprToString(field.Type)
+
+			// Структура поля
+			var buf bytes.Buffer
+			buf.WriteString("\t")
+			buf.WriteString(name.Name)
+			buf.WriteString(" ")
+			buf.WriteString(fieldTypeStr)
+
+			// Обработка json-тега
+			jsonTag := ""
+			if field.Tag != nil {
+				raw := strings.Trim(field.Tag.Value, "`")
+				tag := reflect.StructTag(raw)
+				if val := tag.Get("json"); val != "" {
+					jsonTag = val
+				}
+			}
+			if jsonTag == "" {
+				jsonTag = strings.ToLower(name.Name)
+			}
+			buf.WriteString(fmt.Sprintf(" `json:\"%s\"`", jsonTag))
+			buf.WriteString("\n")
+			structFieldsBuilder.Write(buf.Bytes())
+		}
+	}
+
+	params := struct {
+		EntityNameLower string
+		StructFields    string
+	}{
+		EntityNameLower: "package",
+		StructFields:    structFieldsBuilder.String(),
+	}
+
+	err := contentTemplate.Execute(buf, params)
+	if err != nil {
+		log.Fatalf("execute template: %v", err)
+	}
+}
+
+func toResolvedFuncGenerator(buf *bytes.Buffer, fields []*ast.Field) {
+	contentTemplate := template.Must(template.New("").Parse(`
+func {{ .EntityName }}ToResolved(src *{{ .EntityName }}) {{ .EntityNameLower }}Resolved {
+	return {{ .EntityNameLower }}Resolved{
+{{ .Assignments }}
+	}
+}
+`))
+
+	var assignmentsBuilder strings.Builder
+
+	for _, field := range fields {
+		for _, name := range field.Names {
+			var assignBuf bytes.Buffer
+			assignBuf.WriteString("\t\t")
+			assignBuf.WriteString(name.Name)
+			assignBuf.WriteString(": ")
+			if isOverridableField(field.Type) {
+				assignBuf.WriteString(fmt.Sprintf("src.%s.Resolved()", name.Name))
+			} else {
+				assignBuf.WriteString(fmt.Sprintf("src.%s", name.Name))
+			}
+			assignBuf.WriteString(",\n")
+			assignmentsBuilder.Write(assignBuf.Bytes())
+		}
+	}
+
+	params := struct {
+		EntityName      string
+		EntityNameLower string
+		Assignments     string
+	}{
+		EntityName:      "Package",
+		EntityNameLower: "package",
+		Assignments:     assignmentsBuilder.String(),
+	}
+
+	err := contentTemplate.Execute(buf, params)
+	if err != nil {
+		log.Fatalf("execute template: %v", err)
+	}
+}
+
+func resolveFuncGenerator(buf *bytes.Buffer, fields []*ast.Field) {
+	contentTemplate := template.Must(template.New("").Parse(`
+func Resolve{{ .EntityName }}(pkg *{{ .EntityName }}, overrides []string) {
+{{.Code}}}
+`))
+
+	var codeBuilder strings.Builder
+
+	for _, field := range fields {
+		for _, name := range field.Names {
+			if isOverridableField(field.Type) {
+				var buf bytes.Buffer
+				buf.WriteString(fmt.Sprintf("\t\tpkg.%s.Resolve(overrides)\n", name.Name))
+				codeBuilder.Write(buf.Bytes())
+			}
+		}
+	}
+
+	params := struct {
+		EntityName string
+		Code       string
+	}{
+		EntityName: "Package",
+		Code:       codeBuilder.String(),
+	}
+
+	err := contentTemplate.Execute(buf, params)
+	if err != nil {
+		log.Fatalf("execute template: %v", err)
+	}
+}
+
+func main() {
+	path := os.Getenv("GOFILE")
+	if path == "" {
+		log.Fatal("GOFILE must be set")
+	}
+
+	fset := token.NewFileSet()
+	node, err := parser.ParseFile(fset, path, nil, parser.AllErrors)
+	if err != nil {
+		log.Fatalf("parsing file: %v", err)
+	}
+
+	entityName := "Package" // имя структуры, которую анализируем
+
+	found := false
+
+	fields := make([]*ast.Field, 0)
+
+	// Ищем структуру с нужным именем
+	for _, decl := range node.Decls {
+		genDecl, ok := decl.(*ast.GenDecl)
+		if !ok || genDecl.Tok != token.TYPE {
+			continue
+		}
+		for _, spec := range genDecl.Specs {
+			typeSpec := spec.(*ast.TypeSpec)
+			if typeSpec.Name.Name != entityName {
+				continue
+			}
+			structType, ok := typeSpec.Type.(*ast.StructType)
+			if !ok {
+				continue
+			}
+			fields = structType.Fields.List
+			found = true
+		}
+	}
+
+	if !found {
+		log.Fatalf("struct %s not found", entityName)
+	}
+
+	var buf bytes.Buffer
+
+	buf.WriteString("// DO NOT EDIT MANUALLY. This file is generated.\n")
+	buf.WriteString("package alrsh")
+
+	resolvedStructGenerator(&buf, fields)
+	toResolvedFuncGenerator(&buf, fields)
+	resolveFuncGenerator(&buf, fields)
+
+	// Форматируем вывод
+	formatted, err := format.Source(buf.Bytes())
+	if err != nil {
+		log.Fatalf("formatting: %v", err)
+	}
+
+	outPath := strings.TrimSuffix(path, ".go") + "_gen.go"
+	outFile, err := os.Create(outPath)
+	if err != nil {
+		log.Fatalf("create file: %v", err)
+	}
+	_, err = outFile.Write(formatted)
+	if err != nil {
+		log.Fatalf("writing output: %v", err)
+	}
+	outFile.Close()
+}
+
+func exprToString(expr ast.Expr) string {
+	if t, ok := expr.(*ast.IndexExpr); ok {
+		if ident, ok := t.X.(*ast.Ident); ok && ident.Name == "OverridableField" {
+			return exprToString(t.Index) // T
+		}
+	}
+
+	var buf bytes.Buffer
+	if err := format.Node(&buf, token.NewFileSet(), expr); err != nil {
+		return "<invalid>"
+	}
+	return buf.String()
+}
+
+func isOverridableField(expr ast.Expr) bool {
+	indexExpr, ok := expr.(*ast.IndexExpr)
+	if !ok {
+		return false
+	}
+	ident, ok := indexExpr.X.(*ast.Ident)
+	return ok && ident.Name == "OverridableField"
+}
--- a/go.mod
+++ b/go.mod
@ -9,6 +9,7 @@ require (
 	github.com/AlecAivazis/survey/v2 v2.3.7
 	github.com/PuerkitoBio/purell v1.2.0
 	github.com/alecthomas/chroma/v2 v2.9.1
+	github.com/bmatcuk/doublestar/v4 v4.8.1
 	github.com/caarlos0/env v3.5.0+incompatible
 	github.com/charmbracelet/bubbles v0.20.0
 	github.com/charmbracelet/bubbletea v1.2.4
@ -17,18 +18,18 @@ require (
 	github.com/efficientgo/e2e v0.14.1-0.20240418111536-97db25a0c6c0
 	github.com/go-git/go-billy/v5 v5.6.0
 	github.com/go-git/go-git/v5 v5.13.0
+	github.com/goccy/go-yaml v1.18.0
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/goreleaser/nfpm/v2 v2.41.0
 	github.com/hashicorp/go-hclog v0.14.1
 	github.com/hashicorp/go-plugin v1.6.3
 	github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08
-	github.com/jmoiron/sqlx v1.3.5
 	github.com/leonelquinteros/gotext v1.7.0
 	github.com/mattn/go-isatty v0.0.20
 	github.com/mholt/archiver/v4 v4.0.0-alpha.8
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/muesli/reflow v0.3.0
-	github.com/pelletier/go-toml/v2 v2.1.0
+	github.com/pelletier/go-toml/v2 v2.2.4
 	github.com/stretchr/testify v1.10.0
 	github.com/tailscale/goexpect v0.0.0-20210902213824-6e8c725cea41
 	github.com/urfave/cli/v2 v2.25.7
@ -36,9 +37,8 @@ require (
 	go.elara.ws/vercmp v0.0.0-20230622214216-0b2b067575c4
 	golang.org/x/crypto v0.36.0
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
-	golang.org/x/sys v0.31.0
+	golang.org/x/sys v0.33.0
 	golang.org/x/text v0.23.0
-	gopkg.in/yaml.v3 v3.0.1
 	modernc.org/sqlite v1.25.0
 	mvdan.cc/sh/v3 v3.10.0
 	xorm.io/xorm v1.3.9
@ -62,7 +62,7 @@ require (
 	github.com/charmbracelet/harmonica v0.2.0 // indirect
 	github.com/charmbracelet/x/ansi v0.4.5 // indirect
 	github.com/charmbracelet/x/term v0.2.1 // indirect
-	github.com/cloudflare/circl v1.3.8 // indirect
+	github.com/cloudflare/circl v1.6.1 // indirect
 	github.com/connesc/cipherio v0.2.1 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
 	github.com/creack/pty v1.1.24 // indirect
@ -75,8 +75,11 @@ require (
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
 	github.com/fatih/color v1.7.0 // indirect
+	github.com/fatih/structs v1.1.0 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/goccy/go-json v0.8.1 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@ -84,7 +87,7 @@ require (
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f // indirect
 	github.com/google/rpmpack v0.6.1-0.20240329070804-c2247cbb881a // indirect
-	github.com/google/uuid v1.4.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/goreleaser/chglog v0.6.1 // indirect
 	github.com/goreleaser/fileglob v1.3.0 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
@ -98,6 +101,15 @@ require (
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/klauspost/pgzip v1.2.6 // indirect
+	github.com/knadh/koanf/maps v0.1.2 // indirect
+	github.com/knadh/koanf/parsers/json v1.0.0 // indirect
+	github.com/knadh/koanf/parsers/toml/v2 v2.2.0 // indirect
+	github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
+	github.com/knadh/koanf/providers/env v1.1.0 // indirect
+	github.com/knadh/koanf/providers/file v1.2.0 // indirect
+	github.com/knadh/koanf/providers/rawbytes v1.0.0 // indirect
+	github.com/knadh/koanf/providers/structs v1.0.0 // indirect
+	github.com/knadh/koanf/v2 v2.2.1 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-localereader v0.0.1 // indirect
@ -121,7 +133,7 @@ require (
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/skeema/knownhosts v1.3.0 // indirect
-	github.com/spf13/cast v1.6.0 // indirect
+	github.com/spf13/cast v1.7.1 // indirect
 	github.com/syndtr/goleveldb v1.0.0 // indirect
 	github.com/therootcompany/xz v1.0.1 // indirect
 	github.com/ulikunitz/xz v0.5.12 // indirect
@ -132,13 +144,15 @@ require (
 	go4.org v0.0.0-20200411211856-f5505b9728dd // indirect
 	golang.org/x/mod v0.19.0 // indirect
 	golang.org/x/net v0.38.0 // indirect
+	golang.org/x/oauth2 v0.25.0 // indirect
 	golang.org/x/sync v0.12.0 // indirect
 	golang.org/x/term v0.30.0 // indirect
 	golang.org/x/tools v0.23.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
-	google.golang.org/grpc v1.58.3 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
+	google.golang.org/grpc v1.67.3 // indirect
 	google.golang.org/protobuf v1.36.1 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 	lukechampine.com/uint128 v1.2.0 // indirect
 	modernc.org/cc/v3 v3.40.0 // indirect
 	modernc.org/ccgo/v3 v3.16.13 // indirect
--- a/go.sum
+++ b/go.sum
@ -67,6 +67,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb h1:m935MPodAbYS46DG4pJSv7WO+VECIWUQ7OJYSoTrMh4=
 github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb/go.mod h1:PkYb9DJNAwrSvRx5DYA+gUcOIgTGVMNkfSCbZM8cWpI=
+github.com/bmatcuk/doublestar/v4 v4.8.1 h1:54Bopc5c2cAvhLRAzqOGCYHYyhcDHsFF4wWIR5wKP38=
+github.com/bmatcuk/doublestar/v4 v4.8.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
 github.com/bodgit/plumbing v1.2.0 h1:gg4haxoKphLjml+tgnecR4yLBV5zo4HAZGCtAh3xCzM=
 github.com/bodgit/plumbing v1.2.0/go.mod h1:b9TeRi7Hvc6Y05rjm8VML3+47n4XTZPtQ/5ghqic2n8=
 github.com/bodgit/sevenzip v1.3.0 h1:1ljgELgtHqvgIp8W8kgeEGHIWP4ch3xGI8uOBZgLVKY=
@ -82,8 +84,8 @@ github.com/caarlos0/testfs v0.4.4/go.mod h1:bRN55zgG4XCUVVHZCeU+/Tz1Q6AxEJOEJTli
 github.com/cavaliergopher/cpio v1.0.1 h1:KQFSeKmZhv0cr+kawA3a0xTQCU4QxXF1vhU7P7av2KM=
 github.com/cavaliergopher/cpio v1.0.1/go.mod h1:pBdaqQjnvXxdS/6CvNDwIANIFSP0xRKI16PX4xejRQc=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/charmbracelet/bubbles v0.20.0 h1:jSZu6qD8cRQ6k9OMfR1WlM+ruM8fkPWkHvQWD9LIutE=
 github.com/charmbracelet/bubbles v0.20.0/go.mod h1:39slydyswPy+uVOHZ5x/GjwVAFkCsV8IIVy+4MhzwwU=
 github.com/charmbracelet/bubbletea v1.2.4 h1:KN8aCViA0eps9SCOThb2/XPIlea3ANJLUkv3KnQRNCE=
@ -102,8 +104,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cloudflare/circl v1.3.8 h1:j+V8jJt09PoeMFIu2uh5JUyEaIHTXVOHslFoLNAKqwI=
-github.com/cloudflare/circl v1.3.8/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU=
+github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
+github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
 github.com/connesc/cipherio v0.2.1 h1:FGtpTPMbKNNWByNrr9aEBtaJtXjqOzkIXNYJp6OEycw=
 github.com/connesc/cipherio v0.2.1/go.mod h1:ukY0MWJDFnJEbXMQtOcn2VmTpRfzcTz4OoVrWGGJZcA=
 github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
@ -137,9 +139,13 @@ github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
+github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
+github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
 github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
@ -156,13 +162,16 @@ github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi
 github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI=
 github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow=
-github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
 github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
+github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
+github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/goccy/go-json v0.8.1 h1:4/Wjm0JIJaTDm8K1KcGrLHJoa8EsJ13YWeX+6Kfq6uI=
 github.com/goccy/go-json v0.8.1/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
+github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@ -209,8 +218,8 @@ github.com/google/rpmpack v0.6.1-0.20240329070804-c2247cbb881a/go.mod h1:uqVAUVQ
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
-github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
@ -251,8 +260,6 @@ github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08 h1:wMeVzrPO3m
 github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08/go.mod h1:ZDXo8KHryOWSIqnsb/CiDq7hQUYryCgdVnxbj8tDG7o=
 github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
 github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo=
-github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
-github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
 github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
@ -272,6 +279,24 @@ github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90
 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU=
 github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
+github.com/knadh/koanf/maps v0.1.2 h1:RBfmAW5CnZT+PJ1CVc1QSJKf4Xu9kxfQgYVQSu8hpbo=
+github.com/knadh/koanf/maps v0.1.2/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI=
+github.com/knadh/koanf/parsers/json v1.0.0 h1:1pVR1JhMwbqSg5ICzU+surJmeBbdT4bQm7jjgnA+f8o=
+github.com/knadh/koanf/parsers/json v1.0.0/go.mod h1:zb5WtibRdpxSoSJfXysqGbVxvbszdlroWDHGdDkkEYU=
+github.com/knadh/koanf/parsers/toml/v2 v2.2.0 h1:2nV7tHYJ5OZy2BynQ4mOJ6k5bDqbbCzRERLUKBytz3A=
+github.com/knadh/koanf/parsers/toml/v2 v2.2.0/go.mod h1:JpjTeK1Ge1hVX0wbof5DMCuDBriR8bWgeQP98eeOZpI=
+github.com/knadh/koanf/providers/confmap v1.0.0 h1:mHKLJTE7iXEys6deO5p6olAiZdG5zwp8Aebir+/EaRE=
+github.com/knadh/koanf/providers/confmap v1.0.0/go.mod h1:txHYHiI2hAtF0/0sCmcuol4IDcuQbKTybiB1nOcUo1A=
+github.com/knadh/koanf/providers/env v1.1.0 h1:U2VXPY0f+CsNDkvdsG8GcsnK4ah85WwWyJgef9oQMSc=
+github.com/knadh/koanf/providers/env v1.1.0/go.mod h1:QhHHHZ87h9JxJAn2czdEl6pdkNnDh/JS1Vtsyt65hTY=
+github.com/knadh/koanf/providers/file v1.2.0 h1:hrUJ6Y9YOA49aNu/RSYzOTFlqzXSCpmYIDXI7OJU6+U=
+github.com/knadh/koanf/providers/file v1.2.0/go.mod h1:bp1PM5f83Q+TOUu10J/0ApLBd9uIzg+n9UgthfY+nRA=
+github.com/knadh/koanf/providers/rawbytes v1.0.0 h1:MrKDh/HksJlKJmaZjgs4r8aVBb/zsJyc/8qaSnzcdNI=
+github.com/knadh/koanf/providers/rawbytes v1.0.0/go.mod h1:KxwYJf1uezTKy6PBtfE+m725NGp4GPVA7XoNTJ/PtLo=
+github.com/knadh/koanf/providers/structs v1.0.0 h1:DznjB7NQykhqCar2LvNug3MuxEQsZ5KvfgMbio+23u4=
+github.com/knadh/koanf/providers/structs v1.0.0/go.mod h1:kjo5TFtgpaZORlpoJqcbeLowM2cINodv8kX+oFAeQ1w=
+github.com/knadh/koanf/v2 v2.2.1 h1:jaleChtw85y3UdBnI0wCqcg1sj1gPoz6D3caGNHtrNE=
+github.com/knadh/koanf/v2 v2.2.1/go.mod h1:PSFru3ufQgTsI7IF+95rf9s8XA1+aHxKuO/W+dPoHEY=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
@ -281,9 +306,6 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leonelquinteros/gotext v1.7.0 h1:jcJmF4AXqyamP7vuw2MMIKs+O3jAEmvrc5JQiI8Ht/8=
 github.com/leonelquinteros/gotext v1.7.0/go.mod h1:qJdoQuERPpccw7L70uoU+K/BvTfRBHYsisCQyFLXyvw=
-github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
-github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
@ -302,7 +324,6 @@ github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+Ei
 github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
 github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
 github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
@ -344,8 +365,10 @@ github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
 github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
-github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
-github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
+github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
+github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
+github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
+github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
 github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0=
 github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
@ -391,19 +414,15 @@ github.com/smarty/assertions v1.15.0/go.mod h1:yABtdzeQs6l1brC900WlRNwj6ZR55d7B+
 github.com/smartystreets/goconvey v1.8.1 h1:qGjIddxOk4grTu9JPOU31tVfq3cNdBlNa5sSznIX1xY=
 github.com/smartystreets/goconvey v1.8.1/go.mod h1:+/u4qLyY6x1jReYOp7GOM2FSt8aP9CzCZL03bI28W60=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0=
-github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
+github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
+github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
@ -503,8 +522,8 @@ golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4Iltr
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8=
-golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI=
+golang.org/x/oauth2 v0.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70=
+golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@ -544,6 +563,8 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
 golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
@ -604,8 +625,6 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
-google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@ -619,8 +638,8 @@ google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvx
 google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 h1:TqExAhdPaB60Ux47Cn0oLV07rGnxZzIsaRhQaqS666A=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8/go.mod h1:lcTa1sDdWEIHMWlITnIczmw5w60CF9ffkb8Z+DVmmjA=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@ -628,8 +647,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ=
-google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
+google.golang.org/grpc v1.67.3 h1:OgPcDAFKHnH8X3O4WcO4XUc8GRDeKsKReqbQtiCj7N8=
+google.golang.org/grpc v1.67.3/go.mod h1:YGaHCc6Oap+FzBJTZLBzkGSYt/cvGPFTPxkn7QfSU8s=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
--- a/info.go
+++ b/info.go
@ -23,10 +23,10 @@ import (
 	"fmt"
 	"os"

+	"github.com/goccy/go-yaml"
 	"github.com/jeandeaual/go-locale"
 	"github.com/leonelquinteros/gotext"
 	"github.com/urfave/cli/v2"
-	"gopkg.in/yaml.v3"

 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
 	appbuilder "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils/app_builder"
@ -121,35 +121,27 @@ func InfoCmd() *cli.Command {
 				systemLang = "en"
 			}

-			if !all {
-				info, err := distro.ParseOSRelease(ctx)
-				if err != nil {
-					return cliutils.FormatCliExit(gotext.Get("Error parsing os-release file"), err)
-				}
-				names, err = overrides.Resolve(
-					info,
-					overrides.DefaultOpts.
-						WithLanguages([]string{systemLang}),
-				)
-				if err != nil {
-					return cliutils.FormatCliExit(gotext.Get("Error resolving overrides"), err)
-				}
+			info, err := distro.ParseOSRelease(ctx)
+			if err != nil {
+				return cliutils.FormatCliExit(gotext.Get("Error parsing os-release file"), err)
+			}
+			names, err = overrides.Resolve(
+				info,
+				overrides.DefaultOpts.
+					WithLanguages([]string{systemLang}),
+			)
+			if err != nil {
+				return cliutils.FormatCliExit(gotext.Get("Error resolving overrides"), err)
 			}

 			for _, pkg := range pkgs {
-				if !all {
-					alrsh.ResolvePackage(&pkg, names)
-					err = yaml.NewEncoder(os.Stdout).Encode(pkg)
-					if err != nil {
-						return cliutils.FormatCliExit(gotext.Get("Error encoding script variables"), err)
-					}
-				} else {
-					err = yaml.NewEncoder(os.Stdout).Encode(pkg)
-					if err != nil {
-						return cliutils.FormatCliExit(gotext.Get("Error encoding script variables"), err)
-					}
+				alrsh.ResolvePackage(&pkg, names)
+				view := alrsh.NewPackageView(pkg)
+				view.Resolved = !all
+				err = yaml.NewEncoder(os.Stdout, yaml.UseJSONMarshaler(), yaml.OmitEmpty()).Encode(view)
+				if err != nil {
+					return cliutils.FormatCliExit(gotext.Get("Error encoding script variables"), err)
 				}
-
 				fmt.Println("---")
 			}

--- a/internal/build/build.go
+++ b/internal/build/build.go
@ -214,6 +214,8 @@ type CheckerExecutor interface {
 type InstallerExecutor interface {
 	InstallLocal(paths []string, opts *manager.Opts) error
 	Install(pkgs []string, opts *manager.Opts) error
+	Remove(pkgs []string, opts *manager.Opts) error
+
 	RemoveAlreadyInstalled(pkgs []string) ([]string, error)
 }

@ -367,7 +369,7 @@ func (b *Builder) BuildPackage(
 	}

 	slog.Debug("ViewScript")
-	slog.Debug("", "varsOfPackages", varsOfPackages)
+	slog.Debug("", "varsOfPackages", varsOfPackages[0])
 	err = b.scriptViewerExecutor.ViewScript(ctx, input, sf, basePkg)
 	if err != nil {
 		return nil, err
@ -408,7 +410,7 @@ func (b *Builder) BuildPackage(
 	sources, checksums = removeDuplicatesSources(sources, checksums)

 	slog.Debug("installBuildDeps")
-	alrBuildDeps, err := b.installBuildDeps(ctx, input, buildDepends)
+	alrBuildDeps, installedBuildDeps, err := b.installBuildDeps(ctx, input, buildDepends)
 	if err != nil {
 		return nil, err
 	}
@ -477,9 +479,39 @@ func (b *Builder) BuildPackage(

 	builtDeps = removeDuplicates(append(builtDeps, res...))

+	err = b.removeBuildDeps(ctx, input, installedBuildDeps)
+	if err != nil {
+		return nil, err
+	}
+
 	return builtDeps, nil
 }

+func (b *Builder) removeBuildDeps(ctx context.Context, input interface {
+	BuildOptsProvider
+}, deps []string,
+) error {
+	if len(deps) > 0 {
+		remove, err := cliutils.YesNoPrompt(ctx, gotext.Get("Would you like to remove the build dependencies?"), input.BuildOpts().Interactive, false)
+		if err != nil {
+			return err
+		}
+
+		if remove {
+			err = b.installerExecutor.Remove(
+				deps,
+				&manager.Opts{
+					NoConfirm: !input.BuildOpts().Interactive,
+				},
+			)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
 type InstallPkgsArgs struct {
 	BuildArgs
 	AlrPkgs    []alrsh.Package
@ -608,20 +640,22 @@ func (i *Builder) installBuildDeps(
 		PkgFormatProvider
 	},
 	pkgs []string,
-) ([]*BuiltDep, error) {
+) ([]*BuiltDep, []string, error) {
 	var builtDeps []*BuiltDep
+	var deps []string
+	var err error
 	if len(pkgs) > 0 {
-		deps, err := i.installerExecutor.RemoveAlreadyInstalled(pkgs)
+		deps, err = i.installerExecutor.RemoveAlreadyInstalled(pkgs)
 		if err != nil {
-			return nil, err
+			return nil, nil, err
 		}

 		builtDeps, err = i.InstallPkgs(ctx, input, deps) // Устанавливаем выбранные пакеты
 		if err != nil {
-			return nil, err
+			return nil, nil, err
 		}
 	}
-	return builtDeps, nil
+	return builtDeps, deps, nil
 }

 func (i *Builder) installOptDeps(
--- a/internal/build/firejail.go
+++ b/internal/build/firejail.go
@ -28,7 +28,6 @@ import (
 	"github.com/goreleaser/nfpm/v2/files"
 	"github.com/leonelquinteros/gotext"

-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/osutils"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/alrsh"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/types"
 )
@ -51,6 +50,92 @@ var binaryDirectories = []string{
 	"/usr/local/bin/",
 }

+func moveWithSymlinkHandling(src, dst string) error {
+	srcInfo, err := os.Lstat(src)
+	if err != nil {
+		return fmt.Errorf("failed to get source info: %w", err)
+	}
+
+	if err := os.MkdirAll(filepath.Dir(dst), 0o755); err != nil {
+		return fmt.Errorf("failed to create destination directory: %w", err)
+	}
+
+	if srcInfo.Mode()&os.ModeSymlink != 0 {
+		return moveSymlink(src, dst)
+	}
+
+	if err := os.Rename(src, dst); err != nil {
+		return copyAndRemove(src, dst)
+	}
+
+	return nil
+}
+
+func moveSymlink(src, dst string) error {
+	target, err := os.Readlink(src)
+	if err != nil {
+		return fmt.Errorf("failed to read symlink: %w", err)
+	}
+
+	if err := os.Symlink(target, dst); err != nil {
+		return fmt.Errorf("failed to create symlink: %w", err)
+	}
+
+	if err := os.Remove(src); err != nil {
+		os.Remove(dst)
+		return fmt.Errorf("failed to remove original symlink: %w", err)
+	}
+
+	return nil
+}
+
+func copyAndRemove(src, dst string) error {
+	srcFile, err := os.Open(src)
+	if err != nil {
+		return fmt.Errorf("failed to open source: %w", err)
+	}
+	defer srcFile.Close()
+
+	dstFile, err := os.Create(dst)
+	if err != nil {
+		return fmt.Errorf("failed to create destination: %w", err)
+	}
+	defer dstFile.Close()
+
+	if _, err := io.Copy(dstFile, srcFile); err != nil {
+		return fmt.Errorf("failed to copy content: %w", err)
+	}
+
+	srcInfo, err := srcFile.Stat()
+	if err != nil {
+		return fmt.Errorf("failed to get source stats: %w", err)
+	}
+
+	if err := dstFile.Chmod(srcInfo.Mode()); err != nil {
+		return fmt.Errorf("failed to set permissions: %w", err)
+	}
+
+	if err := os.Remove(src); err != nil {
+		return fmt.Errorf("failed to remove source: %w", err)
+	}
+
+	return nil
+}
+
+func moveFileWithErrorHandling(src, dst string) error {
+	err := moveWithSymlinkHandling(src, dst)
+	if err != nil {
+		if os.IsPermission(err) {
+			return fmt.Errorf("permission denied: %w", err)
+		}
+		if os.IsNotExist(err) {
+			return fmt.Errorf("source file does not exist: %w", err)
+		}
+		return fmt.Errorf("failed to move file: %w", err)
+	}
+	return nil
+}
+
 func applyFirejailIntegration(
 	vars *alrsh.Package,
 	dirs types.Directories,
@ -143,12 +228,15 @@ func createFirejailedBinary(
 		return nil, err
 	}

-	if err := osutils.Move(content.Source, filepath.Join(dirs.PkgDir, origFilePath)); err != nil {
+	if err := moveFileWithErrorHandling(filepath.Join(dirs.PkgDir, content.Destination), filepath.Join(dirs.PkgDir, origFilePath)); err != nil {
 		return nil, fmt.Errorf("failed to move original binary: %w", err)
 	}

+	content.Type = "file"
+	content.Source = filepath.Join(dirs.PkgDir, content.Destination)
+
 	// Create wrapper script
-	if err := createWrapperScript(content.Source, origFilePath, dest); err != nil {
+	if err := createWrapperScript(filepath.Join(dirs.PkgDir, content.Destination), origFilePath, dest); err != nil {
 		return nil, fmt.Errorf("failed to create wrapper script: %w", err)
 	}

--- a/internal/build/firejail_test.go
+++ b/internal/build/firejail_test.go
@ -138,7 +138,10 @@ func TestCreateFirejailedBinary(t *testing.T) {
 				os.MkdirAll(pkgDir, 0o755)
 				os.MkdirAll(scriptDir, 0o755)

-				srcBinary := filepath.Join(tmpDir, "test-binary")
+				binDir := filepath.Join(pkgDir, "usr", "bin")
+				os.MkdirAll(binDir, 0o755)
+
+				srcBinary := filepath.Join(binDir, "test-binary")
 				os.WriteFile(srcBinary, []byte("#!/bin/bash\necho test"), 0o755)

 				defaultProfile := filepath.Join(scriptDir, "default.profile")
@ -154,7 +157,7 @@ func TestCreateFirejailedBinary(t *testing.T) {

 				content := &files.Content{
 					Source:      srcBinary,
-					Destination: "./usr/bin/test-binary",
+					Destination: "/usr/bin/test-binary",
 					Type:        "file",
 				}

@ -172,7 +175,10 @@ func TestCreateFirejailedBinary(t *testing.T) {
 				os.MkdirAll(pkgDir, 0o755)
 				os.MkdirAll(scriptDir, 0o755)

-				srcBinary := filepath.Join(tmpDir, "special-binary")
+				binDir := filepath.Join(pkgDir, "usr", "bin")
+				os.MkdirAll(binDir, 0o755)
+
+				srcBinary := filepath.Join(binDir, "special-binary")
 				os.WriteFile(srcBinary, []byte("#!/bin/bash\necho special"), 0o755)

 				defaultProfile := filepath.Join(scriptDir, "default.profile")
@ -191,7 +197,7 @@ func TestCreateFirejailedBinary(t *testing.T) {

 				content := &files.Content{
 					Source:      srcBinary,
-					Destination: "./usr/bin/special-binary",
+					Destination: "/usr/bin/special-binary",
 					Type:        "file",
 				}

--- a/internal/build/installer.go
+++ b/internal/build/installer.go
@ -36,6 +36,10 @@ func (i *Installer) Install(pkgs []string, opts *manager.Opts) error {
 	return i.mgr.Install(opts, pkgs...)
 }

+func (i *Installer) Remove(pkgs []string, opts *manager.Opts) error {
+	return i.mgr.Remove(opts, pkgs...)
+}
+
 func (i *Installer) RemoveAlreadyInstalled(pkgs []string) ([]string, error) {
 	filteredPackages := []string{}

--- a/internal/build/safe_installer.go
+++ b/internal/build/safe_installer.go
@ -70,6 +70,17 @@ func (s *InstallerRPCServer) Install(args *InstallArgs, reply *struct{}) error {
 	return s.Impl.Install(args.PackagesOrPaths, args.Opts)
 }

+func (r *InstallerRPC) Remove(pkgs []string, opts *manager.Opts) error {
+	return r.client.Call("Plugin.Remove", &InstallArgs{
+		PackagesOrPaths: pkgs,
+		Opts:            opts,
+	}, nil)
+}
+
+func (s *InstallerRPCServer) Remove(args *InstallArgs, reply *struct{}) error {
+	return s.Impl.Remove(args.PackagesOrPaths, args.Opts)
+}
+
 func (r *InstallerRPC) RemoveAlreadyInstalled(paths []string) ([]string, error) {
 	var val []string
 	err := r.client.Call("Plugin.RemoveAlreadyInstalled", paths, &val)
--- a/internal/build/source_downloader.go
+++ b/internal/build/source_downloader.go
@ -23,8 +23,8 @@ import (
 	"os"
 	"strings"

-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/dl"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/dlcache"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/dl"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/dlcache"
 )

 type SourceDownloader struct {
@ -74,7 +74,7 @@ func (s *SourceDownloader) DownloadSources(
 			}
 		}

-		opts.DlCache = dlcache.New(s.cfg)
+		opts.DlCache = dlcache.New(s.cfg.GetPaths().CacheDir)

 		err := dl.Download(ctx, opts)
 		if err != nil {
--- a/internal/config/config.go
+++ b/internal/config/config.go
@ -20,13 +20,12 @@
 package config

 import (
-	"log/slog"
-	"os"
+	"fmt"
 	"path/filepath"
-	"reflect"

-	"github.com/caarlos0/env"
-	"github.com/pelletier/go-toml/v2"
+	"github.com/goccy/go-yaml"
+	"github.com/knadh/koanf/providers/confmap"
+	"github.com/knadh/koanf/v2"

 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/constants"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/types"
@ -35,74 +34,65 @@ import (
 type ALRConfig struct {
 	cfg   *types.Config
 	paths *Paths
-}

-var defaultConfig = &types.Config{
-	RootCmd:          "sudo",
-	UseRootCmd:       true,
-	PagerStyle:       "native",
-	IgnorePkgUpdates: []string{},
-	AutoPull:         true,
-	Repos:            []types.Repo{},
+	System *SystemConfig
+	env    *EnvConfig
 }

 func New() *ALRConfig {
-	return &ALRConfig{}
+	return &ALRConfig{
+		System: NewSystemConfig(),
+		env:    NewEnvConfig(),
+	}
 }

-func readConfig(path string) (*types.Config, error) {
-	file, err := os.Open(path)
-	if err != nil {
-		return nil, err
+func defaultConfigKoanf() *koanf.Koanf {
+	k := koanf.New(".")
+	defaults := map[string]interface{}{
+		"rootCmd":          "sudo",
+		"useRootCmd":       true,
+		"pagerStyle":       "native",
+		"ignorePkgUpdates": []string{},
+		"logLevel":         "info",
+		"autoPull":         true,
+		"repos":            []types.Repo{},
 	}
-	defer file.Close()
-
-	config := types.Config{}
-
-	if err := toml.NewDecoder(file).Decode(&config); err != nil {
-		return nil, err
-	}
-
-	return &config, nil
-}
-
-func mergeStructs(dst, src interface{}) {
-	srcVal := reflect.ValueOf(src)
-	if srcVal.IsNil() {
-		return
-	}
-	srcVal = srcVal.Elem()
-	dstVal := reflect.ValueOf(dst).Elem()
-
-	for i := range srcVal.NumField() {
-		srcField := srcVal.Field(i)
-		srcFieldName := srcVal.Type().Field(i).Name
-
-		dstField := dstVal.FieldByName(srcFieldName)
-		if dstField.IsValid() && dstField.CanSet() {
-			dstField.Set(srcField)
-		}
+	if err := k.Load(confmap.Provider(defaults, "."), nil); err != nil {
+		panic(k)
 	}
+	return k
 }

 func (c *ALRConfig) Load() error {
-	systemConfig, err := readConfig(
-		constants.SystemConfigPath,
-	)
-	if err != nil {
-		slog.Debug("Cannot read system config", "err", err)
+	config := types.Config{}
+
+	merged := koanf.New(".")
+
+	if err := c.System.Load(); err != nil {
+		return fmt.Errorf("failed to load system config: %w", err)
 	}

-	config := &types.Config{}
-
-	mergeStructs(config, defaultConfig)
-	mergeStructs(config, systemConfig)
-	err = env.Parse(config)
-	if err != nil {
-		return err
+	if err := c.env.Load(); err != nil {
+		return fmt.Errorf("failed to load env config: %w", err)
 	}

-	c.cfg = config
+	systemK := c.System.koanf()
+	envK := c.env.koanf()
+
+	if err := merged.Merge(defaultConfigKoanf()); err != nil {
+		return fmt.Errorf("failed to merge default config: %w", err)
+	}
+	if err := merged.Merge(systemK); err != nil {
+		return fmt.Errorf("failed to merge system config: %w", err)
+	}
+	if err := merged.Merge(envK); err != nil {
+		return fmt.Errorf("failed to merge env config: %w", err)
+	}
+	if err := merged.Unmarshal("", &config); err != nil {
+		return fmt.Errorf("failed to unmarshal merged config: %w", err)
+	}
+
+	c.cfg = &config

 	c.paths = &Paths{}
 	c.paths.UserConfigPath = constants.SystemConfigPath
@ -110,52 +100,24 @@ func (c *ALRConfig) Load() error {
 	c.paths.RepoDir = filepath.Join(c.paths.CacheDir, "repo")
 	c.paths.PkgsDir = filepath.Join(c.paths.CacheDir, "pkgs")
 	c.paths.DBPath = filepath.Join(c.paths.CacheDir, "db")
-	// c.initPaths()

 	return nil
 }

-func (c *ALRConfig) RootCmd() string {
-	return c.cfg.RootCmd
-}
-
-func (c *ALRConfig) PagerStyle() string {
-	return c.cfg.PagerStyle
-}
-
-func (c *ALRConfig) AutoPull() bool {
-	return c.cfg.AutoPull
-}
-
-func (c *ALRConfig) Repos() []types.Repo {
-	return c.cfg.Repos
-}
-
-func (c *ALRConfig) SetRepos(repos []types.Repo) {
-	c.cfg.Repos = repos
-}
-
-func (c *ALRConfig) IgnorePkgUpdates() []string {
-	return c.cfg.IgnorePkgUpdates
-}
-
-func (c *ALRConfig) LogLevel() string {
-	return c.cfg.LogLevel
-}
-
-func (c *ALRConfig) UseRootCmd() bool {
-	return c.cfg.UseRootCmd
-}
-
-func (c *ALRConfig) GetPaths() *Paths {
-	return c.paths
-}
-
-func (c *ALRConfig) SaveUserConfig() error {
-	f, err := os.Create(c.paths.UserConfigPath)
+func (c *ALRConfig) ToYAML() (string, error) {
+	data, err := yaml.Marshal(c.cfg)
 	if err != nil {
-		return err
+		return "", err
 	}
-
-	return toml.NewEncoder(f).Encode(c.cfg)
+	return string(data), nil
 }
+
+func (c *ALRConfig) RootCmd() string             { return c.cfg.RootCmd }
+func (c *ALRConfig) PagerStyle() string          { return c.cfg.PagerStyle }
+func (c *ALRConfig) AutoPull() bool              { return c.cfg.AutoPull }
+func (c *ALRConfig) Repos() []types.Repo         { return c.cfg.Repos }
+func (c *ALRConfig) SetRepos(repos []types.Repo) { c.System.SetRepos(repos) }
+func (c *ALRConfig) IgnorePkgUpdates() []string  { return c.cfg.IgnorePkgUpdates }
+func (c *ALRConfig) LogLevel() string            { return c.cfg.LogLevel }
+func (c *ALRConfig) UseRootCmd() bool            { return c.cfg.UseRootCmd }
+func (c *ALRConfig) GetPaths() *Paths            { return c.paths }
--- a/internal/config/env_config.go
+++ b/internal/config/env_config.go
@ -0,0 +1,76 @@
+// ALR - Any Linux Repository
+// Copyright (C) 2025 The ALR Authors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package config
+
+import (
+	"strings"
+
+	"github.com/knadh/koanf/providers/env"
+	"github.com/knadh/koanf/v2"
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
+)
+
+type EnvConfig struct {
+	k *koanf.Koanf
+}
+
+func NewEnvConfig() *EnvConfig {
+	return &EnvConfig{
+		k: koanf.New("."),
+	}
+}
+
+func (c *EnvConfig) koanf() *koanf.Koanf {
+	return c.k
+}
+
+func (c *EnvConfig) Load() error {
+	allowedKeys := map[string]struct{}{
+		"ALR_LOG_LEVEL":   {},
+		"ALR_PAGER_STYLE": {},
+		"ALR_AUTO_PULL":   {},
+	}
+	err := c.k.Load(env.Provider("ALR_", ".", func(s string) string {
+		_, ok := allowedKeys[s]
+		if !ok {
+			return ""
+		}
+		withoutPrefix := strings.TrimPrefix(s, "ALR_")
+		lowered := strings.ToLower(withoutPrefix)
+		dotted := strings.ReplaceAll(lowered, "__", ".")
+		parts := strings.Split(dotted, ".")
+		for i, part := range parts {
+			if strings.Contains(part, "_") {
+				parts[i] = toCamelCase(part)
+			}
+		}
+		return strings.Join(parts, ".")
+	}), nil)
+
+	return err
+}
+
+func toCamelCase(s string) string {
+	parts := strings.Split(s, "_")
+	for i := 1; i < len(parts); i++ {
+		if len(parts[i]) > 0 {
+			parts[i] = cases.Title(language.Und, cases.NoLower).String(parts[i])
+		}
+	}
+	return strings.Join(parts, "")
+}
--- a/internal/config/paths.go
+++ b/internal/config/paths.go
@ -21,9 +21,10 @@ package config

 // Paths contains various paths used by ALR
 type Paths struct {
-	UserConfigPath string
-	CacheDir       string
-	RepoDir        string
-	PkgsDir        string
-	DBPath         string
+	SystemConfigPath string
+	UserConfigPath   string
+	CacheDir         string
+	RepoDir          string
+	PkgsDir          string
+	DBPath           string
 }
--- a/internal/config/system_config.go
+++ b/internal/config/system_config.go
@ -0,0 +1,144 @@
+// ALR - Any Linux Repository
+// Copyright (C) 2025 The ALR Authors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package config
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"os"
+
+	ktoml "github.com/knadh/koanf/parsers/toml/v2"
+	"github.com/knadh/koanf/providers/file"
+	"github.com/knadh/koanf/v2"
+
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/constants"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/types"
+)
+
+type SystemConfig struct {
+	k   *koanf.Koanf
+	cfg *types.Config
+}
+
+func NewSystemConfig() *SystemConfig {
+	return &SystemConfig{
+		k:   koanf.New("."),
+		cfg: &types.Config{},
+	}
+}
+
+func (c *SystemConfig) koanf() *koanf.Koanf {
+	return c.k
+}
+
+func (c *SystemConfig) Load() error {
+	if _, err := os.Stat(constants.SystemConfigPath); errors.Is(err, os.ErrNotExist) {
+		return nil
+	}
+
+	if err := c.k.Load(file.Provider(constants.SystemConfigPath), ktoml.Parser()); err != nil {
+		return err
+	}
+
+	return c.k.Unmarshal("", c.cfg)
+}
+
+func (c *SystemConfig) Save() error {
+	bytes, err := c.k.Marshal(ktoml.Parser())
+	if err != nil {
+		return fmt.Errorf("failed to marshal config: %w", err)
+	}
+
+	file, err := os.Create(constants.SystemConfigPath)
+	if err != nil {
+		return fmt.Errorf("failed to create config file: %w", err)
+	}
+	defer func() {
+		if cerr := file.Close(); cerr != nil && err == nil {
+			err = cerr
+		}
+	}()
+
+	if _, err := file.Write(bytes); err != nil {
+		return fmt.Errorf("failed to write config: %w", err)
+	}
+
+	if err := file.Sync(); err != nil {
+		return fmt.Errorf("failed to sync config: %w", err)
+	}
+
+	return nil
+}
+
+func (c *SystemConfig) SetRootCmd(v string) {
+	err := c.k.Set("rootCmd", v)
+	if err != nil {
+		panic(err)
+	}
+}
+
+func (c *SystemConfig) SetUseRootCmd(v bool) {
+	err := c.k.Set("useRootCmd", v)
+	if err != nil {
+		panic(err)
+	}
+}
+
+func (c *SystemConfig) SetPagerStyle(v string) {
+	err := c.k.Set("pagerStyle", v)
+	if err != nil {
+		panic(err)
+	}
+}
+
+func (c *SystemConfig) SetIgnorePkgUpdates(v []string) {
+	err := c.k.Set("ignorePkgUpdates", v)
+	if err != nil {
+		panic(err)
+	}
+}
+
+func (c *SystemConfig) SetAutoPull(v bool) {
+	err := c.k.Set("autoPull", v)
+	if err != nil {
+		panic(err)
+	}
+}
+
+func (c *SystemConfig) SetLogLevel(v string) {
+	err := c.k.Set("logLevel", v)
+	if err != nil {
+		panic(err)
+	}
+}
+
+func (c *SystemConfig) SetRepos(v []types.Repo) {
+	b, err := json.Marshal(v)
+	if err != nil {
+		panic(err)
+	}
+	var m []interface{}
+	err = json.Unmarshal(b, &m)
+	if err != nil {
+		panic(err)
+	}
+	err = c.k.Set("repo", m)
+	if err != nil {
+		panic(err)
+	}
+}
--- a/internal/logger/hclog.go
+++ b/internal/logger/hclog.go
@ -65,6 +65,8 @@ func (a *HCLoggerAdapter) Log(level hclog.Level, msg string, args ...interface{}
 	var chLogLevel chLog.Level
 	if msg == "plugin process exited" ||
 		strings.HasPrefix(msg, "[ERR] plugin: stream copy 'stderr' error") ||
+		strings.HasPrefix(msg, "[WARN] error closing client during Kill") ||
+		strings.HasPrefix(msg, "[WARN] plugin failed to exit gracefully") ||
 		strings.HasPrefix(msg, "[DEBUG] plugin") {
 		chLogLevel = chLog.DebugLevel
 	} else {
--- a/internal/repos/pull.go
+++ b/internal/repos/pull.go
@ -31,7 +31,6 @@ import (
 	"strings"

 	"github.com/go-git/go-billy/v5"
-	"github.com/go-git/go-billy/v5/osfs"
 	"github.com/go-git/go-git/v5"
 	gitConfig "github.com/go-git/go-git/v5/config"
 	"github.com/go-git/go-git/v5/plumbing"
@ -69,159 +68,219 @@ func (rs *Repos) Pull(ctx context.Context, repos []types.Repo) error {
 	}

 	for _, repo := range repos {
-		repoURL, err := url.Parse(repo.URL)
+		err := rs.pullRepo(ctx, repo)
 		if err != nil {
 			return err
 		}
+	}

-		slog.Info(gotext.Get("Pulling repository"), "name", repo.Name)
-		repoDir := filepath.Join(rs.cfg.GetPaths().RepoDir, repo.Name)
+	return nil
+}

-		var repoFS billy.Filesystem
-		gitDir := filepath.Join(repoDir, ".git")
-		// Only pull repos that contain valid git repos
-		if fi, err := os.Stat(gitDir); err == nil && fi.IsDir() {
-			r, err := git.PlainOpen(repoDir)
-			if err != nil {
-				return err
-			}
+func (rs *Repos) pullRepo(ctx context.Context, repo types.Repo) error {
+	urls := []string{repo.URL}
+	urls = append(urls, repo.Mirrors...)

-			err = r.FetchContext(ctx, &git.FetchOptions{
-				Progress: os.Stderr,
-				Force:    true,
-			})
-			if err != nil && !errors.Is(err, git.NoErrAlreadyUpToDate) {
-				return err
-			}
+	var lastErr error

-			w, err := r.Worktree()
-			if err != nil {
-				return err
-			}
-
-			old, err := r.Head()
-			if err != nil {
-				return err
-			}
-
-			revHash, err := resolveHash(r, repo.Ref)
-			if err != nil {
-				return fmt.Errorf("error resolving hash: %w", err)
-			}
-
-			if old.Hash() == *revHash {
-				slog.Info(gotext.Get("Repository up to date"), "name", repo.Name)
-			}
-
-			err = w.Checkout(&git.CheckoutOptions{
-				Hash:  plumbing.NewHash(revHash.String()),
-				Force: true,
-			})
-			if err != nil {
-				return err
-			}
-			repoFS = w.Filesystem
-
-			new, err := r.Head()
-			if err != nil {
-				return err
-			}
-
-			// If the DB was not present at startup, that means it's
-			// empty. In this case, we need to update the DB fully
-			// rather than just incrementally.
-			if rs.db.IsEmpty() {
-				err = rs.processRepoFull(ctx, repo, repoDir)
-				if err != nil {
-					return err
-				}
-			} else {
-				err = rs.processRepoChanges(ctx, repo, r, w, old, new)
-				if err != nil {
-					return err
-				}
-			}
-		} else {
-			err = os.RemoveAll(repoDir)
-			if err != nil {
-				return err
-			}
-
-			err = os.MkdirAll(repoDir, 0o755)
-			if err != nil {
-				return err
-			}
-
-			r, err := git.PlainInit(repoDir, false)
-			if err != nil {
-				return err
-			}
-
-			_, err = r.CreateRemote(&gitConfig.RemoteConfig{
-				Name: git.DefaultRemoteName,
-				URLs: []string{repoURL.String()},
-			})
-			if err != nil {
-				return err
-			}
-
-			err = r.FetchContext(ctx, &git.FetchOptions{
-				Progress: os.Stderr,
-				Force:    true,
-			})
-			if err != nil {
-				return err
-			}
-
-			w, err := r.Worktree()
-			if err != nil {
-				return err
-			}
-
-			revHash, err := resolveHash(r, repo.Ref)
-			if err != nil {
-				return fmt.Errorf("error resolving hash: %w", err)
-			}
-
-			err = w.Checkout(&git.CheckoutOptions{
-				Hash:  plumbing.NewHash(revHash.String()),
-				Force: true,
-			})
-			if err != nil {
-				return err
-			}
-
-			err = rs.processRepoFull(ctx, repo, repoDir)
-			if err != nil {
-				return err
-			}
-
-			repoFS = osfs.New(repoDir)
+	for i, repoURL := range urls {
+		if i > 0 {
+			slog.Info(gotext.Get("Trying mirror"), "repo", repo.Name, "mirror", repoURL)
 		}

-		fl, err := repoFS.Open("alr-repo.toml")
+		err := rs.pullRepoFromURL(ctx, repoURL, repo)
 		if err != nil {
-			slog.Warn(gotext.Get("Git repository does not appear to be a valid ALR repo"), "repo", repo.Name)
+			lastErr = err
+			slog.Warn(gotext.Get("Failed to pull from URL"), "repo", repo.Name, "url", repoURL, "error", err)
 			continue
 		}

-		var repoCfg types.RepoConfig
-		err = toml.NewDecoder(fl).Decode(&repoCfg)
+		// Success
+		return nil
+	}
+
+	return fmt.Errorf("failed to pull repository %s from any URL: %w", repo.Name, lastErr)
+}
+
+func readGitRepo(repoDir, repoUrl string) (*git.Repository, bool, error) {
+	gitDir := filepath.Join(repoDir, ".git")
+	if fi, err := os.Stat(gitDir); err == nil && fi.IsDir() {
+		r, err := git.PlainOpen(repoDir)
+		if err == nil {
+			err = updateRemoteURL(r, repoUrl)
+			if err == nil {
+				_, err := r.Head()
+				if err == nil {
+					return r, false, nil
+				}
+
+				if errors.Is(err, plumbing.ErrReferenceNotFound) {
+					return r, true, nil
+				}
+
+				slog.Debug("error getting HEAD, reinitializing...", "err", err)
+			}
+		}
+
+		slog.Debug("error while reading repo, reinitializing...", "err", err)
+	}
+
+	if err := os.RemoveAll(repoDir); err != nil {
+		return nil, false, fmt.Errorf("failed to remove repo directory: %w", err)
+	}
+
+	if err := os.MkdirAll(repoDir, 0o755); err != nil {
+		return nil, false, fmt.Errorf("failed to create repo directory: %w", err)
+	}
+
+	r, err := git.PlainInit(repoDir, false)
+	if err != nil {
+		return nil, false, fmt.Errorf("failed to initialize git repo: %w", err)
+	}
+
+	_, err = r.CreateRemote(&gitConfig.RemoteConfig{
+		Name: git.DefaultRemoteName,
+		URLs: []string{repoUrl},
+	})
+	if err != nil {
+		return nil, false, err
+	}
+
+	return r, true, nil
+}
+
+func (rs *Repos) pullRepoFromURL(ctx context.Context, rawRepoUrl string, repo types.Repo) error {
+	repoURL, err := url.Parse(rawRepoUrl)
+	if err != nil {
+		return fmt.Errorf("invalid URL %s: %w", rawRepoUrl, err)
+	}
+
+	slog.Info(gotext.Get("Pulling repository"), "name", repo.Name)
+	repoDir := filepath.Join(rs.cfg.GetPaths().RepoDir, repo.Name)
+
+	var repoFS billy.Filesystem
+
+	r, freshGit, err := readGitRepo(repoDir, repoURL.String())
+	if err != nil {
+		return fmt.Errorf("failed to open repo")
+	}
+
+	err = r.FetchContext(ctx, &git.FetchOptions{
+		Progress: os.Stderr,
+		Force:    true,
+	})
+	if err != nil && !errors.Is(err, git.NoErrAlreadyUpToDate) {
+		return err
+	}
+
+	var old *plumbing.Reference
+
+	w, err := r.Worktree()
+	if err != nil {
+		return err
+	}
+
+	revHash, err := resolveHash(r, repo.Ref)
+	if err != nil {
+		return fmt.Errorf("error resolving hash: %w", err)
+	}
+
+	if !freshGit {
+		old, err = r.Head()
 		if err != nil {
 			return err
 		}
-		fl.Close()

-		// If the version doesn't have a "v" prefix, it's not a standard version.
-		// It may be "unknown" or a git version, but either way, there's no way
-		// to compare it to the repo version, so only compare versions with the "v".
-		if strings.HasPrefix(config.Version, "v") {
-			if vercmp.Compare(config.Version, repoCfg.Repo.MinVersion) == -1 {
-				slog.Warn(gotext.Get("ALR repo's minimum ALR version is greater than the current version. Try updating ALR if something doesn't work."), "repo", repo.Name)
-			}
+		if old.Hash() == *revHash {
+			slog.Info(gotext.Get("Repository up to date"), "name", repo.Name)
 		}
 	}

+	err = w.Checkout(&git.CheckoutOptions{
+		Hash:  plumbing.NewHash(revHash.String()),
+		Force: true,
+	})
+	if err != nil {
+		return err
+	}
+	repoFS = w.Filesystem
+
+	new, err := r.Head()
+	if err != nil {
+		return err
+	}
+
+	// If the DB was not present at startup, that means it's
+	// empty. In this case, we need to update the DB fully
+	// rather than just incrementally.
+	if rs.db.IsEmpty() || freshGit {
+		err = rs.processRepoFull(ctx, repo, repoDir)
+		if err != nil {
+			return err
+		}
+	} else {
+		err = rs.processRepoChanges(ctx, repo, r, w, old, new)
+		if err != nil {
+			return err
+		}
+	}
+
+	fl, err := repoFS.Open("alr-repo.toml")
+	if err != nil {
+		slog.Warn(gotext.Get("Git repository does not appear to be a valid ALR repo"), "repo", repo.Name)
+		return nil
+	}
+
+	var repoCfg types.RepoConfig
+	err = toml.NewDecoder(fl).Decode(&repoCfg)
+	if err != nil {
+		return err
+	}
+	fl.Close()
+
+	// If the version doesn't have a "v" prefix, it's not a standard version.
+	// It may be "unknown" or a git version, but either way, there's no way
+	// to compare it to the repo version, so only compare versions with the "v".
+	if strings.HasPrefix(config.Version, "v") {
+		if vercmp.Compare(config.Version, repoCfg.Repo.MinVersion) == -1 {
+			slog.Warn(gotext.Get("ALR repo's minimum ALR version is greater than the current version. Try updating ALR if something doesn't work."), "repo", repo.Name)
+		}
+	}
+
+	return nil
+}
+
+func updateRemoteURL(r *git.Repository, newURL string) error {
+	cfg, err := r.Config()
+	if err != nil {
+		return err
+	}
+
+	remote, ok := cfg.Remotes[git.DefaultRemoteName]
+	if !ok || len(remote.URLs) == 0 {
+		return fmt.Errorf("no remote '%s' found", git.DefaultRemoteName)
+	}
+
+	currentURL := remote.URLs[0]
+	if currentURL == newURL {
+		return nil
+	}
+
+	slog.Debug("Updating remote URL", "old", currentURL, "new", newURL)
+
+	err = r.DeleteRemote(git.DefaultRemoteName)
+	if err != nil {
+		return fmt.Errorf("failed to delete old remote: %w", err)
+	}
+
+	_, err = r.CreateRemote(&gitConfig.RemoteConfig{
+		Name: git.DefaultRemoteName,
+		URLs: []string{newURL},
+	})
+	if err != nil {
+		return fmt.Errorf("failed to create new remote: %w", err)
+	}
+
 	return nil
 }

--- a/internal/repos/pull_test.go
+++ b/internal/repos/pull_test.go
@ -26,7 +26,6 @@ import (
 	"testing"

 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/repos"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/types"
@ -35,7 +34,7 @@ import (
 type TestEnv struct {
 	Ctx context.Context
 	Cfg *TestALRConfig
-	Db  *db.Database
+	Db  *database.Database
 }

 type TestALRConfig struct {
--- a/internal/shutils/decoder/decoder.go
+++ b/internal/shutils/decoder/decoder.go
@ -23,7 +23,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"log/slog"
 	"reflect"
 	"strings"

@ -75,75 +74,99 @@ func New(info *distro.OSRelease, runner *interp.Runner) *Decoder {
 // DecodeVar decodes a variable to val using reflection.
 // Structs should use the "sh" struct tag.
 func (d *Decoder) DecodeVar(name string, val any) error {
-	variable := d.getVar(name)
-	if variable == nil {
-		return VarNotFoundError{name}
-	}
+	origType := reflect.TypeOf(val).Elem()
+	isOverridableField := strings.Contains(origType.String(), "OverridableField[")

-	dec, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{
-		WeaklyTypedInput: true,
-		DecodeHook: mapstructure.DecodeHookFuncValue(func(from, to reflect.Value) (interface{}, error) {
-			if strings.Contains(to.Type().String(), "alrsh.OverridableField") {
-				if to.Kind() != reflect.Ptr && to.CanAddr() {
-					to = to.Addr()
-				}
+	if !isOverridableField {
+		variable := d.getVarNoOverrides(name)
+		if variable == nil {
+			return VarNotFoundError{name}
+		}

-				names, err := overrides.Resolve(d.info, overrides.DefaultOpts.WithName(name))
-				if err != nil {
-					return nil, err
-				}
-
-				isNotSet := true
-
-				setMethod := to.MethodByName("Set")
-				setResolvedMethod := to.MethodByName("SetResolved")
-
-				for _, varName := range names {
-					val := d.getVarNoOverrides(varName)
-					if val == nil {
-						continue
+		dec, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{
+			WeaklyTypedInput: true,
+			Result:           val, // передаем указатель на новое значение
+			TagName:          "sh",
+			DecodeHook: mapstructure.DecodeHookFuncValue(func(from, to reflect.Value) (interface{}, error) {
+				if from.Kind() == reflect.Slice && to.Kind() == reflect.String {
+					s, ok := from.Interface().([]string)
+					if ok && len(s) == 1 {
+						return s[0], nil
 					}
-
-					t := setMethod.Type().In(1)
-
-					newVal := from
-
-					if !newVal.Type().AssignableTo(t) {
-						newVal = reflect.New(t)
-						err = d.DecodeVar(name, newVal.Interface())
-						if err != nil {
-							return nil, err
-						}
-						newVal = newVal.Elem()
-					}
-
-					if isNotSet {
-						setResolvedMethod.Call([]reflect.Value{newVal})
-					}
-
-					override := strings.TrimPrefix(strings.TrimPrefix(varName, name), "_")
-					setMethod.Call([]reflect.Value{reflect.ValueOf(override), newVal})
 				}
+				return from.Interface(), nil
+			}),
+		})
+		if err != nil {
+			return err
+		}

-				return to, nil
+		switch variable.Kind {
+		case expand.Indexed:
+			return dec.Decode(variable.List)
+		case expand.Associative:
+			return dec.Decode(variable.Map)
+		default:
+			return dec.Decode(variable.Str)
+		}
+	} else {
+		vars := d.getVarsByPrefix(name)
+
+		if len(vars) == 0 {
+			return VarNotFoundError{name}
+		}
+
+		reflectVal := reflect.ValueOf(val)
+		overridableVal := reflect.ValueOf(val).Elem()
+
+		dataField := overridableVal.FieldByName("data")
+		if !dataField.IsValid() {
+			return fmt.Errorf("data field not found in OverridableField")
+		}
+		mapType := dataField.Type() // map[string]T
+		elemType := mapType.Elem()  // T
+
+		var overridablePtr reflect.Value
+		if reflectVal.Kind() == reflect.Ptr {
+			overridablePtr = reflectVal
+		} else {
+			if !reflectVal.CanAddr() {
+				return fmt.Errorf("OverridableField value is not addressable")
 			}
-			return from.Interface(), nil
-		}),
-		Result:  val,
-		TagName: "sh",
-	})
-	if err != nil {
-		slog.Warn("err", "err", err)
-		return err
-	}
+			overridablePtr = reflectVal.Addr()
+		}

-	switch variable.Kind {
-	case expand.Indexed:
-		return dec.Decode(variable.List)
-	case expand.Associative:
-		return dec.Decode(variable.Map)
-	default:
-		return dec.Decode(variable.Str)
+		setValue := overridablePtr.MethodByName("Set")
+		if !setValue.IsValid() {
+			return fmt.Errorf("method Set not found on OverridableField")
+		}
+
+		for _, v := range vars {
+			varName := v.Name
+
+			key := strings.TrimPrefix(strings.TrimPrefix(varName, name), "_")
+			newVal := reflect.New(elemType)
+
+			if err := d.DecodeVar(varName, newVal.Interface()); err != nil {
+				return err
+			}
+
+			keyValue := reflect.ValueOf(key)
+			setValue.Call([]reflect.Value{keyValue, newVal.Elem()})
+		}
+
+		resolveValue := overridablePtr.MethodByName("Resolve")
+		if !resolveValue.IsValid() {
+			return fmt.Errorf("method Resolve not found on OverridableField")
+		}
+
+		names, err := overrides.Resolve(d.info, overrides.DefaultOpts)
+		if err != nil {
+			return err
+		}
+
+		resolveValue.Call([]reflect.Value{reflect.ValueOf(names)})
+		return nil
 	}
 }

@ -284,23 +307,6 @@ func (d *Decoder) getFunc(name string) *syntax.Stmt {
 	return nil
 }

-// getVar gets a variable based on its name, taking into account
-// override variables and nameref variables.
-func (d *Decoder) getVar(name string) *expand.Variable {
-	names, err := overrides.Resolve(d.info, overrides.DefaultOpts.WithName(name))
-	if err != nil {
-		return nil
-	}
-
-	for _, varName := range names {
-		res := d.getVarNoOverrides(varName)
-		if res != nil {
-			return res
-		}
-	}
-	return nil
-}
-
 func (d *Decoder) getVarNoOverrides(name string) *expand.Variable {
 	val, ok := d.Runner.Vars[name]
 	if ok {
@ -318,6 +324,32 @@ func (d *Decoder) getVarNoOverrides(name string) *expand.Variable {
 	return nil
 }

+type vars struct {
+	Name  string
+	Value *expand.Variable
+}
+
+func (d *Decoder) getVarsByPrefix(prefix string) []*vars {
+	result := make([]*vars, 0)
+	for name, val := range d.Runner.Vars {
+		if !strings.HasPrefix(name, prefix) {
+			continue
+		}
+		switch prefix {
+		case "auto_req":
+			if strings.HasPrefix(name, "auto_req_skiplist") {
+				continue
+			}
+		case "auto_prov":
+			if strings.HasPrefix(name, "auto_prov_skiplist") {
+				continue
+			}
+		}
+		result = append(result, &vars{name, &val})
+	}
+	return result
+}
+
 func IsTruthy(value string) bool {
 	value = strings.ToLower(strings.TrimSpace(value))
 	return value == "true" || value == "yes" || value == "1"
--- a/internal/shutils/decoder/decoder_test.go
+++ b/internal/shutils/decoder/decoder_test.go
@ -32,24 +32,25 @@ import (
 	"mvdan.cc/sh/v3/syntax"

 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/decoder"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/alrsh"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
 )

 type BuildVars struct {
-	Name          string   `sh:"name,required"`
-	Version       string   `sh:"version,required"`
-	Release       int      `sh:"release,required"`
-	Epoch         uint     `sh:"epoch"`
-	Description   string   `sh:"desc"`
-	Homepage      string   `sh:"homepage"`
-	Maintainer    string   `sh:"maintainer"`
-	Architectures []string `sh:"architectures"`
-	Licenses      []string `sh:"license"`
-	Provides      []string `sh:"provides"`
-	Conflicts     []string `sh:"conflicts"`
-	Depends       []string `sh:"deps"`
-	BuildDepends  []string `sh:"build_deps"`
-	Replaces      []string `sh:"replaces"`
+	Name          string                           `sh:"name,required"`
+	Version       string                           `sh:"version,required"`
+	Release       int                              `sh:"release,required"`
+	Epoch         uint                             `sh:"epoch"`
+	Description   alrsh.OverridableField[string]   `sh:"desc"`
+	Homepage      string                           `sh:"homepage"`
+	Maintainer    string                           `sh:"maintainer"`
+	Architectures []string                         `sh:"architectures"`
+	Licenses      []string                         `sh:"license"`
+	Provides      []string                         `sh:"provides"`
+	Conflicts     []string                         `sh:"conflicts"`
+	Depends       []string                         `sh:"deps"`
+	BuildDepends  alrsh.OverridableField[[]string] `sh:"build_deps"`
+	Replaces      alrsh.OverridableField[[]string] `sh:"replaces"`
 }

 const testScript = `
@ -113,22 +114,34 @@ func TestDecodeVars(t *testing.T) {
 	}

 	expected := BuildVars{
-		Name:          "test",
-		Version:       "0.0.1",
-		Release:       1,
-		Epoch:         2,
-		Description:   "Test package",
+		Name:    "test",
+		Version: "0.0.1",
+		Release: 1,
+		Epoch:   2,
+		Description: alrsh.OverridableFromMap(map[string]string{
+			"": "Test package",
+		}),
 		Homepage:      "https://gitea.plemya-x.ru/xpamych/ALR",
 		Maintainer:    "Евгений Храмов <xpamych@yandex.ru>",
 		Architectures: []string{"arm64", "amd64"},
 		Licenses:      []string{"GPL-3.0-or-later"},
 		Provides:      []string{"test"},
 		Conflicts:     []string{"test"},
-		Replaces:      []string{"test-legacy"},
-		Depends:       []string{"sudo"},
-		BuildDepends:  []string{"go"},
+		Replaces: alrsh.OverridableFromMap(map[string][]string{
+			"":        {"test-old"},
+			"test_os": {"test-legacy"},
+		}),
+		Depends: []string{"sudo"},
+		BuildDepends: alrsh.OverridableFromMap(map[string][]string{
+			"":     {"golang"},
+			"arch": {"go"},
+		}),
 	}

+	expected.Description.SetResolved("Test package")
+	expected.Replaces.SetResolved([]string{"test-legacy"})
+	expected.BuildDepends.SetResolved([]string{"go"})
+
 	if !reflect.DeepEqual(bv, expected) {
 		t.Errorf("Expected %v, got %v", expected, bv)
 	}
--- a/internal/shutils/helpers/dirlfs.go
+++ b/internal/shutils/helpers/dirlfs.go
@ -0,0 +1,53 @@
+// ALR - Any Linux Repository
+// Copyright (C) 2025 The ALR Authors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package helpers
+
+import (
+	"io/fs"
+	"os"
+	"path/filepath"
+)
+
+// dirLfs implements fs.FS like os.DirFS but uses LStat instead of Stat.
+// This means symbolic links are treated as links themselves rather than
+// being followed to their targets.
+type dirLfs struct {
+	fs.FS
+	dir string
+}
+
+func NewDirLFS(dir string) *dirLfs {
+	return &dirLfs{
+		FS:  os.DirFS(dir),
+		dir: dir,
+	}
+}
+
+func (d *dirLfs) Stat(name string) (fs.FileInfo, error) {
+	if !fs.ValidPath(name) {
+		return nil, &fs.PathError{Op: "stat", Path: name, Err: fs.ErrInvalid}
+	}
+
+	fullPath := filepath.Join(d.dir, filepath.FromSlash(name))
+
+	info, err := os.Lstat(fullPath)
+	if err != nil {
+		return nil, &fs.PathError{Op: "stat", Path: name, Err: err}
+	}
+
+	return info, nil
+}
--- a/internal/shutils/helpers/files_find.go
+++ b/internal/shutils/helpers/files_find.go
@ -0,0 +1,179 @@
+// ALR - Any Linux Repository
+// Copyright (C) 2025 The ALR Authors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package helpers
+
+import (
+	"fmt"
+	"os"
+	"path"
+	"path/filepath"
+
+	"github.com/bmatcuk/doublestar/v4"
+	"mvdan.cc/sh/v3/interp"
+	"mvdan.cc/sh/v3/syntax"
+)
+
+func matchNamePattern(name, pattern string) bool {
+	matched, err := filepath.Match(pattern, name)
+	if err != nil {
+		return false
+	}
+	return matched
+}
+
+func validateDir(dirPath, commandName string) error {
+	info, err := os.Stat(dirPath)
+	if err != nil {
+		return fmt.Errorf("%s: %w", commandName, err)
+	}
+	if !info.IsDir() {
+		return fmt.Errorf("%s: %s is not a directory", commandName, dirPath)
+	}
+	return nil
+}
+
+func outputFiles(hc interp.HandlerContext, files []string) error {
+	for _, file := range files {
+		v, err := syntax.Quote(file, syntax.LangAuto)
+		if err != nil {
+			return err
+		}
+		fmt.Fprintln(hc.Stdout, v)
+	}
+	return nil
+}
+
+func makeRelativePath(basePath, fullPath string) (string, error) {
+	relPath, err := filepath.Rel(basePath, fullPath)
+	if err != nil {
+		return "", err
+	}
+	return "./" + relPath, nil
+}
+
+func filesFindLangCmd(hc interp.HandlerContext, cmd string, args []string) error {
+	namePattern := "*.mo"
+	if len(args) > 0 {
+		namePattern = args[0] + ".mo"
+	}
+
+	localePath := "./usr/share/locale/"
+	realPath := path.Join(hc.Dir, localePath)
+
+	if err := validateDir(realPath, "files-find-lang"); err != nil {
+		return err
+	}
+
+	var langFiles []string
+	err := filepath.Walk(realPath, func(p string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		if !info.IsDir() && matchNamePattern(info.Name(), namePattern) {
+			relPath, relErr := makeRelativePath(hc.Dir, p)
+			if relErr != nil {
+				return relErr
+			}
+			langFiles = append(langFiles, relPath)
+		}
+		return nil
+	})
+	if err != nil {
+		return fmt.Errorf("files-find-lang: %w", err)
+	}
+
+	return outputFiles(hc, langFiles)
+}
+
+func filesFindDocCmd(hc interp.HandlerContext, cmd string, args []string) error {
+	namePattern := "*"
+	if len(args) > 0 {
+		namePattern = args[0]
+	}
+
+	docPath := "./usr/share/doc/"
+	docRealPath := path.Join(hc.Dir, docPath)
+
+	if err := validateDir(docRealPath, "files-find-doc"); err != nil {
+		return err
+	}
+
+	var docFiles []string
+
+	entries, err := os.ReadDir(docRealPath)
+	if err != nil {
+		return fmt.Errorf("files-find-doc: %w", err)
+	}
+
+	for _, entry := range entries {
+		if matchNamePattern(entry.Name(), namePattern) {
+			targetPath := filepath.Join(docRealPath, entry.Name())
+			targetInfo, err := os.Stat(targetPath)
+			if err != nil {
+				return fmt.Errorf("files-find-doc: %w", err)
+			}
+			if targetInfo.IsDir() {
+				err := filepath.Walk(targetPath, func(subPath string, subInfo os.FileInfo, subErr error) error {
+					if subErr != nil {
+						return subErr
+					}
+					relPath, err := makeRelativePath(hc.Dir, subPath)
+					if err != nil {
+						return err
+					}
+					docFiles = append(docFiles, relPath)
+					return nil
+				})
+				if err != nil {
+					return fmt.Errorf("files-find-doc: %w", err)
+				}
+			}
+		}
+	}
+
+	return outputFiles(hc, docFiles)
+}
+
+func filesFindCmd(hc interp.HandlerContext, cmd string, args []string) error {
+	if len(args) == 0 {
+		return fmt.Errorf("files-find: at least one glob pattern is required")
+	}
+
+	var foundFiles []string
+
+	for _, globPattern := range args {
+		searchPath := path.Join(hc.Dir, globPattern)
+
+		basepath, pattern := doublestar.SplitPattern(searchPath)
+		fsys := NewDirLFS(basepath)
+		matches, err := doublestar.Glob(fsys, pattern, doublestar.WithNoFollow(), doublestar.WithFailOnPatternNotExist())
+		if err != nil {
+			return fmt.Errorf("files-find: glob pattern error: %w", err)
+		}
+
+		for _, match := range matches {
+			relPath, err := makeRelativePath(hc.Dir, path.Join(basepath, match))
+			if err != nil {
+				continue
+			}
+			foundFiles = append(foundFiles, relPath)
+		}
+	}
+
+	return outputFiles(hc, foundFiles)
+}
--- a/internal/shutils/helpers/helpers.go
+++ b/internal/shutils/helpers/helpers.go
@ -24,7 +24,6 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"path"
 	"path/filepath"
 	"strconv"
 	"strings"
@ -57,6 +56,7 @@ var Helpers = handlers.ExecFuncs{
 	"install-library":      installLibraryCmd,
 	"git-version":          gitVersionCmd,

+	"files-find":      filesFindCmd,
 	"files-find-lang": filesFindLangCmd,
 	"files-find-doc":  filesFindDocCmd,
 }
@ -65,6 +65,7 @@ var Helpers = handlers.ExecFuncs{
 // that don't modify any state
 var Restricted = handlers.ExecFuncs{
 	"git-version":     gitVersionCmd,
+	"files-find":      filesFindCmd,
 	"files-find-lang": filesFindLangCmd,
 	"files-find-doc":  filesFindDocCmd,
 }
@ -265,114 +266,6 @@ func gitVersionCmd(hc interp.HandlerContext, cmd string, args []string) error {
 	return nil
 }

-func filesFindLangCmd(hc interp.HandlerContext, cmd string, args []string) error {
-	namePattern := "*.mo"
-	if len(args) > 0 {
-		namePattern = args[0] + ".mo"
-	}
-
-	localePath := "./usr/share/locale/"
-	realPath := path.Join(hc.Dir, localePath)
-
-	info, err := os.Stat(realPath)
-	if err != nil {
-		return fmt.Errorf("files-find-lang: %w", err)
-	}
-	if !info.IsDir() {
-		return fmt.Errorf("files-find-lang: %s is not a directory", localePath)
-	}
-
-	var langFiles []string
-	err = filepath.Walk(realPath, func(p string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-
-		if !info.IsDir() && matchNamePattern(info.Name(), namePattern) {
-			relPath, relErr := filepath.Rel(hc.Dir, p)
-			if relErr != nil {
-				return relErr
-			}
-			langFiles = append(langFiles, "./"+relPath)
-		}
-		return nil
-	})
-	if err != nil {
-		return fmt.Errorf("files-find-lang: %w", err)
-	}
-
-	for _, file := range langFiles {
-		fmt.Fprintln(hc.Stdout, file)
-	}
-
-	return nil
-}
-
-func filesFindDocCmd(hc interp.HandlerContext, cmd string, args []string) error {
-	namePattern := "*"
-	if len(args) > 0 {
-		namePattern = args[0]
-	}
-
-	docPath := "./usr/share/doc/"
-	docRealPath := path.Join(hc.Dir, docPath)
-
-	info, err := os.Stat(docRealPath)
-	if err != nil {
-		return fmt.Errorf("files-find-doc: %w", err)
-	}
-	if !info.IsDir() {
-		return fmt.Errorf("files-find-doc: %s is not a directory", docPath)
-	}
-
-	var docFiles []string
-
-	entries, err := os.ReadDir(docRealPath)
-	if err != nil {
-		return err
-	}
-	for _, entry := range entries {
-		if matchNamePattern(entry.Name(), namePattern) {
-			targetPath := filepath.Join(docRealPath, entry.Name())
-			targetInfo, err := os.Stat(targetPath)
-			if err != nil {
-				return err
-			}
-			if targetInfo.IsDir() {
-				err := filepath.Walk(targetPath, func(subPath string, subInfo os.FileInfo, subErr error) error {
-					relPath, err := filepath.Rel(hc.Dir, subPath)
-					if err != nil {
-						return err
-					}
-					docFiles = append(docFiles, "./"+relPath)
-					return nil
-				})
-				if err != nil {
-					return err
-				}
-			}
-		}
-	}
-
-	if err != nil {
-		return fmt.Errorf("files-find-doc: %w", err)
-	}
-
-	for _, file := range docFiles {
-		fmt.Fprintln(hc.Stdout, file)
-	}
-
-	return nil
-}
-
-func matchNamePattern(name, pattern string) bool {
-	matched, err := filepath.Match(pattern, name)
-	if err != nil {
-		return false
-	}
-	return matched
-}
-
 func helperInstall(from, to string, perms os.FileMode) error {
 	err := os.MkdirAll(filepath.Dir(to), 0o755)
 	if err != nil {
--- a/internal/shutils/helpers/helpers_internal_test.go
+++ b/internal/shutils/helpers/helpers_internal_test.go
@ -24,6 +24,8 @@ import (
 	"strings"
 	"testing"

+	"github.com/bmatcuk/doublestar/v4"
+	"github.com/google/shlex"
 	"github.com/stretchr/testify/assert"
 	"mvdan.cc/sh/v3/interp"
 	"mvdan.cc/sh/v3/syntax"
@ -31,12 +33,19 @@ import (
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers"
 )

+type symlink struct {
+	linkPath   string
+	targetPath string
+}
+
 type testCase struct {
-	name           string
-	dirsToCreate   []string
-	filesToCreate  []string
-	expectedOutput []string
-	args           string
+	name             string
+	dirsToCreate     []string
+	filesToCreate    []string
+	expectedOutput   []string
+	symlinksToCreate []symlink
+	args             string
+	expectedError    error
 }

 func TestFindFilesDoc(t *testing.T) {
@ -125,7 +134,8 @@ files-find-doc ` + tc.args
 			err = runner.Run(context.Background(), script)
 			assert.NoError(t, err)

-			contents := strings.Fields(strings.TrimSpace(buf.String()))
+			contents, err := shlex.Split(buf.String())
+			assert.NoError(t, err)
 			assert.ElementsMatch(t, tc.expectedOutput, contents)
 		})
 	}
@ -209,7 +219,120 @@ files-find-lang ` + tc.args
 			err = runner.Run(context.Background(), script)
 			assert.NoError(t, err)

-			contents := strings.Fields(strings.TrimSpace(buf.String()))
+			contents, err := shlex.Split(buf.String())
+			assert.NoError(t, err)
+			assert.ElementsMatch(t, tc.expectedOutput, contents)
+		})
+	}
+}
+
+func TestFindFiles(t *testing.T) {
+	tests := []testCase{
+		{
+			name: "With file and dir symlinks",
+			dirsToCreate: []string{
+				"usr/share/locale/ru/LC_MESSAGES",
+				"usr/share/locale/tr/LC_MESSAGES",
+				"opt/app",
+				"opt/app/internal",
+				"opt/app/with space",
+				"usr/bin",
+			},
+			filesToCreate: []string{
+				"usr/share/locale/ru/LC_MESSAGES/yandex-disk.mo",
+				"usr/share/locale/ru/LC_MESSAGES/yandex-disk-indicator.mo",
+				"usr/share/locale/tr/LC_MESSAGES/yandex-disk.mo",
+				"opt/app/internal/test",
+				"opt/app/with space/file",
+			},
+			symlinksToCreate: []symlink{
+				{
+					linkPath:   "/opt/app/etc",
+					targetPath: "/etc",
+				},
+				{
+					linkPath:   "/usr/bin/file",
+					targetPath: "/not-existing",
+				},
+			},
+			expectedOutput: []string{
+				"./usr/share/locale/ru/LC_MESSAGES/yandex-disk.mo",
+				"./usr/share/locale/ru/LC_MESSAGES/yandex-disk-indicator.mo",
+				"./usr/share/locale/tr/LC_MESSAGES/yandex-disk.mo",
+				"./opt/app/etc",
+				"./opt/app/internal",
+				"./opt/app/internal/test",
+				"./opt/app/with space",
+				"./opt/app/with space/file",
+				"./usr/bin/file",
+			},
+			args:          "\"/usr/share/locale/*/LC_MESSAGES/*.mo\" \"/opt/app/**/*\" \"/usr/bin/file\"",
+			expectedError: nil,
+		},
+		{
+			name:          "Not existing paths should throw error",
+			args:          "\"/opt/test/not-existing\"",
+			expectedError: doublestar.ErrPatternNotExist,
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			tempDir, err := os.MkdirTemp("", "test-files-find")
+			assert.NoError(t, err)
+			defer os.RemoveAll(tempDir)
+
+			for _, dir := range tc.dirsToCreate {
+				dirPath := filepath.Join(tempDir, dir)
+				err := os.MkdirAll(dirPath, 0o755)
+				assert.NoError(t, err)
+			}
+
+			for _, file := range tc.filesToCreate {
+				filePath := filepath.Join(tempDir, file)
+				err := os.WriteFile(filePath, []byte("test content"), 0o644)
+				assert.NoError(t, err)
+			}
+
+			for _, sl := range tc.symlinksToCreate {
+				linkFullPath := filepath.Join(tempDir, sl.linkPath)
+				targetFullPath := sl.targetPath
+
+				// make sure parent dir exists
+				err := os.MkdirAll(filepath.Dir(linkFullPath), 0o755)
+				assert.NoError(t, err)
+
+				err = os.Symlink(targetFullPath, linkFullPath)
+				assert.NoError(t, err)
+			}
+
+			helpers := handlers.ExecFuncs{
+				"files-find": filesFindCmd,
+			}
+			buf := &bytes.Buffer{}
+			runner, err := interp.New(
+				interp.Dir(tempDir),
+				interp.StdIO(os.Stdin, buf, os.Stderr),
+				interp.ExecHandler(helpers.ExecHandler(interp.DefaultExecHandler(1000))),
+			)
+			assert.NoError(t, err)
+
+			scriptContent := `
+shopt -s globstar
+files-find ` + tc.args
+
+			script, err := syntax.NewParser().Parse(strings.NewReader(scriptContent), "")
+			assert.NoError(t, err)
+
+			err = runner.Run(context.Background(), script)
+			if tc.expectedError != nil {
+				assert.ErrorAs(t, err, &tc.expectedError)
+			} else {
+				assert.NoError(t, err)
+			}
+
+			contents, err := shlex.Split(buf.String())
+			assert.NoError(t, err)
 			assert.ElementsMatch(t, tc.expectedOutput, contents)
 		})
 	}
--- a/internal/translations/default.pot
+++ b/internal/translations/default.pot
@ -58,6 +58,50 @@ msgstr ""
 msgid "Done"
 msgstr ""

+#: config.go:36
+msgid "Manage config"
+msgstr ""
+
+#: config.go:48
+msgid "Show config"
+msgstr ""
+
+#: config.go:84
+msgid "Set config value"
+msgstr ""
+
+#: config.go:85
+msgid "<key> <value>"
+msgstr ""
+
+#: config.go:118 config.go:126
+msgid "invalid boolean value for %s: %s"
+msgstr ""
+
+#: config.go:141
+msgid "use 'repo add/remove' commands to manage repositories"
+msgstr ""
+
+#: config.go:143 config.go:221
+msgid "unknown config key: %s"
+msgstr ""
+
+#: config.go:147
+msgid "failed to save config"
+msgstr ""
+
+#: config.go:150
+msgid "Successfully set %s = %s"
+msgstr ""
+
+#: config.go:159
+msgid "Get config value"
+msgstr ""
+
+#: config.go:160
+msgid "<key>"
+msgstr ""
+
 #: fix.go:39
 msgid "Attempt to fix problems with ALR"
 msgstr ""
@ -138,11 +182,11 @@ msgstr ""
 msgid "Can't detect system language"
 msgstr ""

-#: info.go:135
+#: info.go:134
 msgid "Error resolving overrides"
 msgstr ""

-#: info.go:144 info.go:149
+#: info.go:143
 msgid "Error encoding script variables"
 msgstr ""

@ -174,19 +218,23 @@ msgstr ""
 msgid "Error removing packages"
 msgstr ""

-#: internal/build/build.go:376
+#: internal/build/build.go:378
 msgid "Building package"
 msgstr ""

-#: internal/build/build.go:405
+#: internal/build/build.go:407
 msgid "The checksums array must be the same length as sources"
 msgstr ""

-#: internal/build/build.go:447
+#: internal/build/build.go:449
 msgid "Downloading sources"
 msgstr ""

-#: internal/build/build.go:539
+#: internal/build/build.go:495
+msgid "Would you like to remove the build dependencies?"
+msgstr ""
+
+#: internal/build/build.go:571
 msgid "Installing dependencies"
 msgstr ""

@ -220,7 +268,7 @@ msgstr ""
 msgid "AutoReq is not implemented for this package format, so it's skipped"
 msgstr ""

-#: internal/build/firejail.go:59
+#: internal/build/firejail.go:144
 msgid "Applying FireJail integration"
 msgstr ""

@ -355,47 +403,31 @@ msgid ""
 "Database version does not exist. Run alr fix if something isn't working."
 msgstr ""

-#: internal/dl/dl.go:170
-msgid "Source can be updated, updating if required"
-msgstr ""
-
-#: internal/dl/dl.go:201
-msgid "Source found in cache and linked to destination"
-msgstr ""
-
-#: internal/dl/dl.go:208
-msgid "Source updated and linked to destination"
-msgstr ""
-
-#: internal/dl/dl.go:222
-msgid "Downloading source"
-msgstr ""
-
-#: internal/dl/progress_tui.go:100
-msgid "%s: done!\n"
-msgstr ""
-
-#: internal/dl/progress_tui.go:104
-msgid "%s %s downloading at %s/s\n"
-msgstr ""
-
 #: internal/logger/log.go:41
 msgid "ERROR"
 msgstr ""

-#: internal/repos/pull.go:77
+#: internal/repos/pull.go:88
+msgid "Trying mirror"
+msgstr ""
+
+#: internal/repos/pull.go:94
+msgid "Failed to pull from URL"
+msgstr ""
+
+#: internal/repos/pull.go:158
 msgid "Pulling repository"
 msgstr ""

-#: internal/repos/pull.go:113
+#: internal/repos/pull.go:195
 msgid "Repository up to date"
 msgstr ""

-#: internal/repos/pull.go:204
+#: internal/repos/pull.go:230
 msgid "Git repository does not appear to be a valid ALR repo"
 msgstr ""

-#: internal/repos/pull.go:220
+#: internal/repos/pull.go:246
 msgid ""
 "ALR repo's minimum ALR version is greater than the current version. Try "
 "updating ALR if something doesn't work."
@ -449,75 +481,140 @@ msgstr ""
 msgid "Enable interactive questions and prompts"
 msgstr ""

-#: main.go:146
+#: main.go:147
 msgid "Show help"
 msgstr ""

-#: main.go:150
+#: main.go:151
 msgid "Error while running app"
 msgstr ""

+#: pkg/dl/dl.go:170
+msgid "Source can be updated, updating if required"
+msgstr ""
+
+#: pkg/dl/dl.go:196
+msgid "Source found in cache and linked to destination"
+msgstr ""
+
+#: pkg/dl/dl.go:203
+msgid "Source updated and linked to destination"
+msgstr ""
+
+#: pkg/dl/dl.go:217
+msgid "Downloading source"
+msgstr ""
+
+#: pkg/dl/progress_tui.go:100
+msgid "%s: done!\n"
+msgstr ""
+
+#: pkg/dl/progress_tui.go:104
+msgid "%s %s downloading at %s/s\n"
+msgstr ""
+
 #: refresh.go:30
 msgid "Pull all repositories that have changed"
 msgstr ""

-#: repo.go:39
+#: repo.go:41
 msgid "Manage repos"
 msgstr ""

-#: repo.go:51 repo.go:269
+#: repo.go:55 repo.go:625
 msgid "Remove an existing repository"
 msgstr ""

-#: repo.go:53
+#: repo.go:57 repo.go:521
 msgid "<name>"
 msgstr ""

-#: repo.go:83
+#: repo.go:102 repo.go:465 repo.go:568
 msgid "Repo \"%s\" does not exist"
 msgstr ""

-#: repo.go:90
+#: repo.go:109
 msgid "Error removing repo directory"
 msgstr ""

-#: repo.go:94 repo.go:161 repo.go:219
+#: repo.go:113 repo.go:180 repo.go:253 repo.go:316 repo.go:389 repo.go:504
+#: repo.go:576
 msgid "Error saving config"
 msgstr ""

-#: repo.go:113
+#: repo.go:132
 msgid "Error removing packages from database"
 msgstr ""

-#: repo.go:124 repo.go:239
+#: repo.go:143 repo.go:595
 msgid "Add a new repository"
 msgstr ""

-#: repo.go:125
+#: repo.go:144 repo.go:270 repo.go:345 repo.go:402
 msgid "<name> <url>"
 msgstr ""

-#: repo.go:150
+#: repo.go:169
 msgid "Repo \"%s\" already exists"
 msgstr ""

-#: repo.go:187
+#: repo.go:206
 msgid "Set the reference of the repository"
 msgstr ""

-#: repo.go:188
+#: repo.go:207
 msgid "<name> <ref>"
 msgstr ""

-#: repo.go:246
+#: repo.go:269
+msgid "Set the main url of the repository"
+msgstr ""
+
+#: repo.go:332
+msgid "Manage mirrors of repos"
+msgstr ""
+
+#: repo.go:344
+msgid "Add a mirror URL to repository"
+msgstr ""
+
+#: repo.go:401
+msgid "Remove mirror from the repository"
+msgstr ""
+
+#: repo.go:420
+msgid "Ignore if mirror does not exist"
+msgstr ""
+
+#: repo.go:425
+msgid "Match partial URL (e.g., github.com instead of full URL)"
+msgstr ""
+
+#: repo.go:490
+msgid "No mirrors containing \"%s\" found in repo \"%s\""
+msgstr ""
+
+#: repo.go:492
+msgid "URL \"%s\" does not exist in repo \"%s\""
+msgstr ""
+
+#: repo.go:508 repo.go:580
+msgid "Removed %d mirrors from repo \"%s\"\n"
+msgstr ""
+
+#: repo.go:520
+msgid "Remove all mirrors from the repository"
+msgstr ""
+
+#: repo.go:602
 msgid "Name of the new repo"
 msgstr ""

-#: repo.go:252
+#: repo.go:608
 msgid "URL of the new repo"
 msgstr ""

-#: repo.go:276
+#: repo.go:632
 msgid "Name of the repo to be deleted"
 msgstr ""

--- a/internal/translations/po/ru/default.po
+++ b/internal/translations/po/ru/default.po
@ -5,15 +5,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unnamed project\n"
-"PO-Revision-Date: 2025-06-15 16:05+0300\n"
+"PO-Revision-Date: 2025-06-29 21:05+0300\n"
 "Last-Translator: Maxim Slipenko <maks1ms@alt-gnome.ru>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Gtranslator 48.0\n"

 #: build.go:42
@ -65,6 +65,50 @@ msgstr "Ошибка при перемещении пакета"
 msgid "Done"
 msgstr "Сделано"

+#: config.go:36
+msgid "Manage config"
+msgstr "Управление конфигурацией"
+
+#: config.go:48
+msgid "Show config"
+msgstr "Показать конфигурацию"
+
+#: config.go:84
+msgid "Set config value"
+msgstr "Установить значение в конфигурации"
+
+#: config.go:85
+msgid "<key> <value>"
+msgstr "<ключ> <значение>"
+
+#: config.go:118 config.go:126
+msgid "invalid boolean value for %s: %s"
+msgstr "неверное булево значение для %s: %s"
+
+#: config.go:141
+msgid "use 'repo add/remove' commands to manage repositories"
+msgstr "используйте команды 'repo add/remove' для управления репозиториями"
+
+#: config.go:143 config.go:221
+msgid "unknown config key: %s"
+msgstr "неизвестный ключ конфигурации: %s"
+
+#: config.go:147
+msgid "failed to save config"
+msgstr "не удалось сохранить конфигурацию"
+
+#: config.go:150
+msgid "Successfully set %s = %s"
+msgstr "Успешно установлено %s = %s"
+
+#: config.go:159
+msgid "Get config value"
+msgstr "Получить значение из конфигурации"
+
+#: config.go:160
+msgid "<key>"
+msgstr "<ключ>"
+
 #: fix.go:39
 msgid "Attempt to fix problems with ALR"
 msgstr "Попытка устранить проблемы с ALR"
@ -145,11 +189,11 @@ msgstr "Ошибка при поиске пакетов"
 msgid "Can't detect system language"
 msgstr "Ошибка при определении языка системы"

-#: info.go:135
+#: info.go:134
 msgid "Error resolving overrides"
 msgstr "Ошибка устранения переорпеделений"

-#: info.go:144 info.go:149
+#: info.go:143
 msgid "Error encoding script variables"
 msgstr "Ошибка кодирования переменных скрита"

@ -181,19 +225,23 @@ msgstr "Для команды remove ожидался хотя бы 1 аргум
 msgid "Error removing packages"
 msgstr "Ошибка при удалении пакетов"

-#: internal/build/build.go:376
+#: internal/build/build.go:378
 msgid "Building package"
 msgstr "Сборка пакета"

-#: internal/build/build.go:405
+#: internal/build/build.go:407
 msgid "The checksums array must be the same length as sources"
 msgstr "Массив контрольных сумм должен быть той же длины, что и источники"

-#: internal/build/build.go:447
+#: internal/build/build.go:449
 msgid "Downloading sources"
 msgstr "Скачивание источников"

-#: internal/build/build.go:539
+#: internal/build/build.go:495
+msgid "Would you like to remove the build dependencies?"
+msgstr "Хотели бы вы удалить зависимости сборки?"
+
+#: internal/build/build.go:571
 msgid "Installing dependencies"
 msgstr "Установка зависимостей"

@ -231,7 +279,7 @@ msgid "AutoReq is not implemented for this package format, so it's skipped"
 msgstr ""
 "AutoReq не реализовано для этого формата пакета, поэтому будет пропущено"

-#: internal/build/firejail.go:59
+#: internal/build/firejail.go:144
 msgid "Applying FireJail integration"
 msgstr "Применение интеграции FireJail"

@ -356,8 +404,8 @@ msgid ""
 "This command is deprecated and would be removed in the future, use \"%s\" "
 "instead!"
 msgstr ""
-"Эта команда устарела и будет удалена в будущем, используйте вместо нее "
-"\"%s\"!"
+"Эта команда устарела и будет удалена в будущем, используйте вместо нее \"%s"
+"\"!"

 #: internal/db/db.go:76
 msgid "Database version mismatch; resetting"
@ -369,47 +417,31 @@ msgid ""
 msgstr ""
 "Версия базы данных не существует. Запустите alr fix, если что-то не работает."

-#: internal/dl/dl.go:170
-msgid "Source can be updated, updating if required"
-msgstr "Исходный код можно обновлять, обновляя при необходимости"
-
-#: internal/dl/dl.go:201
-msgid "Source found in cache and linked to destination"
-msgstr "Источник найден в кэше и связан с пунктом назначения"
-
-#: internal/dl/dl.go:208
-msgid "Source updated and linked to destination"
-msgstr "Источник обновлён и связан с пунктом назначения"
-
-#: internal/dl/dl.go:222
-msgid "Downloading source"
-msgstr "Скачивание источника"
-
-#: internal/dl/progress_tui.go:100
-msgid "%s: done!\n"
-msgstr "%s: выполнено!\n"
-
-#: internal/dl/progress_tui.go:104
-msgid "%s %s downloading at %s/s\n"
-msgstr "%s %s загружается — %s/с\n"
-
 #: internal/logger/log.go:41
 msgid "ERROR"
 msgstr "ОШИБКА"

-#: internal/repos/pull.go:77
+#: internal/repos/pull.go:88
+msgid "Trying mirror"
+msgstr "Пробую зеркало"
+
+#: internal/repos/pull.go:94
+msgid "Failed to pull from URL"
+msgstr "Не удалось извлечь из URL"
+
+#: internal/repos/pull.go:158
 msgid "Pulling repository"
 msgstr "Скачивание репозитория"

-#: internal/repos/pull.go:113
+#: internal/repos/pull.go:195
 msgid "Repository up to date"
 msgstr "Репозиторий уже обновлён"

-#: internal/repos/pull.go:204
+#: internal/repos/pull.go:230
 msgid "Git repository does not appear to be a valid ALR repo"
 msgstr "Репозиторий Git не поддерживается репозиторием ALR"

-#: internal/repos/pull.go:220
+#: internal/repos/pull.go:246
 msgid ""
 "ALR repo's minimum ALR version is greater than the current version. Try "
 "updating ALR if something doesn't work."
@ -465,75 +497,140 @@ msgstr "Аргументы, которые будут переданы мене
 msgid "Enable interactive questions and prompts"
 msgstr "Включение интерактивных вопросов и запросов"

-#: main.go:146
+#: main.go:147
 msgid "Show help"
 msgstr "Показать справку"

-#: main.go:150
+#: main.go:151
 msgid "Error while running app"
 msgstr "Ошибка при запуске приложения"

+#: pkg/dl/dl.go:170
+msgid "Source can be updated, updating if required"
+msgstr "Исходный код можно обновлять, обновляя при необходимости"
+
+#: pkg/dl/dl.go:196
+msgid "Source found in cache and linked to destination"
+msgstr "Источник найден в кэше и связан с пунктом назначения"
+
+#: pkg/dl/dl.go:203
+msgid "Source updated and linked to destination"
+msgstr "Источник обновлён и связан с пунктом назначения"
+
+#: pkg/dl/dl.go:217
+msgid "Downloading source"
+msgstr "Скачивание источника"
+
+#: pkg/dl/progress_tui.go:100
+msgid "%s: done!\n"
+msgstr "%s: выполнено!\n"
+
+#: pkg/dl/progress_tui.go:104
+msgid "%s %s downloading at %s/s\n"
+msgstr "%s %s загружается — %s/с\n"
+
 #: refresh.go:30
 msgid "Pull all repositories that have changed"
 msgstr "Скачать все изменённые репозитории"

-#: repo.go:39
+#: repo.go:41
 msgid "Manage repos"
 msgstr "Управление репозиториями"

-#: repo.go:51 repo.go:269
+#: repo.go:55 repo.go:625
 msgid "Remove an existing repository"
 msgstr "Удалить существующий репозиторий"

-#: repo.go:53
+#: repo.go:57 repo.go:521
 msgid "<name>"
 msgstr "<имя>"

-#: repo.go:83
+#: repo.go:102 repo.go:465 repo.go:568
 msgid "Repo \"%s\" does not exist"
 msgstr "Репозитория \"%s\" не существует"

-#: repo.go:90
+#: repo.go:109
 msgid "Error removing repo directory"
 msgstr "Ошибка при удалении каталога репозитория"

-#: repo.go:94 repo.go:161 repo.go:219
+#: repo.go:113 repo.go:180 repo.go:253 repo.go:316 repo.go:389 repo.go:504
+#: repo.go:576
 msgid "Error saving config"
 msgstr "Ошибка при сохранении конфигурации"

-#: repo.go:113
+#: repo.go:132
 msgid "Error removing packages from database"
 msgstr "Ошибка при удалении пакетов из базы данных"

-#: repo.go:124 repo.go:239
+#: repo.go:143 repo.go:595
 msgid "Add a new repository"
 msgstr "Добавить новый репозиторий"

-#: repo.go:125
+#: repo.go:144 repo.go:270 repo.go:345 repo.go:402
 msgid "<name> <url>"
 msgstr "<имя> <url>"

-#: repo.go:150
+#: repo.go:169
 msgid "Repo \"%s\" already exists"
 msgstr "Репозиторий \"%s\" уже существует"

-#: repo.go:187
+#: repo.go:206
 msgid "Set the reference of the repository"
 msgstr "Установить ссылку на версию репозитория"

-#: repo.go:188
+#: repo.go:207
 msgid "<name> <ref>"
 msgstr "<имя> <ссылка_на_версию>"

-#: repo.go:246
+#: repo.go:269
+msgid "Set the main url of the repository"
+msgstr "Установить главный URL репозитория"
+
+#: repo.go:332
+msgid "Manage mirrors of repos"
+msgstr "Управление зеркалами репозитория"
+
+#: repo.go:344
+msgid "Add a mirror URL to repository"
+msgstr "Добавить зеркало репозитория"
+
+#: repo.go:401
+msgid "Remove mirror from the repository"
+msgstr "Удалить зеркало из репозитория"
+
+#: repo.go:420
+msgid "Ignore if mirror does not exist"
+msgstr "Игнорировать, если зеркала не существует"
+
+#: repo.go:425
+msgid "Match partial URL (e.g., github.com instead of full URL)"
+msgstr "Соответствует частичному URL (например, github.com вместо полного URL)"
+
+#: repo.go:490
+msgid "No mirrors containing \"%s\" found in repo \"%s\""
+msgstr "В репозитории \"%s\" не найдено зеркал, содержащих \"%s\""
+
+#: repo.go:492
+msgid "URL \"%s\" does not exist in repo \"%s\""
+msgstr "URL \"%s\" не существует в репозитории \"%s\""
+
+#: repo.go:508 repo.go:580
+msgid "Removed %d mirrors from repo \"%s\"\n"
+msgstr "Удалены зеркала %d из репозитория \"%s\"\n"
+
+#: repo.go:520
+msgid "Remove all mirrors from the repository"
+msgstr "Удалить все зеркала из репозитория"
+
+#: repo.go:602
 msgid "Name of the new repo"
 msgstr "Название нового репозитория"

-#: repo.go:252
+#: repo.go:608
 msgid "URL of the new repo"
 msgstr "URL-адрес нового репозитория"

-#: repo.go:276
+#: repo.go:632
 msgid "Name of the repo to be deleted"
 msgstr "Название репозитория  удалён"

@ -614,9 +711,6 @@ msgstr "Здесь нечего делать."
 #~ msgid "Installing build dependencies"
 #~ msgstr "Установка зависимостей сборки"

-#~ msgid "Would you like to remove the build dependencies?"
-#~ msgstr "Хотели бы вы удалить зависимости сборки?"
-
 #~ msgid "Error installing native packages"
 #~ msgstr "Ошибка при установке нативных пакетов"

@ -633,9 +727,6 @@ msgstr "Здесь нечего делать."
 #~ msgid "Unable to detect user config directory"
 #~ msgstr "Не удалось обнаружить каталог конфигурации пользователя"

-#~ msgid "Unable to create ALR config file"
-#~ msgstr "Не удалось создать конфигурационный файл ALR"
-
 #~ msgid "Error encoding default configuration"
 #~ msgstr "Ошибка кодирования конфигурации по умолчанию"

--- a/main.go
+++ b/main.go
@ -83,6 +83,7 @@ func GetApp() *cli.App {
 			VersionCmd(),
 			SearchCmd(),
 			RepoCmd(),
+			ConfigCmd(),
 			// Internal commands
 			InternalBuildCmd(),
 			InternalInstallCmd(),
--- a/pkg/alrsh/overridable.go
+++ b/pkg/alrsh/overridable.go
@ -68,10 +68,12 @@ func (o *OverridableField[T]) Resolve(overrides []string) {
 	for _, override := range overrides {
 		if v, ok := o.Has(override); ok {
 			o.SetResolved(v)
+			return
 		}
 	}
 }

+// Database serialization (JSON)
 func (f *OverridableField[T]) ToDB() ([]byte, error) {
 	var data map[string]T

@ -103,6 +105,7 @@ func (f *OverridableField[T]) FromDB(data []byte) error {
 	return nil
 }

+// Gob serialization
 type overridableFieldGobPayload[T any] struct {
 	Data     map[string]T
 	Resolved T
@ -136,6 +139,48 @@ func (f *OverridableField[T]) GobDecode(data []byte) error {
 	return nil
 }

+type overridableFieldJSONPayload[T any] struct {
+	Resolved *T           `json:"resolved,omitempty,omitzero"`
+	Data     map[string]T `json:"overrides,omitempty,omitzero"`
+}
+
+func (f OverridableField[T]) MarshalJSON() ([]byte, error) {
+	data := make(map[string]T)
+
+	for k, v := range f.data {
+		if k == "" {
+			data["default"] = v
+		} else {
+			data[k] = v
+		}
+	}
+
+	payload := overridableFieldJSONPayload[T]{
+		Data:     data,
+		Resolved: &f.resolved,
+	}
+
+	return json.Marshal(payload)
+}
+
+func (f *OverridableField[T]) UnmarshalJSON(data []byte) error {
+	var payload overridableFieldJSONPayload[T]
+	if err := json.Unmarshal(data, &payload); err != nil {
+		return err
+	}
+
+	if payload.Data == nil {
+		payload.Data = make(map[string]T)
+	}
+
+	f.data = payload.Data
+	if payload.Resolved != nil {
+		f.resolved = *payload.Resolved
+	}
+
+	return nil
+}
+
 func OverridableFromMap[T any](data map[string]T) OverridableField[T] {
 	if data == nil {
 		data = make(map[string]T)
--- a/pkg/alrsh/package.go
+++ b/pkg/alrsh/package.go
@ -14,9 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.

+//go:generate bash -c "go run ../../generators/alrsh-package && cd ../.. && make update-license"
+
 package alrsh

 import (
+	"encoding/json"
 	"fmt"
 	"reflect"
 	"strings"
@ -39,38 +42,38 @@ func ParseNames(dec *decoder.Decoder) (*PackageNames, error) {
 }

 type Package struct {
-	Repository  string `xorm:"pk 'repository'"`
-	Name        string `xorm:"pk 'name'"`
-	BasePkgName string `xorm:"notnull 'basepkg_name'"`
+	Repository  string `xorm:"pk 'repository'" json:"repository"`
+	Name        string `xorm:"pk 'name'" json:"name"`
+	BasePkgName string `xorm:"notnull 'basepkg_name'" json:"basepkg_name"`

-	Version       string   `sh:"version" xorm:"notnull 'version'"`
-	Release       int      `sh:"release" xorm:"notnull 'release'"`
-	Epoch         uint     `sh:"epoch" xorm:"'epoch'"`
-	Architectures []string `sh:"architectures" xorm:"json 'architectures'"`
-	Licenses      []string `sh:"license" xorm:"json 'licenses'"`
-	Provides      []string `sh:"provides" xorm:"json 'provides'"`
-	Conflicts     []string `sh:"conflicts" xorm:"json 'conflicts'"`
-	Replaces      []string `sh:"replaces" xorm:"json 'replaces'"`
+	Version       string   `sh:"version" xorm:"notnull 'version'" json:"version"`
+	Release       int      `sh:"release" xorm:"notnull 'release'" json:"release"`
+	Epoch         uint     `sh:"epoch" xorm:"'epoch'" json:"epoch"`
+	Architectures []string `sh:"architectures" xorm:"json 'architectures'" json:"architectures"`
+	Licenses      []string `sh:"license" xorm:"json 'licenses'" json:"license"`
+	Provides      []string `sh:"provides" xorm:"json 'provides'" json:"provides"`
+	Conflicts     []string `sh:"conflicts" xorm:"json 'conflicts'" json:"conflicts"`
+	Replaces      []string `sh:"replaces" xorm:"json 'replaces'" json:"replaces"`

-	Summary          OverridableField[string]   `sh:"summary" xorm:"'summary'"`
-	Description      OverridableField[string]   `sh:"desc" xorm:"'description'"`
-	Group            OverridableField[string]   `sh:"group" xorm:"'group_name'"`
-	Homepage         OverridableField[string]   `sh:"homepage" xorm:"'homepage'"`
-	Maintainer       OverridableField[string]   `sh:"maintainer" xorm:"'maintainer'"`
-	Depends          OverridableField[[]string] `sh:"deps" xorm:"'depends'"`
-	BuildDepends     OverridableField[[]string] `sh:"build_deps" xorm:"'builddepends'"`
-	OptDepends       OverridableField[[]string] `sh:"opt_deps" xorm:"'optdepends'"`
-	Sources          OverridableField[[]string] `sh:"sources" xorm:"-"`
-	Checksums        OverridableField[[]string] `sh:"checksums" xorm:"-"`
-	Backup           OverridableField[[]string] `sh:"backup" xorm:"-"`
-	Scripts          OverridableField[Scripts]  `sh:"scripts" xorm:"-"`
-	AutoReq          OverridableField[[]string] `sh:"auto_req" xorm:"-"`
-	AutoProv         OverridableField[[]string] `sh:"auto_prov" xorm:"-"`
-	AutoReqSkipList  OverridableField[[]string] `sh:"auto_req_skiplist" xorm:"-"`
-	AutoProvSkipList OverridableField[[]string] `sh:"auto_prov_skiplist" xorm:"-"`
+	Summary          OverridableField[string]   `sh:"summary" xorm:"'summary'" json:"summary"`
+	Description      OverridableField[string]   `sh:"desc" xorm:"'description'" json:"description"`
+	Group            OverridableField[string]   `sh:"group" xorm:"'group_name'" json:"group"`
+	Homepage         OverridableField[string]   `sh:"homepage" xorm:"'homepage'" json:"homepage"`
+	Maintainer       OverridableField[string]   `sh:"maintainer" xorm:"'maintainer'" json:"maintainer"`
+	Depends          OverridableField[[]string] `sh:"deps" xorm:"'depends'" json:"deps"`
+	BuildDepends     OverridableField[[]string] `sh:"build_deps" xorm:"'builddepends'" json:"build_deps"`
+	OptDepends       OverridableField[[]string] `sh:"opt_deps" xorm:"'optdepends'" json:"opt_deps,omitempty"`
+	Sources          OverridableField[[]string] `sh:"sources" xorm:"-" json:"sources"`
+	Checksums        OverridableField[[]string] `sh:"checksums" xorm:"-" json:"checksums,omitempty"`
+	Backup           OverridableField[[]string] `sh:"backup" xorm:"-" json:"backup"`
+	Scripts          OverridableField[Scripts]  `sh:"scripts" xorm:"-" json:"scripts,omitempty"`
+	AutoReq          OverridableField[[]string] `sh:"auto_req" xorm:"-" json:"auto_req"`
+	AutoProv         OverridableField[[]string] `sh:"auto_prov" xorm:"-" json:"auto_prov"`
+	AutoReqSkipList  OverridableField[[]string] `sh:"auto_req_skiplist" xorm:"-" json:"auto_req_skiplist,omitempty"`
+	AutoProvSkipList OverridableField[[]string] `sh:"auto_prov_skiplist" xorm:"-" json:"auto_prov_skiplist,omitempty"`

-	FireJailed       OverridableField[bool]              `sh:"firejailed" xorm:"-"`
-	FireJailProfiles OverridableField[map[string]string] `sh:"firejail_profiles" xorm:"-"`
+	FireJailed       OverridableField[bool]              `sh:"firejailed" xorm:"-" json:"firejailed"`
+	FireJailProfiles OverridableField[map[string]string] `sh:"firejail_profiles" xorm:"-" json:"firejail_profiles,omitempty"`
 }

 type Scripts struct {
@ -84,25 +87,70 @@ type Scripts struct {
 	PostTrans   string `sh:"posttrans"`
 }

-func ResolvePackage(p *Package, overrides []string) {
-	val := reflect.ValueOf(p).Elem()
-	typ := val.Type()
+func (p Package) MarshalJSONWithOptions(includeOverrides bool) ([]byte, error) {
+	// Сначала сериализуем обычным способом для получения базовой структуры
+	type PackageAlias Package
+	baseData, err := json.Marshal(PackageAlias(p))
+	if err != nil {
+		return nil, err
+	}

-	for i := range val.NumField() {
-		field := val.Field(i)
-		fieldType := typ.Field(i)
+	// Десериализуем в map для модификации
+	var result map[string]json.RawMessage
+	if err := json.Unmarshal(baseData, &result); err != nil {
+		return nil, err
+	}

-		if !field.CanInterface() {
+	// Теперь заменяем OverridableField поля
+	v := reflect.ValueOf(p)
+	t := reflect.TypeOf(p)
+
+	for i := 0; i < v.NumField(); i++ {
+		field := v.Field(i)
+		fieldType := t.Field(i)
+
+		jsonTag := fieldType.Tag.Get("json")
+		if jsonTag == "" || jsonTag == "-" {
 			continue
 		}

-		if field.Kind() == reflect.Struct && strings.HasPrefix(fieldType.Type.String(), "alrsh.OverridableField") {
-			of := field.Addr().Interface()
-			if res, ok := of.(interface {
-				Resolve([]string)
-			}); ok {
-				res.Resolve(overrides)
+		fieldName := jsonTag
+		if commaIdx := strings.Index(jsonTag, ","); commaIdx != -1 {
+			fieldName = jsonTag[:commaIdx]
+		}
+
+		if field.Type().Name() == "OverridableField" ||
+			(field.Type().Kind() == reflect.Struct &&
+				strings.Contains(field.Type().String(), "OverridableField")) {
+
+			fieldPtr := field.Addr()
+
+			resolvedMethod := fieldPtr.MethodByName("Resolved")
+			if resolvedMethod.IsValid() {
+				resolved := resolvedMethod.Call(nil)[0]
+
+				fieldData := map[string]interface{}{
+					"resolved": resolved.Interface(),
+				}
+
+				if includeOverrides {
+					allMethod := field.MethodByName("All")
+					if allMethod.IsValid() {
+						overrides := allMethod.Call(nil)[0]
+						if !overrides.IsNil() && overrides.Len() > 0 {
+							fieldData["overrides"] = overrides.Interface()
+						}
+					}
+				}
+
+				fieldJSON, err := json.Marshal(fieldData)
+				if err != nil {
+					return nil, err
+				}
+				result[fieldName] = json.RawMessage(fieldJSON)
 			}
 		}
 	}
+
+	return json.Marshal(result)
 }
--- a/pkg/alrsh/package_gen.go
+++ b/pkg/alrsh/package_gen.go
@ -0,0 +1,105 @@
+// ALR - Any Linux Repository
+// Copyright (C) 2025 The ALR Authors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// DO NOT EDIT MANUALLY. This file is generated.
+package alrsh
+
+type packageResolved struct {
+	Repository       string            `json:"repository"`
+	Name             string            `json:"name"`
+	BasePkgName      string            `json:"basepkg_name"`
+	Version          string            `json:"version"`
+	Release          int               `json:"release"`
+	Epoch            uint              `json:"epoch"`
+	Architectures    []string          `json:"architectures"`
+	Licenses         []string          `json:"license"`
+	Provides         []string          `json:"provides"`
+	Conflicts        []string          `json:"conflicts"`
+	Replaces         []string          `json:"replaces"`
+	Summary          string            `json:"summary"`
+	Description      string            `json:"description"`
+	Group            string            `json:"group"`
+	Homepage         string            `json:"homepage"`
+	Maintainer       string            `json:"maintainer"`
+	Depends          []string          `json:"deps"`
+	BuildDepends     []string          `json:"build_deps"`
+	OptDepends       []string          `json:"opt_deps,omitempty"`
+	Sources          []string          `json:"sources"`
+	Checksums        []string          `json:"checksums,omitempty"`
+	Backup           []string          `json:"backup"`
+	Scripts          Scripts           `json:"scripts,omitempty"`
+	AutoReq          []string          `json:"auto_req"`
+	AutoProv         []string          `json:"auto_prov"`
+	AutoReqSkipList  []string          `json:"auto_req_skiplist,omitempty"`
+	AutoProvSkipList []string          `json:"auto_prov_skiplist,omitempty"`
+	FireJailed       bool              `json:"firejailed"`
+	FireJailProfiles map[string]string `json:"firejail_profiles,omitempty"`
+}
+
+func PackageToResolved(src *Package) packageResolved {
+	return packageResolved{
+		Repository:       src.Repository,
+		Name:             src.Name,
+		BasePkgName:      src.BasePkgName,
+		Version:          src.Version,
+		Release:          src.Release,
+		Epoch:            src.Epoch,
+		Architectures:    src.Architectures,
+		Licenses:         src.Licenses,
+		Provides:         src.Provides,
+		Conflicts:        src.Conflicts,
+		Replaces:         src.Replaces,
+		Summary:          src.Summary.Resolved(),
+		Description:      src.Description.Resolved(),
+		Group:            src.Group.Resolved(),
+		Homepage:         src.Homepage.Resolved(),
+		Maintainer:       src.Maintainer.Resolved(),
+		Depends:          src.Depends.Resolved(),
+		BuildDepends:     src.BuildDepends.Resolved(),
+		OptDepends:       src.OptDepends.Resolved(),
+		Sources:          src.Sources.Resolved(),
+		Checksums:        src.Checksums.Resolved(),
+		Backup:           src.Backup.Resolved(),
+		Scripts:          src.Scripts.Resolved(),
+		AutoReq:          src.AutoReq.Resolved(),
+		AutoProv:         src.AutoProv.Resolved(),
+		AutoReqSkipList:  src.AutoReqSkipList.Resolved(),
+		AutoProvSkipList: src.AutoProvSkipList.Resolved(),
+		FireJailed:       src.FireJailed.Resolved(),
+		FireJailProfiles: src.FireJailProfiles.Resolved(),
+	}
+}
+
+func ResolvePackage(pkg *Package, overrides []string) {
+	pkg.Summary.Resolve(overrides)
+	pkg.Description.Resolve(overrides)
+	pkg.Group.Resolve(overrides)
+	pkg.Homepage.Resolve(overrides)
+	pkg.Maintainer.Resolve(overrides)
+	pkg.Depends.Resolve(overrides)
+	pkg.BuildDepends.Resolve(overrides)
+	pkg.OptDepends.Resolve(overrides)
+	pkg.Sources.Resolve(overrides)
+	pkg.Checksums.Resolve(overrides)
+	pkg.Backup.Resolve(overrides)
+	pkg.Scripts.Resolve(overrides)
+	pkg.AutoReq.Resolve(overrides)
+	pkg.AutoProv.Resolve(overrides)
+	pkg.AutoReqSkipList.Resolve(overrides)
+	pkg.AutoProvSkipList.Resolve(overrides)
+	pkg.FireJailed.Resolve(overrides)
+	pkg.FireJailProfiles.Resolve(overrides)
+}
--- a/pkg/alrsh/view.go
+++ b/pkg/alrsh/view.go
@ -0,0 +1,37 @@
+// ALR - Any Linux Repository
+// Copyright (C) 2025 The ALR Authors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package alrsh
+
+import "encoding/json"
+
+type PackageView struct {
+	pkg Package
+
+	Resolved bool
+}
+
+func NewPackageView(v Package) PackageView {
+	return PackageView{pkg: v}
+}
+
+func (p PackageView) MarshalJSON() ([]byte, error) {
+	if p.Resolved {
+		return json.Marshal(PackageToResolved(&p.pkg))
+	} else {
+		return json.Marshal(p.pkg)
+	}
+}
--- a/internal/dl/dl.go
+++ b/internal/dl/dl.go
@ -55,7 +55,7 @@ var (

 // Массив доступных загрузчиков в порядке их проверки
 var Downloaders = []Downloader{
-	GitDownloader{},
+	&GitDownloader{},
 	TorrentDownloader{},
 	FileDownloader{},
 }
@ -172,15 +172,10 @@ func Download(ctx context.Context, opts Options) (err error) {
 				"downloader", d.Name(),
 			)

-			updated, err = d.Update(Options{
-				Hash:          opts.Hash,
-				HashAlgorithm: opts.HashAlgorithm,
-				Name:          opts.Name,
-				URL:           opts.URL,
-				Destination:   cacheDir,
-				Progress:      opts.Progress,
-				LocalDir:      opts.LocalDir,
-			})
+			newOpts := opts
+			newOpts.Destination = cacheDir
+
+			updated, err = d.Update(newOpts)
 			if err != nil {
 				return err
 			}
@ -226,15 +221,10 @@ func Download(ctx context.Context, opts Options) (err error) {
 		return err
 	}

-	t, name, err := d.Download(ctx, Options{
-		Hash:          opts.Hash,
-		HashAlgorithm: opts.HashAlgorithm,
-		Name:          opts.Name,
-		URL:           opts.URL,
-		Destination:   cacheDir,
-		Progress:      opts.Progress,
-		LocalDir:      opts.LocalDir,
-	})
+	newOpts := opts
+	newOpts.Destination = cacheDir
+
+	t, name, err := d.Download(ctx, newOpts)
 	if err != nil {
 		return err
 	}
--- a/internal/dl/dl_test.go
+++ b/internal/dl/dl_test.go
@ -32,8 +32,8 @@ import (
 	"github.com/stretchr/testify/assert"

 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/dl"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/dlcache"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/dl"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/dlcache"
 )

 type TestALRConfig struct{}
@ -155,7 +155,7 @@ func TestDownloadFileWithCache(t *testing.T) {
 				CacheDisabled: false,
 				URL:           server.URL + "/file",
 				Destination:   tmpdir,
-				DlCache:       dlcache.New(cfg),
+				DlCache:       dlcache.New(cfg.GetPaths().CacheDir),
 			}

 			outputFile := path.Join(tmpdir, "file")
--- a/internal/dl/file.go
+++ b/internal/dl/file.go
@ -108,7 +108,7 @@ func (FileDownloader) Download(ctx context.Context, opts Options) (Type, string,
 	}
 	defer r.Close()

-	opts.PostprocDisabled = archive == "false"
+	postprocDisabled := opts.PostprocDisabled || archive == "false"

 	path := filepath.Join(opts.Destination, name)
 	fl, err := os.Create(path)
@ -154,7 +154,7 @@ func (FileDownloader) Download(ctx context.Context, opts Options) (Type, string,
 	}

 	// Проверка необходимости постобработки
-	if opts.PostprocDisabled {
+	if postprocDisabled {
 		return TypeFile, name, nil
 	}

--- a/internal/dl/git.go
+++ b/internal/dl/git.go
@ -48,7 +48,7 @@ func (GitDownloader) MatchURL(u string) bool {
 // Download uses git to clone the repository from the specified URL.
 // It allows specifying the revision, depth and recursion options
 // via query string
-func (GitDownloader) Download(ctx context.Context, opts Options) (Type, string, error) {
+func (d *GitDownloader) Download(ctx context.Context, opts Options) (Type, string, error) {
 	u, err := url.Parse(opts.URL)
 	if err != nil {
 		return 0, "", err
@ -60,6 +60,9 @@ func (GitDownloader) Download(ctx context.Context, opts Options) (Type, string,
 	rev := query.Get("~rev")
 	query.Del("~rev")

+	// Right now, this only affects the return value of name,
+	// which will be used by dl_cache.
+	// It seems wrong, but for now it's better to leave it as it is.
 	name := query.Get("~name")
 	query.Del("~name")

@ -121,6 +124,11 @@ func (GitDownloader) Download(ctx context.Context, opts Options) (Type, string,
 		}
 	}

+	err = VerifyHashFromLocal("", opts)
+	if err != nil {
+		return 0, "", err
+	}
+
 	if name == "" {
 		name = strings.TrimSuffix(path.Base(u.Path), ".git")
 	}
@ -133,7 +141,7 @@ func (GitDownloader) Download(ctx context.Context, opts Options) (Type, string,
 // and recursion options via query string. It returns
 // true if update was successful and false if the
 // repository is already up-to-date
-func (GitDownloader) Update(opts Options) (bool, error) {
+func (d *GitDownloader) Update(opts Options) (bool, error) {
 	u, err := url.Parse(opts.URL)
 	if err != nil {
 		return false, err
@ -183,18 +191,21 @@ func (GitDownloader) Update(opts Options) (bool, error) {
 	manifestOK := err == nil

 	err = w.Pull(po)
-	if errors.Is(err, git.NoErrAlreadyUpToDate) {
-		return false, nil
-	} else if err != nil {
+	if err != nil {
+		if errors.Is(err, git.NoErrAlreadyUpToDate) {
+			return false, nil
+		}
+		return false, err
+	}
+
+	err = VerifyHashFromLocal("", opts)
+	if err != nil {
 		return false, err
 	}

 	if manifestOK {
 		err = writeManifest(opts.Destination, m)
-		if err != nil {
-			return true, err
-		}
 	}

-	return true, nil
+	return true, err
 }
--- a/pkg/dl/git_test.go
+++ b/pkg/dl/git_test.go
@ -0,0 +1,183 @@
+// ALR - Any Linux Repository
+// Copyright (C) 2025 The ALR Authors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package dl_test
+
+import (
+	"context"
+	"encoding/hex"
+	"os"
+	"os/exec"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/dl"
+)
+
+func TestGitDownloaderMatchUrl(t *testing.T) {
+	d := dl.GitDownloader{}
+	assert.True(t, d.MatchURL("git+https://example.com/org/project.git"))
+	assert.False(t, d.MatchURL("https://example.com/org/project.git"))
+}
+
+func TestGitDownloaderDownload(t *testing.T) {
+	d := dl.GitDownloader{}
+
+	createTempDir := func(t *testing.T, name string) string {
+		t.Helper()
+		dir, err := os.MkdirTemp("", "test-"+name)
+		assert.NoError(t, err)
+		t.Cleanup(func() {
+			_ = os.RemoveAll(dir)
+		})
+		return dir
+	}
+
+	t.Run("simple", func(t *testing.T) {
+		dest := createTempDir(t, "simple")
+
+		dlType, name, err := d.Download(context.Background(), dl.Options{
+			URL:         "git+https://gitea.plemya-x.ru/Plemya-x/repo-for-tests.git",
+			Destination: dest,
+		})
+
+		assert.NoError(t, err)
+		assert.Equal(t, dl.TypeDir, dlType)
+		assert.Equal(t, "repo-for-tests", name)
+	})
+
+	t.Run("with hash", func(t *testing.T) {
+		dest := createTempDir(t, "with-hash")
+
+		hsh, err := hex.DecodeString("33c912b855352663550003ca6b948ae3df1f38e2c036f5a85775df5967e143bf")
+		assert.NoError(t, err)
+
+		dlType, name, err := d.Download(context.Background(), dl.Options{
+			URL:           "git+https://gitea.plemya-x.ru/Plemya-x/repo-for-tests.git?~rev=init&~name=test",
+			Destination:   dest,
+			Hash:          hsh,
+			HashAlgorithm: "sha256",
+		})
+
+		assert.NoError(t, err)
+		assert.Equal(t, dl.TypeDir, dlType)
+		assert.Equal(t, "test", name)
+	})
+
+	t.Run("with hash (checksum mismatch)", func(t *testing.T) {
+		dest := createTempDir(t, "with-hash-checksum-mismatch")
+
+		hsh, err := hex.DecodeString("33c912b855352663550003ca6b948ae3df1f38e2c036f5a85775df5967e143bf")
+		assert.NoError(t, err)
+
+		_, _, err = d.Download(context.Background(), dl.Options{
+			URL:           "git+https://gitea.plemya-x.ru/Plemya-x/repo-for-tests.git",
+			Destination:   dest,
+			Hash:          hsh,
+			HashAlgorithm: "sha256",
+		})
+
+		assert.ErrorIs(t, err, dl.ErrChecksumMismatch)
+	})
+}
+
+func TestGitDownloaderUpdate(t *testing.T) {
+	d := dl.GitDownloader{}
+
+	createTempDir := func(t *testing.T, name string) string {
+		t.Helper()
+		dir, err := os.MkdirTemp("", "test-"+name)
+
+		assert.NoError(t, err)
+		t.Cleanup(func() {
+			_ = os.RemoveAll(dir)
+		})
+		return dir
+	}
+
+	setupOldRepo := func(t *testing.T, dest string) {
+		t.Helper()
+
+		cmd := exec.Command("git", "clone", "https://gitea.plemya-x.ru/Plemya-x/repo-for-tests.git", dest)
+		err := cmd.Run()
+		assert.NoError(t, err)
+
+		cmd = exec.Command("git", "-C", dest, "reset", "--hard", "init")
+		err = cmd.Run()
+		assert.NoError(t, err)
+	}
+
+	t.Run("simple", func(t *testing.T) {
+		dest := createTempDir(t, "update")
+
+		setupOldRepo(t, dest)
+
+		cmd := exec.Command("git", "-C", dest, "rev-parse", "HEAD")
+		oldHash, err := cmd.Output()
+		assert.NoError(t, err)
+
+		updated, err := d.Update(dl.Options{
+			URL:         "git+https://gitea.plemya-x.ru/Plemya-x/repo-for-tests.git",
+			Destination: dest,
+		})
+
+		assert.NoError(t, err)
+		assert.True(t, updated)
+
+		cmd = exec.Command("git", "-C", dest, "rev-parse", "HEAD")
+		newHash, err := cmd.Output()
+		assert.NoError(t, err)
+		assert.NotEqual(t, string(oldHash), string(newHash), "Repository should be updated")
+	})
+
+	t.Run("with hash", func(t *testing.T) {
+		dest := createTempDir(t, "update")
+
+		setupOldRepo(t, dest)
+
+		hsh, err := hex.DecodeString("0dc4f3c68c435d0cd7a5ee960f965815fa9c4ee0571839cdb8f9de56e06f91eb")
+		assert.NoError(t, err)
+
+		updated, err := d.Update(dl.Options{
+			URL:           "git+https://gitea.plemya-x.ru/Plemya-x/repo-for-tests.git~rev=test-update-git-downloader",
+			Destination:   dest,
+			Hash:          hsh,
+			HashAlgorithm: "sha256",
+		})
+
+		assert.NoError(t, err)
+		assert.True(t, updated)
+	})
+
+	t.Run("with hash (checksum mismatch)", func(t *testing.T) {
+		dest := createTempDir(t, "update")
+
+		setupOldRepo(t, dest)
+
+		hsh, err := hex.DecodeString("33c912b855352663550003ca6b948ae3df1f38e2c036f5a85775df5967e143bf")
+		assert.NoError(t, err)
+
+		_, err = d.Update(dl.Options{
+			URL:           "git+https://gitea.plemya-x.ru/Plemya-x/repo-for-tests.git?~rev=test-update-git-downloader",
+			Destination:   dest,
+			Hash:          hsh,
+			HashAlgorithm: "sha256",
+		})
+
+		assert.ErrorIs(t, err, dl.ErrChecksumMismatch)
+	})
+}
--- a/internal/dl/progress_tui.go
+++ b/internal/dl/progress_tui.go
--- a/internal/dl/torrent.go
+++ b/internal/dl/torrent.go
@ -71,7 +71,17 @@ func (TorrentDownloader) Download(ctx context.Context, opts Options) (Type, stri
 		return 0, "", err
 	}

-	return determineType(opts.Destination)
+	dlType, name, err := determineType(opts.Destination)
+	if err != nil {
+		return 0, "", err
+	}
+
+	err = VerifyHashFromLocal(name, opts)
+	if err != nil {
+		return 0, "", err
+	}
+
+	return dlType, name, nil
 }

 func removeTorrentFiles(path string) error {
--- a/pkg/dl/utils.go
+++ b/pkg/dl/utils.go
@ -0,0 +1,95 @@
+// ALR - Any Linux Repository
+// Copyright (C) 2025 The ALR Authors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package dl
+
+import (
+	"bytes"
+	"encoding/hex"
+	"fmt"
+	"hash"
+	"io"
+	"log/slog"
+	"os"
+	"path/filepath"
+)
+
+// If the checksum does not match, returns ErrChecksumMismatch
+func VerifyHashFromLocal(path string, opts Options) error {
+	if opts.Hash != nil {
+		h, err := opts.NewHash()
+		if err != nil {
+			return err
+		}
+
+		err = HashLocal(filepath.Join(opts.Destination, path), h)
+		if err != nil {
+			return err
+		}
+
+		sum := h.Sum(nil)
+
+		slog.Debug("validate checksum", "real", hex.EncodeToString(sum), "expected", hex.EncodeToString(opts.Hash))
+
+		if !bytes.Equal(sum, opts.Hash) {
+			return ErrChecksumMismatch
+		}
+	}
+
+	return nil
+}
+
+func HashLocal(path string, h hash.Hash) error {
+	info, err := os.Stat(path)
+	if err != nil {
+		return err
+	}
+
+	if info.Mode().IsRegular() {
+		// Single file
+		f, err := os.Open(path)
+		if err != nil {
+			return err
+		}
+		defer f.Close()
+		_, err = io.Copy(h, f)
+		return err
+	}
+
+	if info.IsDir() {
+		// Walk directory
+		return filepath.Walk(path, func(path string, info os.FileInfo, err error) error {
+			if err != nil {
+				return err
+			}
+			if info.IsDir() && info.Name() == ".git" {
+				return filepath.SkipDir
+			}
+			if !info.Mode().IsRegular() {
+				return nil
+			}
+			f, err := os.Open(path)
+			if err != nil {
+				return err
+			}
+			defer f.Close()
+			_, err = io.Copy(h, f)
+			return err
+		})
+	}
+
+	return fmt.Errorf("unsupported file type: %s", path)
+}
--- a/internal/dlcache/dlcache.go
+++ b/internal/dlcache/dlcache.go
@ -32,19 +32,15 @@ type Config interface {
 }

 type DownloadCache struct {
-	cfg Config
+	cacheDir string
 }

-func New(cfg Config) *DownloadCache {
-	return &DownloadCache{
-		cfg,
-	}
+func New(cacheDir string) *DownloadCache {
+	return &DownloadCache{cacheDir}
 }

 func (dc *DownloadCache) BasePath(ctx context.Context) string {
-	return filepath.Join(
-		dc.cfg.GetPaths().CacheDir, "dl",
-	)
+	return filepath.Join(dc.cacheDir, "dl")
 }

 // New creates a new directory with the given ID in the cache.
--- a/internal/dlcache/dlcache_test.go
+++ b/internal/dlcache/dlcache_test.go
@ -29,7 +29,7 @@ import (
 	"testing"

 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/dlcache"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/dlcache"
 )

 type TestALRConfig struct {
@ -64,7 +64,7 @@ func TestNew(t *testing.T) {
 	cfg := prepare(t)
 	defer cleanup(t, cfg)

-	dc := dlcache.New(cfg)
+	dc := dlcache.New(cfg.GetPaths().CacheDir)

 	ctx := context.Background()

--- a/internal/dlcache/utils.go
+++ b/internal/dlcache/utils.go
--- a/pkg/types/config.go
+++ b/pkg/types/config.go
@ -21,18 +21,19 @@ package types

 // Config represents the ALR configuration file
 type Config struct {
-	RootCmd          string   `toml:"rootCmd" env:"ALR_ROOT_CMD"`
-	UseRootCmd       bool     `toml:"useRootCmd"`
-	PagerStyle       string   `toml:"pagerStyle" env:"ALR_PAGER_STYLE"`
-	IgnorePkgUpdates []string `toml:"ignorePkgUpdates"`
-	Repos            []Repo   `toml:"repo"`
-	AutoPull         bool     `toml:"autoPull" env:"ALR_AUTOPULL"`
-	LogLevel         string   `toml:"logLevel" env:"ALR_LOG_LEVEL"`
+	RootCmd          string   `json:"rootCmd" koanf:"rootCmd"`
+	UseRootCmd       bool     `json:"useRootCmd" koanf:"useRootCmd"`
+	PagerStyle       string   `json:"pagerStyle" koanf:"pagerStyle"`
+	IgnorePkgUpdates []string `json:"ignorePkgUpdates" koanf:"ignorePkgUpdates"`
+	Repos            []Repo   `json:"repo" koanf:"repo"`
+	AutoPull         bool     `json:"autoPull" koanf:"autoPull"`
+	LogLevel         string   `json:"logLevel" koanf:"logLevel"`
 }

 // Repo represents a ALR repo within a configuration file
 type Repo struct {
-	Name string `toml:"name"`
-	URL  string `toml:"url"`
-	Ref  string `toml:"ref"`
+	Name    string   `json:"name" koanf:"name"`
+	URL     string   `json:"url" koanf:"url"`
+	Ref     string   `json:"ref" koanf:"ref"`
+	Mirrors []string `json:"mirrors" koanf:"mirrors"`
 }
--- a/repo.go
+++ b/repo.go
@ -20,8 +20,10 @@
 package main

 import (
+	"fmt"
 	"os"
 	"path/filepath"
+	"strings"

 	"github.com/leonelquinteros/gotext"
 	"github.com/urfave/cli/v2"
@ -41,6 +43,8 @@ func RepoCmd() *cli.Command {
 			RemoveRepoCmd(),
 			AddRepoCmd(),
 			SetRepoRefCmd(),
+			RepoMirrorCmd(),
+			SetUrlCmd(),
 		},
 	}
 }
@ -51,6 +55,21 @@ func RemoveRepoCmd() *cli.Command {
 		Usage:     gotext.Get("Remove an existing repository"),
 		Aliases:   []string{"rm"},
 		ArgsUsage: gotext.Get("<name>"),
+		BashComplete: func(c *cli.Context) {
+			if c.NArg() == 0 {
+				// Get repo names from config
+				ctx := c.Context
+				deps, err := appbuilder.New(ctx).WithConfig().Build()
+				if err != nil {
+					return
+				}
+				defer deps.Defer()
+
+				for _, repo := range deps.Cfg.Repos() {
+					fmt.Println(repo.Name)
+				}
+			}
+		},
 		Action: utils.RootNeededAction(func(c *cli.Context) error {
 			if c.Args().Len() < 1 {
 				return cliutils.FormatCliExit("missing args", nil)
@ -89,7 +108,7 @@ func RemoveRepoCmd() *cli.Command {
 			if err != nil {
 				return cliutils.FormatCliExit(gotext.Get("Error removing repo directory"), err)
 			}
-			err = cfg.SaveUserConfig()
+			err = cfg.System.Save()
 			if err != nil {
 				return cliutils.FormatCliExit(gotext.Get("Error saving config"), err)
 			}
@ -156,7 +175,7 @@ func AddRepoCmd() *cli.Command {
 			})
 			cfg.SetRepos(reposSlice)

-			err = cfg.SaveUserConfig()
+			err = cfg.System.Save()
 			if err != nil {
 				return cliutils.FormatCliExit(gotext.Get("Error saving config"), err)
 			}
@ -186,6 +205,21 @@ func SetRepoRefCmd() *cli.Command {
 		Name:      "set-ref",
 		Usage:     gotext.Get("Set the reference of the repository"),
 		ArgsUsage: gotext.Get("<name> <ref>"),
+		BashComplete: func(c *cli.Context) {
+			if c.NArg() == 0 {
+				// Get repo names from config
+				ctx := c.Context
+				deps, err := appbuilder.New(ctx).WithConfig().Build()
+				if err != nil {
+					return
+				}
+				defer deps.Defer()
+
+				for _, repo := range deps.Cfg.Repos() {
+					fmt.Println(repo.Name)
+				}
+			}
+		},
 		Action: utils.RootNeededAction(func(c *cli.Context) error {
 			if c.Args().Len() < 2 {
 				return cliutils.FormatCliExit("missing args", nil)
@ -214,7 +248,7 @@ func SetRepoRefCmd() *cli.Command {
 				newRepos = append(newRepos, repo)
 			}
 			deps.Cfg.SetRepos(newRepos)
-			err = deps.Cfg.SaveUserConfig()
+			err = deps.Cfg.System.Save()
 			if err != nil {
 				return cliutils.FormatCliExit(gotext.Get("Error saving config"), err)
 			}
@ -229,6 +263,328 @@ func SetRepoRefCmd() *cli.Command {
 	}
 }

+func SetUrlCmd() *cli.Command {
+	return &cli.Command{
+		Name:      "set-url",
+		Usage:     gotext.Get("Set the main url of the repository"),
+		ArgsUsage: gotext.Get("<name> <url>"),
+		BashComplete: func(c *cli.Context) {
+			if c.NArg() == 0 {
+				// Get repo names from config
+				ctx := c.Context
+				deps, err := appbuilder.New(ctx).WithConfig().Build()
+				if err != nil {
+					return
+				}
+				defer deps.Defer()
+
+				for _, repo := range deps.Cfg.Repos() {
+					fmt.Println(repo.Name)
+				}
+			}
+		},
+		Action: utils.RootNeededAction(func(c *cli.Context) error {
+			if c.Args().Len() < 2 {
+				return cliutils.FormatCliExit("missing args", nil)
+			}
+
+			name := c.Args().Get(0)
+			repoUrl := c.Args().Get(1)
+
+			deps, err := appbuilder.
+				New(c.Context).
+				WithConfig().
+				WithDB().
+				WithReposNoPull().
+				Build()
+			if err != nil {
+				return err
+			}
+			defer deps.Defer()
+
+			repos := deps.Cfg.Repos()
+			newRepos := []types.Repo{}
+			for _, repo := range repos {
+				if repo.Name == name {
+					repo.URL = repoUrl
+				}
+				newRepos = append(newRepos, repo)
+			}
+			deps.Cfg.SetRepos(newRepos)
+			err = deps.Cfg.System.Save()
+			if err != nil {
+				return cliutils.FormatCliExit(gotext.Get("Error saving config"), err)
+			}
+
+			err = deps.Repos.Pull(c.Context, newRepos)
+			if err != nil {
+				return cliutils.FormatCliExit(gotext.Get("Error pulling repositories"), err)
+			}
+
+			return nil
+		}),
+	}
+}
+
+func RepoMirrorCmd() *cli.Command {
+	return &cli.Command{
+		Name:  "mirror",
+		Usage: gotext.Get("Manage mirrors of repos"),
+		Subcommands: []*cli.Command{
+			AddMirror(),
+			RemoveMirror(),
+			ClearMirrors(),
+		},
+	}
+}
+
+func AddMirror() *cli.Command {
+	return &cli.Command{
+		Name:      "add",
+		Usage:     gotext.Get("Add a mirror URL to repository"),
+		ArgsUsage: gotext.Get("<name> <url>"),
+		BashComplete: func(c *cli.Context) {
+			if c.NArg() == 0 {
+				ctx := c.Context
+				deps, err := appbuilder.New(ctx).WithConfig().Build()
+				if err != nil {
+					return
+				}
+				defer deps.Defer()
+
+				for _, repo := range deps.Cfg.Repos() {
+					fmt.Println(repo.Name)
+				}
+			}
+		},
+		Action: utils.RootNeededAction(func(c *cli.Context) error {
+			if c.Args().Len() < 2 {
+				return cliutils.FormatCliExit("missing args", nil)
+			}
+
+			name := c.Args().Get(0)
+			url := c.Args().Get(1)
+
+			deps, err := appbuilder.
+				New(c.Context).
+				WithConfig().
+				WithDB().
+				WithReposNoPull().
+				Build()
+			if err != nil {
+				return err
+			}
+			defer deps.Defer()
+
+			repos := deps.Cfg.Repos()
+			for i, repo := range repos {
+				if repo.Name == name {
+					repos[i].Mirrors = append(repos[i].Mirrors, url)
+					break
+				}
+			}
+			deps.Cfg.SetRepos(repos)
+			err = deps.Cfg.System.Save()
+			if err != nil {
+				return cliutils.FormatCliExit(gotext.Get("Error saving config"), err)
+			}
+
+			return nil
+		}),
+	}
+}
+
+func RemoveMirror() *cli.Command {
+	return &cli.Command{
+		Name:      "remove",
+		Aliases:   []string{"rm"},
+		Usage:     gotext.Get("Remove mirror from the repository"),
+		ArgsUsage: gotext.Get("<name> <url>"),
+		BashComplete: func(c *cli.Context) {
+			ctx := c.Context
+			deps, err := appbuilder.New(ctx).WithConfig().Build()
+			if err != nil {
+				return
+			}
+			defer deps.Defer()
+
+			if c.NArg() == 0 {
+				for _, repo := range deps.Cfg.Repos() {
+					fmt.Println(repo.Name)
+				}
+			}
+		},
+		Flags: []cli.Flag{
+			&cli.BoolFlag{
+				Name:  "ignore-missing",
+				Usage: gotext.Get("Ignore if mirror does not exist"),
+			},
+			&cli.BoolFlag{
+				Name:    "partial",
+				Aliases: []string{"p"},
+				Usage:   gotext.Get("Match partial URL (e.g., github.com instead of full URL)"),
+			},
+		},
+		Action: utils.RootNeededAction(func(c *cli.Context) error {
+			if c.Args().Len() < 2 {
+				return cliutils.FormatCliExit("missing args", nil)
+			}
+
+			name := c.Args().Get(0)
+			urlToRemove := c.Args().Get(1)
+			ignoreMissing := c.Bool("ignore-missing")
+			partialMatch := c.Bool("partial")
+
+			deps, err := appbuilder.
+				New(c.Context).
+				WithConfig().
+				WithDB().
+				WithReposNoPull().
+				Build()
+			if err != nil {
+				return err
+			}
+			defer deps.Defer()
+
+			reposSlice := deps.Cfg.Repos()
+			repoIndex := -1
+			urlIndicesToRemove := []int{}
+
+			// Находим репозиторий
+			for i, repo := range reposSlice {
+				if repo.Name == name {
+					repoIndex = i
+					break
+				}
+			}
+
+			if repoIndex == -1 {
+				if ignoreMissing {
+					return nil // Тихо завершаем, если репозиторий не найден
+				}
+				return cliutils.FormatCliExit(gotext.Get("Repo \"%s\" does not exist", name), nil)
+			}
+
+			// Ищем зеркала для удаления
+			repo := reposSlice[repoIndex]
+			for j, mirror := range repo.Mirrors {
+				var match bool
+				if partialMatch {
+					// Частичное совпадение - проверяем, содержит ли зеркало указанную строку
+					match = strings.Contains(mirror, urlToRemove)
+				} else {
+					// Точное совпадение
+					match = mirror == urlToRemove
+				}
+
+				if match {
+					urlIndicesToRemove = append(urlIndicesToRemove, j)
+				}
+			}
+
+			if len(urlIndicesToRemove) == 0 {
+				if ignoreMissing {
+					return nil
+				}
+				if partialMatch {
+					return cliutils.FormatCliExit(gotext.Get("No mirrors containing \"%s\" found in repo \"%s\"", urlToRemove, name), nil)
+				} else {
+					return cliutils.FormatCliExit(gotext.Get("URL \"%s\" does not exist in repo \"%s\"", urlToRemove, name), nil)
+				}
+			}
+
+			for i := len(urlIndicesToRemove) - 1; i >= 0; i-- {
+				urlIndex := urlIndicesToRemove[i]
+				reposSlice[repoIndex].Mirrors = slices.Delete(reposSlice[repoIndex].Mirrors, urlIndex, urlIndex+1)
+			}
+
+			deps.Cfg.SetRepos(reposSlice)
+			err = deps.Cfg.System.Save()
+			if err != nil {
+				return cliutils.FormatCliExit(gotext.Get("Error saving config"), err)
+			}
+
+			if len(urlIndicesToRemove) > 1 {
+				fmt.Println(gotext.Get("Removed %d mirrors from repo \"%s\"\n", len(urlIndicesToRemove), name))
+			}
+
+			return nil
+		}),
+	}
+}
+
+func ClearMirrors() *cli.Command {
+	return &cli.Command{
+		Name:      "clear",
+		Aliases:   []string{"rm-all"},
+		Usage:     gotext.Get("Remove all mirrors from the repository"),
+		ArgsUsage: gotext.Get("<name>"),
+		BashComplete: func(c *cli.Context) {
+			if c.NArg() == 0 {
+				// Get repo names from config
+				ctx := c.Context
+				deps, err := appbuilder.New(ctx).WithConfig().Build()
+				if err != nil {
+					return
+				}
+				defer deps.Defer()
+
+				for _, repo := range deps.Cfg.Repos() {
+					fmt.Println(repo.Name)
+				}
+			}
+		},
+		Action: utils.RootNeededAction(func(c *cli.Context) error {
+			if c.Args().Len() < 1 {
+				return cliutils.FormatCliExit("missing args", nil)
+			}
+
+			name := c.Args().Get(0)
+
+			deps, err := appbuilder.
+				New(c.Context).
+				WithConfig().
+				WithDB().
+				WithReposNoPull().
+				Build()
+			if err != nil {
+				return err
+			}
+			defer deps.Defer()
+
+			reposSlice := deps.Cfg.Repos()
+			repoIndex := -1
+			urlIndicesToRemove := []int{}
+
+			// Находим репозиторий
+			for i, repo := range reposSlice {
+				if repo.Name == name {
+					repoIndex = i
+					break
+				}
+			}
+
+			if repoIndex == -1 {
+				return cliutils.FormatCliExit(gotext.Get("Repo \"%s\" does not exist", name), nil)
+			}
+
+			reposSlice[repoIndex].Mirrors = []string{}
+
+			deps.Cfg.SetRepos(reposSlice)
+			err = deps.Cfg.System.Save()
+			if err != nil {
+				return cliutils.FormatCliExit(gotext.Get("Error saving config"), err)
+			}
+
+			if len(urlIndicesToRemove) > 1 {
+				fmt.Println(gotext.Get("Removed %d mirrors from repo \"%s\"\n", len(urlIndicesToRemove), name))
+			}
+
+			return nil
+		}),
+	}
+}
+
 // TODO: remove
 //
 // Deprecated: use "alr repo add"
Author	SHA1	Message	Date
Maxim Slipenko	7060e4f551	chore: refactor Makefile with build and install improvements All checks were successful Pre-commit / pre-commit (pull_request) Successful in 5m29s Details Update alr-git / changelog (push) Successful in 23s Details - fix typo in INSTALLED_BIN variable name - add GENERATE flag to optionally skip go generate - add CREATE_SYSTEM_RESOURCES flag for user/dir creation control - make GIT_VERSION optional with ?= operator - add informative messages for skipped operations	2025-06-30 08:27:14 +03:00
Maxim Slipenko	d77ca4c384	feat: config command All checks were successful Pre-commit / pre-commit (pull_request) Successful in 5m5s Details Update alr-git / changelog (push) Successful in 27s Details	2025-06-29 21:26:00 +03:00
Maxim Slipenko	6355f25089	feat: add ability to remove build_deps All checks were successful Pre-commit / pre-commit (pull_request) Successful in 5m36s Details Update alr-git / changelog (push) Successful in 26s Details	2025-06-28 20:19:07 +03:00
Maxim Slipenko	a83561b6a5	fix: implement dirlfs to ignore symlinks All checks were successful Pre-commit / pre-commit (pull_request) Successful in 5m16s Details Update alr-git / changelog (push) Successful in 25s Details	2025-06-28 01:01:06 +03:00
Maxim Slipenko	4b06809a39	fix: quote files-find output and fail on pattern not exists (#123 ) All checks were successful Update alr-git / changelog (push) Successful in 24s Details closes #122 closes #121 Reviewed-on: #123 Co-authored-by: Maxim Slipenko <no-reply@maxim.slipenko.com> Co-committed-by: Maxim Slipenko <no-reply@maxim.slipenko.com>	2025-06-27 20:22:10 +00:00
Maxim Slipenko	401c41160c	chore: pass all options to download All checks were successful Pre-commit / pre-commit (pull_request) Successful in 5m26s Details Update alr-git / changelog (push) Successful in 24s Details	2025-06-25 19:52:54 +03:00
Maxim Slipenko	5e1eeabd04	chore: simplify dlcache initialization All checks were successful Pre-commit / pre-commit (pull_request) Successful in 5m31s Details Update alr-git / changelog (push) Successful in 23s Details	2025-06-25 19:18:11 +03:00
Maxim Slipenko	db19133254	fix: correct handling opts.PostprocDisabled All checks were successful Pre-commit / pre-commit (pull_request) Successful in 5m35s Details Update alr-git / changelog (push) Successful in 29s Details	2025-06-25 08:07:58 +03:00
Maxim Slipenko	e8202060d8	chore: remove debug slog.Warn All checks were successful Pre-commit / pre-commit (pull_request) Successful in 6m0s Details Update alr-git / changelog (push) Successful in 26s Details Create Release / changelog (push) Successful in 2m54s Details	2025-06-22 17:27:57 +03:00
Maxim Slipenko	c4a92c67d4	fix parsing overrides All checks were successful Pre-commit / pre-commit (pull_request) Successful in 6m34s Details Update alr-git / changelog (push) Successful in 29s Details	2025-06-22 12:44:21 +03:00
Maxim Slipenko	85878f69d3	feat: add checksum for torrent downloader All checks were successful Pre-commit / pre-commit (pull_request) Successful in 6m0s Details Update alr-git / changelog (push) Successful in 28s Details	2025-06-20 20:12:43 +03:00
Maxim Slipenko	6bccce1db4	feat: add checksum for git downloader	2025-06-20 19:35:22 +03:00
Maxim Slipenko	b5474b1eb4	ci: disable building alr-bin All checks were successful Pre-commit / pre-commit (pull_request) Successful in 7m5s Details Update alr-git / changelog (push) Successful in 30s Details	2025-06-20 09:21:03 +03:00
Maxim Slipenko	51fdea781b	fix: correct pull for multiple repos	2025-06-20 09:08:34 +03:00
Maxim Slipenko	4c1f2ea90f	feat: support mirrors All checks were successful Pre-commit / pre-commit (pull_request) Successful in 5m45s Details Update alr-git / changelog (push) Successful in 25s Details	2025-06-19 19:00:08 +03:00
Maxim Slipenko	7fa7f8ba82	security: update vulnerable packages All checks were successful Pre-commit / pre-commit (pull_request) Successful in 6m11s Details Update alr-git / changelog (push) Successful in 29s Details Vulnerabilities detected by Trivy scan: - github.com/cloudflare/circl (GHSA-2x5j-vhc8-9cwm)	2025-06-19 12:10:31 +03:00
Maxim Slipenko	25d001c1c9	fix: add find-files (#109 ) All checks were successful Update alr-git / changelog (push) Successful in 31s Details closes #96 Reviewed-on: #109 Co-authored-by: Maxim Slipenko <no-reply@maxim.slipenko.com> Co-committed-by: Maxim Slipenko <no-reply@maxim.slipenko.com>	2025-06-19 09:03:37 +00:00
Maxim Slipenko	f86b3003b1	fix: add symlink handling in createFirejailedBinary (#108 ) All checks were successful Update alr-git / changelog (push) Successful in 30s Details closes #107 Reviewed-on: #108 Co-authored-by: Maxim Slipenko <no-reply@maxim.slipenko.com> Co-committed-by: Maxim Slipenko <no-reply@maxim.slipenko.com>	2025-06-17 18:56:19 +00:00