diff --git a/devices/mini-pc.nix b/devices/mini-pc.nix index bbbd731..7e828a1 100755 --- a/devices/mini-pc.nix +++ b/devices/mini-pc.nix @@ -16,6 +16,7 @@ let ./hardware/logitech.nix self.nixosModules.default + self.nixosModules.server.ai self.nixosModules.software.wine self.nixosModules.software.ai self.nixosModules.software.beets diff --git a/devices/server.nix b/devices/server.nix index 6e6a8ff..5bd5ae6 100755 --- a/devices/server.nix +++ b/devices/server.nix @@ -17,7 +17,6 @@ let self.nixosModules.default self.nixosModules.server.immich - self.nixosModules.server.ai self.nixosModules.server.nextcloud self.nixosModules.server.nginx self.nixosModules.software.beets diff --git a/flake.lock b/flake.lock index 5fd8e7c..c4da456 100644 --- a/flake.lock +++ b/flake.lock @@ -7,14 +7,15 @@ ], "nixpkgs": [ "nixpkgs" - ] + ], + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1753716429, - "narHash": "sha256-R0985jNXFQJUU83GgwYJv+lVYPrPlDuLIJ4ttsvTxgA=", + "lastModified": 1753980999, + "narHash": "sha256-ZRAHKUpth0uETeeoq9urCZgwvofHwxIuwsxqPWxvrpw=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "003a7ac35994c94d33225e3c2a810a2650c74a79", + "rev": "3699a592400f13aa5d9b025f120bc512b89d341f", "type": "github" }, "original": { @@ -160,11 +161,11 @@ ] }, "locked": { - "lastModified": 1753732062, - "narHash": "sha256-vojVM0SgFP8crFh1LDDXkzaI9/er/1cuRfbNPhfBHyc=", + "lastModified": 1753983724, + "narHash": "sha256-2vlAOJv4lBrE+P1uOGhZ1symyjXTRdn/mz0tZ6faQcg=", "owner": "nix-community", "repo": "home-manager", - "rev": "f49e872f55e36e67ebcb906ff65f86c7a1538f7c", + "rev": "7035020a507ed616e2b20c61491ae3eaa8e5462c", "type": "github" }, "original": { @@ -196,14 +197,14 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1753582293, - "narHash": "sha256-CimzlksXOfuPcLr4ye/s4hwZhHk98f0gnXB6Dq9RhZo=", + "lastModified": 1753841490, + "narHash": "sha256-rcaiQ9e/glv3s5aSYB3/y3T7cs9rY+G0TOixQZQVADA=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "ceb9d44f09b0db02332873247a50210a486959ff", + "rev": "1b9569f6474bfc5b7257a8a4ba02d1f26e75f489", "type": "github" }, "original": { @@ -234,11 +235,11 @@ }, "nixos": { "locked": { - "lastModified": 1753549186, - "narHash": "sha256-Znl7rzuxKg/Mdm6AhimcKynM7V3YeNDIcLjBuoBcmNs=", + "lastModified": 1753694789, + "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17f6bd177404d6d43017595c5264756764444ab8", + "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", "type": "github" }, "original": { @@ -281,11 +282,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753432016, - "narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=", + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6027c30c8e9810896b92429f0092f624f7b1aace", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", "type": "github" }, "original": { @@ -359,11 +360,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1753489912, - "narHash": "sha256-uDCFHeXdRIgJpYmtcUxGEsZ+hYlLPBhR83fdU+vbC1s=", + "lastModified": 1753749649, + "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "13e8d35b7d6028b7198f8186bc0347c6abaa2701", + "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", "type": "github" }, "original": { @@ -375,11 +376,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1753432016, - "narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=", + "lastModified": 1753934836, + "narHash": "sha256-G06FmIBj0I5bMW1Q8hAEIl5N7IHMK7+Ta4KA+BmneDA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6027c30c8e9810896b92429f0092f624f7b1aace", + "rev": "8679b16e11becd487b45d568358ddf9d5640d860", "type": "github" }, "original": { @@ -421,6 +422,22 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1753934836, + "narHash": "sha256-G06FmIBj0I5bMW1Q8hAEIl5N7IHMK7+Ta4KA+BmneDA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8679b16e11becd487b45d568358ddf9d5640d860", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": "flake-parts_3", @@ -429,11 +446,11 @@ ] }, "locked": { - "lastModified": 1753734563, - "narHash": "sha256-ehs5EYvu7E+erg0FduKPtGiQTasmUTKBB7lktA5vHbo=", + "lastModified": 1754038912, + "narHash": "sha256-b6BOg7d9lRDCrjy/OxAGwiHUBltxIP65hUjUebprBFY=", "owner": "nix-community", "repo": "NUR", - "rev": "8f748955136023d5aae38adf6d4fc0588c3f20b0", + "rev": "dfb7cbaff97f38cf48b338cf621208a3d967deb2", "type": "github" }, "original": { @@ -500,7 +517,7 @@ "nixos": "nixos", "nixos-facter-modules": "nixos-facter-modules", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-fingerprint": "nixpkgs-fingerprint", "nixpkgs-last-unstable": "nixpkgs-last-unstable", "nixpkgs-stable": "nixpkgs-stable", @@ -515,6 +532,24 @@ "zeroq-credentials": "zeroq-credentials" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1753757591, + "narHash": "sha256-3okLvry8fRWZhJZP75pPC9P6U1dcu84VOCPhPLXYozI=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "b372cf71b4125d420d7648cbd898ab8f5c355be2", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "sops-nix": { "inputs": { "nixpkgs": [ diff --git a/modules/server/ai.nix b/modules/server/ai.nix index a6ee6f0..2fce599 100755 --- a/modules/server/ai.nix +++ b/modules/server/ai.nix @@ -6,13 +6,16 @@ ... }: let - unfree = import inputs.nixpkgs-webui { system = "x86_64-linux"; config.allowUnfree = true; }; # temp + unfree = import inputs.nixpkgs-webui { + system = "x86_64-linux"; + config.allowUnfree = true; + }; # temp in { services = { open-webui = { - enable = false; - package = unfree.open-webui; + enable = true; + #package = unfree.open-webui; host = "0.0.0.0"; port = 11111; openFirewall = true; @@ -20,7 +23,7 @@ in ANONYMIZED_TELEMETRY = "False"; DO_NOT_TRACK = "True"; SCARF_NO_ANALYTICS = "True"; - OPENAI_API_BASE_URL = "http://192.168.1.100:1234/v1"; + OPENAI_API_BASE_URL = "http://localhost:1234/v1"; #OLLAMA_API_BASE_URL = "http://127.0.0.1:1234"; #WEBUI_AUTH = "False"; # Disable authentication }; diff --git a/modules/vds/cloudflared.nix b/modules/vds/cloudflared.nix index 5225195..3e71ec9 100755 --- a/modules/vds/cloudflared.nix +++ b/modules/vds/cloudflared.nix @@ -22,7 +22,7 @@ service = "http://sapphira.latxa-platy.ts.net:10000"; }; "llm.zeroq.ru" = { - service = "http://sapphira.latxa-platy.ts.net:11111"; + service = "http://atoridu.latxa-platy.ts.net:11111"; }; }; default = "http_status:404"; diff --git a/newflake.lock b/oldflake.lock similarity index 87% rename from newflake.lock rename to oldflake.lock index 3bb7adb..5fd8e7c 100644 --- a/newflake.lock +++ b/oldflake.lock @@ -7,15 +7,14 @@ ], "nixpkgs": [ "nixpkgs" - ], - "rust-overlay": "rust-overlay" + ] }, "locked": { - "lastModified": 1753937627, - "narHash": "sha256-PuDKpirp90sRTYibiiw/iANh8LS7faXsxb5sZmJ2RUo=", + "lastModified": 1753716429, + "narHash": "sha256-R0985jNXFQJUU83GgwYJv+lVYPrPlDuLIJ4ttsvTxgA=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "338986c102c675652e160716fa4907dff01c9cf9", + "rev": "003a7ac35994c94d33225e3c2a810a2650c74a79", "type": "github" }, "original": { @@ -161,11 +160,11 @@ ] }, "locked": { - "lastModified": 1753943136, - "narHash": "sha256-eiEE5SabVcIlGSTRcRyBjmJMaYAV95SJnjy8YSsVeW4=", + "lastModified": 1753732062, + "narHash": "sha256-vojVM0SgFP8crFh1LDDXkzaI9/er/1cuRfbNPhfBHyc=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd82507edd860c453471c46957cbbe3c9fd01b5c", + "rev": "f49e872f55e36e67ebcb906ff65f86c7a1538f7c", "type": "github" }, "original": { @@ -197,14 +196,14 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1753841490, - "narHash": "sha256-rcaiQ9e/glv3s5aSYB3/y3T7cs9rY+G0TOixQZQVADA=", + "lastModified": 1753582293, + "narHash": "sha256-CimzlksXOfuPcLr4ye/s4hwZhHk98f0gnXB6Dq9RhZo=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "1b9569f6474bfc5b7257a8a4ba02d1f26e75f489", + "rev": "ceb9d44f09b0db02332873247a50210a486959ff", "type": "github" }, "original": { @@ -235,11 +234,11 @@ }, "nixos": { "locked": { - "lastModified": 1753694789, - "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", + "lastModified": 1753549186, + "narHash": "sha256-Znl7rzuxKg/Mdm6AhimcKynM7V3YeNDIcLjBuoBcmNs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", + "rev": "17f6bd177404d6d43017595c5264756764444ab8", "type": "github" }, "original": { @@ -282,11 +281,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744536153, - "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", + "lastModified": 1753432016, + "narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", + "rev": "6027c30c8e9810896b92429f0092f624f7b1aace", "type": "github" }, "original": { @@ -360,11 +359,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1753749649, - "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", + "lastModified": 1753489912, + "narHash": "sha256-uDCFHeXdRIgJpYmtcUxGEsZ+hYlLPBhR83fdU+vbC1s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", + "rev": "13e8d35b7d6028b7198f8186bc0347c6abaa2701", "type": "github" }, "original": { @@ -376,11 +375,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1753844155, - "narHash": "sha256-w81jpZeM3AtYlTKIhT05p3IqvJRIHZPyp0Acgb6hXWc=", + "lastModified": 1753432016, + "narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e44b8dc0882d66e2627a8ff252b04a22f4a629fd", + "rev": "6027c30c8e9810896b92429f0092f624f7b1aace", "type": "github" }, "original": { @@ -390,6 +389,22 @@ "type": "github" } }, + "nixpkgs-webui": { + "locked": { + "lastModified": 1748501411, + "narHash": "sha256-q70mzUJkTD9TnG0R98t4LH6BtiCNV+NfM/QAUbseGGo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "72353fc1fa61189fb76133d50c519e871c858c39", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "72353fc1fa61189fb76133d50c519e871c858c39", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1753432016, @@ -406,22 +421,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1753844155, - "narHash": "sha256-w81jpZeM3AtYlTKIhT05p3IqvJRIHZPyp0Acgb6hXWc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e44b8dc0882d66e2627a8ff252b04a22f4a629fd", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "inputs": { "flake-parts": "flake-parts_3", @@ -430,11 +429,11 @@ ] }, "locked": { - "lastModified": 1753952399, - "narHash": "sha256-hDLcvVZPma31l4UKiFqWFv16TYJ/bLqneQftr4Yr75Q=", + "lastModified": 1753734563, + "narHash": "sha256-ehs5EYvu7E+erg0FduKPtGiQTasmUTKBB7lktA5vHbo=", "owner": "nix-community", "repo": "NUR", - "rev": "d190f2fc76a5817a4665865df8259912c92d18c2", + "rev": "8f748955136023d5aae38adf6d4fc0588c3f20b0", "type": "github" }, "original": { @@ -501,11 +500,12 @@ "nixos": "nixos", "nixos-facter-modules": "nixos-facter-modules", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-fingerprint": "nixpkgs-fingerprint", "nixpkgs-last-unstable": "nixpkgs-last-unstable", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs-webui": "nixpkgs-webui", "nur": "nur", "nypkgs": "nypkgs", "plasma-manager": "plasma-manager", @@ -515,24 +515,6 @@ "zeroq-credentials": "zeroq-credentials" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1753757591, - "narHash": "sha256-3okLvry8fRWZhJZP75pPC9P6U1dcu84VOCPhPLXYozI=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "b372cf71b4125d420d7648cbd898ab8f5c355be2", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": [