Skip to content

Commit b0d770e

Browse files
drupoldrupol
committed
refactor: use unify framework
1 parent 5d00575 commit b0d770e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+3939
-2579
lines changed

‎_to_migrate/hosts/lw196205087/home.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
enable = true;
4141
nix-direnv.enable = true;
4242
};
43-
eza = {
43+
lsd = {
4444
enable = true;
4545
};
4646
firefox = {
@@ -104,9 +104,9 @@
104104
shellAliases = {
105105
".." = "cd ..";
106106
"..." = "cd ../..";
107-
ll = "eza -lha";
107+
ll = "lsd -lha";
108108
cat = "bat";
109-
ls = "eza";
109+
ls = "lsd";
110110
grep = "rg";
111111
};
112112
};

‎flake.nix‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@
5353
url = "github:nix-community/disko";
5454
inputs.nixpkgs.follows = "nixpkgs";
5555
};
56+
unify = {
57+
url = "git+https://codeberg.org/quasigod/unify";
58+
inputs.nixpkgs.follows = "nixpkgs";
59+
inputs.home-manager.follows = "home-manager";
60+
};
5661

5762
# This is a private repository.
5863
# If you want to clone this project, it won't work unless you have access to it.

‎modules/ai/litellm/default.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
flake.modules.nixos.ai = {
2+
unify.modules.ai.nixos = {
33
services = {
44
litellm = {
55
enable = true;

‎modules/ai/ollama.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
flake.modules.nixos.ai = {
2+
unify.modules.ai.nixos = {
33
services = {
44
ollama = {
55
enable = true;

‎modules/ai/open-webui.nix‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,40 @@
44
config.allowUnfree = true;
55
};
66

7-
nixos.ai = {
8-
services = {
9-
open-webui = {
10-
enable = true;
11-
host = "0.0.0.0";
12-
port = 8080;
13-
environment = {
14-
CONTENT_EXTRACTION_ENGINE = "tika";
15-
DEVICE_TYPE = "cpu";
16-
ENABLE_OLLAMA_API = "True";
17-
ENABLE_OPENAI_API = "True";
18-
ENABLE_RAG_HYBRID_SEARCH = "True";
19-
ENABLE_RAG_WEB_LOADER_SSL_VERIFICATION = "False";
20-
ENABLE_RAG_WEB_SEARCH = "True";
21-
OLLAMA_BASE_URL = "http://127.0.0.1:11434";
22-
OLLAMA_API_BASE_URL = "http://127.0.0.1:11434/api";
23-
OPENAI_API_BASE_URL = "http://127.0.0.1:8888/v1";
24-
OPENAI_API_KEY = "";
25-
PDF_EXTRACT_IMAGES = "True";
26-
RAG_EMBEDDING_ENGINE = "ollama";
27-
RAG_EMBEDDING_MODEL = "embeddinggemma:latest";
28-
RAG_EMBEDDING_MODEL_AUTO_UPDATE = "True";
29-
RAG_FILE_MAX_COUNT = "2";
30-
RAG_RERANKING_MODEL = "BAAI/bge-reranker-v2-m3";
31-
RAG_TEXT_SPLITTER = "token";
32-
RAG_WEB_SEARCH_ENGINE = "searxng";
33-
RAG_WEB_SEARCH_RESULT_COUNT = "5";
34-
RESET_CONFIG_ON_START = "True";
35-
SEARXNG_QUERY_URL = "http://apollo:3002/search?q=<query>";
36-
TIKA_SERVER_URL = "http://apollo:9998/";
37-
WEBUI_AUTH = "False";
38-
WEBUI_NAME = "LLM @ Home";
39-
};
7+
unify.modules.ai.nixos = {
8+
services = {
9+
open-webui = {
10+
enable = true;
11+
host = "0.0.0.0";
12+
port = 8080;
13+
environment = {
14+
CONTENT_EXTRACTION_ENGINE = "tika";
15+
DEVICE_TYPE = "cpu";
16+
ENABLE_OLLAMA_API = "True";
17+
ENABLE_OPENAI_API = "True";
18+
ENABLE_RAG_HYBRID_SEARCH = "True";
19+
ENABLE_RAG_WEB_LOADER_SSL_VERIFICATION = "False";
20+
ENABLE_RAG_WEB_SEARCH = "True";
21+
OLLAMA_BASE_URL = "http://127.0.0.1:11434";
22+
OLLAMA_API_BASE_URL = "http://127.0.0.1:11434/api";
23+
OPENAI_API_BASE_URL = "http://127.0.0.1:8888/v1";
24+
OPENAI_API_KEY = "";
25+
PDF_EXTRACT_IMAGES = "True";
26+
RAG_EMBEDDING_ENGINE = "ollama";
27+
RAG_EMBEDDING_MODEL = "embeddinggemma:latest";
28+
RAG_EMBEDDING_MODEL_AUTO_UPDATE = "True";
29+
RAG_FILE_MAX_COUNT = "2";
30+
RAG_RERANKING_MODEL = "BAAI/bge-reranker-v2-m3";
31+
RAG_TEXT_SPLITTER = "token";
32+
RAG_WEB_SEARCH_ENGINE = "searxng";
33+
RAG_WEB_SEARCH_RESULT_COUNT = "5";
34+
RESET_CONFIG_ON_START = "True";
35+
SEARXNG_QUERY_URL = "http://apollo:3002/search?q=<query>";
36+
TIKA_SERVER_URL = "http://apollo:9998/";
37+
WEBUI_AUTH = "False";
38+
WEBUI_NAME = "LLM @ Home";
4039
};
40+
};
4141

4242
caddy = {
4343
enable = true;

‎modules/base/accessibility/default.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
flake.modules.nixos.base = {
2+
unify.modules.base.nixos = {
33
services.orca.enable = false;
44
services.speechd.enable = false;
55
};

‎modules/base/admin/nh.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
inputs.make-shell.flakeModules.default
88
];
99

10-
flake.modules.nixos.base = {
10+
unify.modules.base.nixos = {
1111
programs = {
1212
nh = {
1313
enable = true;

‎modules/base/boot/default.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
flake.modules.nixos.base.boot = {
2+
unify.modules.base.nixos.boot = {
33
initrd.systemd.enable = true;
44

55
tmp = {

‎modules/base/boot/kernel.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
flake.modules.nixos.base =
2+
unify.modules.base.nixos =
33
{ pkgs, ... }:
44
{
55
boot.kernelPackages = pkgs.linuxPackages_latest;

‎modules/base/command-not-found.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
flake.modules = {
3-
nixos.base = {
2+
unify.modules.base = {
3+
nixos = {
44
programs.command-not-found.enable = false;
55
};
66

7-
homeManager.base = {
7+
home = {
88
programs.command-not-found.enable = false;
99
};
1010
};

0 commit comments

Comments
 (0)