summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpolwex <polwex@sortug.com>2025-07-27 04:21:58 +0700
committerpolwex <polwex@sortug.com>2025-07-27 04:21:58 +0700
commit9dc29832c4fc17cd93f6eca6c0556277690a0061 (patch)
treef4d43d7ab1f8c8762c67ce58693f414b16a1295f
parent2339fba37290774336fa517a417330e3ff788ba5 (diff)
-rw-r--r--derivations/codex/flake.lock27
-rw-r--r--derivations/codex/flake.nix10
-rw-r--r--derivations/codex/node.nix59
-rw-r--r--derivations/codex/rust.nix (renamed from derivations/codex/default.nix)2
-rw-r--r--derivations/gemini/default.nix7
-rw-r--r--derivations/gemini/flake.lock27
-rw-r--r--derivations/gemini/flake.nix1
-rw-r--r--flake.lock377
-rw-r--r--flake.nix4
-rw-r--r--hosts/cloud/sortug/mail.nix2
-rw-r--r--hosts/editors.nix5
-rw-r--r--hosts/local/master/hardware-configuration.nix19
-rw-r--r--hosts/local/master/hw.nix47
-rw-r--r--hosts/pkgs.nix6
l---------result1
15 files changed, 349 insertions, 245 deletions
diff --git a/derivations/codex/flake.lock b/derivations/codex/flake.lock
new file mode 100644
index 0000000..05b1cf8
--- /dev/null
+++ b/derivations/codex/flake.lock
@@ -0,0 +1,27 @@
+{
+ "nodes": {
+ "nixpkgs": {
+ "locked": {
+ "lastModified": 1752480373,
+ "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "root": {
+ "inputs": {
+ "nixpkgs": "nixpkgs"
+ }
+ }
+ },
+ "root": "root",
+ "version": 7
+}
diff --git a/derivations/codex/flake.nix b/derivations/codex/flake.nix
index 3a0a46f..38ad305 100644
--- a/derivations/codex/flake.nix
+++ b/derivations/codex/flake.nix
@@ -12,8 +12,14 @@
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
in {
- packages.${system}.default = pkgs.callPackage ./default.nix {
- inherit (pkgs) lib buildNpmPackage fetchFromGitHub fetchNpmDeps gitUpdater;
+ packages.${system}.rust = pkgs.callPackage ./rust.nix {
+ inherit (pkgs) lib rustPlatform fetchFromGitHub nix-update-script pkg-config openssl versionCheckHook;
+ };
+ packages.${system}.node = pkgs.callPackage ./node.nix {
+ inherit (pkgs) lib fetchFromGitHub jq makeWrapper;
+ node = pkgs.nodejs_22;
+ pnpm = pkgs.pnpm_10;
+ mkDerivation = pkgs.stdenv.mkDerivation;
};
};
}
diff --git a/derivations/codex/node.nix b/derivations/codex/node.nix
new file mode 100644
index 0000000..7cf50d5
--- /dev/null
+++ b/derivations/codex/node.nix
@@ -0,0 +1,59 @@
+{
+ lib,
+ mkDerivation,
+ fetchFromGitHub,
+ pnpm,
+ node,
+ jq,
+ makeWrapper,
+}:
+mkDerivation (finalAttrs: {
+ pname = "codex-cli";
+ version = "0.8.0";
+ src = fetchFromGitHub {
+ owner = "openai";
+ repo = "codex";
+ rev = "4082246f6aac288a817330b92cfd5573df61f0e7";
+ # tag = "v${finalAttrs.version}";
+ sha256 = "DAenod/w9BydYdYsOnuLj7kCQRcTnZ81tf4MhLUug6c=";
+ };
+ pnpmDeps = pnpm.fetchDeps {
+ inherit (finalAttrs) pname version src;
+ hash = "sha256-otogkSsKJ5j1BY00y4SRhL9pm7CK9nmzVisvGCDIMlU=";
+ };
+ nativeBuildInputs = [
+ node
+ pnpm
+ pnpm.configHook
+ jq
+ makeWrapper
+ ];
+ pnpmInstallFlags = ["--frozen-lockfile"];
+
+ buildPhase = ''
+ runHook preBuild
+ pnpm install --offline --frozen-lockfile
+ pnpm --filter ./codex-cli... run build
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ pkgRoot=$out/lib/node_modules/${final.pname}
+ mkdir -p $pkgRoot
+ cp -R codex-cli/* $pkgRoot/
+
+ path=$(jq -r '.bin.codex' codex-cli/package.json)
+ mkdir -p $out/bin
+ makeWrapper ${node}/bin/node $out/bin/codex --add-flags "$pkgRoot/$path"
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "OpenAI Codex command‑line interface";
+ license = licenses.asl20;
+ homepage = "https://github.com/openai/codex";
+ };
+})
diff --git a/derivations/codex/default.nix b/derivations/codex/rust.nix
index 5a0f366..e07fb79 100644
--- a/derivations/codex/default.nix
+++ b/derivations/codex/rust.nix
@@ -9,7 +9,7 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "codex";
- version = "0.7.0";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "openai";
diff --git a/derivations/gemini/default.nix b/derivations/gemini/default.nix
index ee53130..c1034f4 100644
--- a/derivations/gemini/default.nix
+++ b/derivations/gemini/default.nix
@@ -62,12 +62,13 @@
}:
buildNpmPackage (finalAttrs: {
pname = "gemini-cli";
- version = "0.1.7";
+ version = "0.1.12";
src = fetchFromGitHub {
owner = "google-gemini";
repo = "gemini-cli";
- tag = "v${finalAttrs.version}";
- hash = "sha256-DAenod/w9BydYdYsOnuLj7kCQRcTnZ81tf4MhLUug6c=";
+ rev = "cba272082d15a6b9fb4e21bc27ed1d56fa5b9a56";
+ # tag = "v${finalAttrs.version}";
+ sha256 = "DAenod/w9BydYdYsOnuLj7kCQRcTnZ81tf4MhLUug6c=";
};
npmDeps = fetchNpmDeps {
inherit (finalAttrs) src;
diff --git a/derivations/gemini/flake.lock b/derivations/gemini/flake.lock
new file mode 100644
index 0000000..05b1cf8
--- /dev/null
+++ b/derivations/gemini/flake.lock
@@ -0,0 +1,27 @@
+{
+ "nodes": {
+ "nixpkgs": {
+ "locked": {
+ "lastModified": 1752480373,
+ "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "root": {
+ "inputs": {
+ "nixpkgs": "nixpkgs"
+ }
+ }
+ },
+ "root": "root",
+ "version": 7
+}
diff --git a/derivations/gemini/flake.nix b/derivations/gemini/flake.nix
index 9dd913d..3a0a46f 100644
--- a/derivations/gemini/flake.nix
+++ b/derivations/gemini/flake.nix
@@ -14,7 +14,6 @@
in {
packages.${system}.default = pkgs.callPackage ./default.nix {
inherit (pkgs) lib buildNpmPackage fetchFromGitHub fetchNpmDeps gitUpdater;
- inherit nixpkgs;
};
};
}
diff --git a/flake.lock b/flake.lock
index d63d1d3..de8636a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -113,11 +113,11 @@
},
"crane_2": {
"locked": {
- "lastModified": 1750266157,
- "narHash": "sha256-tL42YoNg9y30u7zAqtoGDNdTyXTi8EALDeCB13FtbQA=",
+ "lastModified": 1752946753,
+ "narHash": "sha256-g5uP3jIj+STUcfTJDKYopxnSijs2agRg13H0SGL5iE4=",
"owner": "ipetkov",
"repo": "crane",
- "rev": "e37c943371b73ed87faf33f7583860f81f1d5a48",
+ "rev": "544d09fecc8c2338542c57f3f742f1a0c8c71e13",
"type": "github"
},
"original": {
@@ -155,14 +155,14 @@
"flake-compat": "flake-compat",
"git-hooks": "git-hooks",
"nix": "nix",
- "nixpkgs": "nixpkgs_2"
+ "nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1752507617,
- "narHash": "sha256-BZVFBb8L11prG0xQE1mOpbAbrzPJhlujj7ecY0yiO0g=",
+ "lastModified": 1753476615,
+ "narHash": "sha256-vkcPVqTlyrkxOQGBUTgBU7bbLZURdKyynQn0lbItX4E=",
"owner": "cachix",
"repo": "devenv",
- "rev": "d26f9cf218d8617168d26f749e02a6d87ea4bc28",
+ "rev": "8a92f0a645f8c6ee1653a492abc0be3556b0202d",
"type": "github"
},
"original": {
@@ -178,11 +178,11 @@
]
},
"locked": {
- "lastModified": 1752541678,
- "narHash": "sha256-dyhGzkld6jPqnT/UfGV2oqe7tYn7hppAqFvF3GZTyXY=",
+ "lastModified": 1753140376,
+ "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=",
"owner": "nix-community",
"repo": "disko",
- "rev": "2bf3421f7fed5c84d9392b62dcb9d76ef09796a7",
+ "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c",
"type": "github"
},
"original": {
@@ -329,11 +329,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
- "lastModified": 1751413152,
- "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
+ "lastModified": 1753121425,
+ "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
+ "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e",
"type": "github"
},
"original": {
@@ -350,11 +350,11 @@
]
},
"locked": {
- "lastModified": 1749398372,
- "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
+ "lastModified": 1751413152,
+ "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
+ "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
"type": "github"
},
"original": {
@@ -507,7 +507,6 @@
"type": "github"
}
},
-<<<<<<< Updated upstream
"flake-utils_7": {
"inputs": {
"systems": "systems_7"
@@ -526,8 +525,23 @@
"type": "github"
}
},
-=======
->>>>>>> Stashed changes
+ "gemini-cli": {
+ "inputs": {
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1753030817,
+ "narHash": "sha256-ypEepJDaIjQx2Ou813++x5c1Kt11DR8vAWITBlmlgKU=",
+ "path": "/home/y/nixconf/derivations/gemini",
+ "type": "path"
+ },
+ "original": {
+ "path": "/home/y/nixconf/derivations/gemini",
+ "type": "path"
+ }
+ },
"git-hooks": {
"inputs": {
"flake-compat": [
@@ -558,7 +572,7 @@
"inputs": {
"flake-compat": "flake-compat_2",
"gitignore": "gitignore_2",
- "nixpkgs": "nixpkgs_3"
+ "nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1750779888,
@@ -711,15 +725,15 @@
},
"helix": {
"inputs": {
- "nixpkgs": "nixpkgs_4",
+ "nixpkgs": "nixpkgs_3",
"rust-overlay": "rust-overlay_2"
},
"locked": {
- "lastModified": 1752426734,
- "narHash": "sha256-a434OTO7gxtAnDE6/1JWSf4in3ed24bEYJb0dUSZipE=",
+ "lastModified": 1753558781,
+ "narHash": "sha256-//vUTRsKB36NDhVKpEX/BYNwKtnFVQqxqn5AjwVNiVY=",
"owner": "helix-editor",
"repo": "helix",
- "rev": "6fd1efd1c29f4c0dbdab3a82d961fd5456e0cb1c",
+ "rev": "9ea190b729f921a3d164323c8d53e645c75be456",
"type": "github"
},
"original": {
@@ -752,7 +766,7 @@
},
"homix": {
"inputs": {
- "nixpkgs": "nixpkgs_5"
+ "nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1720719665,
@@ -785,7 +799,7 @@
},
"kmonad": {
"inputs": {
- "nixpkgs": "nixpkgs_6"
+ "nixpkgs": "nixpkgs_5"
},
"locked": {
"dir": "nix",
@@ -808,16 +822,16 @@
"crane": "crane_2",
"flake-compat": "flake-compat_3",
"flake-parts": "flake-parts_3",
- "nixpkgs": "nixpkgs_7",
+ "nixpkgs": "nixpkgs_6",
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
"rust-overlay": "rust-overlay_3"
},
"locked": {
- "lastModified": 1751381593,
- "narHash": "sha256-js1XwtJpYhvQrrTaVzViybpztkHJVZ63aXOlFAcTENM=",
+ "lastModified": 1753349211,
+ "narHash": "sha256-wGfVht5kOLc9t3GZxEr4IIq5QgHV6nB3w9qqhcVKloo=",
"owner": "nix-community",
"repo": "lanzaboote",
- "rev": "f4eb75540307c2b33521322c04b7fea74e48a66f",
+ "rev": "4775927ef576f6493b79b1d205e42493d6878d47",
"type": "github"
},
"original": {
@@ -832,11 +846,11 @@
"nixpkgs-lib": "nixpkgs-lib_3"
},
"locked": {
- "lastModified": 1752408939,
- "narHash": "sha256-FlX55V+xe3rV025aecfJOoukfzCD9Mfp/nXoQweMldI=",
+ "lastModified": 1753013761,
+ "narHash": "sha256-ggvjKAeIsjwdu6+ECBGieyBgtotD7BrsGX5BirCacYU=",
"owner": "nix-community",
"repo": "lib-aggregate",
- "rev": "134d1f1febcc56bfaff3d0a33cc51a5571b3cb19",
+ "rev": "f7c04e5ad6aa43a0f9698edb0d74b44e88ee99ee",
"type": "github"
},
"original": {
@@ -848,15 +862,15 @@
"microvm": {
"inputs": {
"flake-utils": "flake-utils_3",
- "nixpkgs": "nixpkgs_8",
+ "nixpkgs": "nixpkgs_7",
"spectrum": "spectrum"
},
"locked": {
- "lastModified": 1752278584,
- "narHash": "sha256-QaT8PpCR1IaUMa12ou2MlvNCzYVWgTQfVWJGXyFvY5c=",
+ "lastModified": 1753388547,
+ "narHash": "sha256-zbjlS9sa2BbtE80YA9C9DMXwCADba3NjUROw/7Rpt7Y=",
"owner": "astro",
"repo": "microvm.nix",
- "rev": "f30ae9b9e740116d044935c9c0c68bd1c2ce8432",
+ "rev": "9694139d7c761e857ac9d025f9110a92cd8f7686",
"type": "github"
},
"original": {
@@ -876,7 +890,10 @@
"devenv",
"git-hooks"
],
- "nixpkgs": "nixpkgs",
+ "nixpkgs": [
+ "devenv",
+ "nixpkgs"
+ ],
"nixpkgs-23-11": [
"devenv"
],
@@ -885,11 +902,11 @@
]
},
"locked": {
- "lastModified": 1752251701,
- "narHash": "sha256-fkkkwB7jz+14ZdIHAYCCNypO9EZDCKpj7LEQZhV6QJs=",
+ "lastModified": 1752773918,
+ "narHash": "sha256-dOi/M6yNeuJlj88exI+7k154z+hAhFcuB8tZktiW7rg=",
"owner": "cachix",
"repo": "nix",
- "rev": "54df04f09cb084b9e58529c0ae6f53f0e50f1a19",
+ "rev": "031c3cf42d2e9391eee373507d8c12e0f9606779",
"type": "github"
},
"original": {
@@ -922,14 +939,14 @@
"nix-gaming": {
"inputs": {
"flake-parts": "flake-parts_4",
- "nixpkgs": "nixpkgs_9"
+ "nixpkgs": "nixpkgs_8"
},
"locked": {
- "lastModified": 1752373194,
- "narHash": "sha256-wr42guldY37FVoFllUNgSavfohWKb/ExIySnzBCswDY=",
+ "lastModified": 1753447932,
+ "narHash": "sha256-uKZ2HAJlQK4WUowggB4pVGFFqMVqVTkQaQ2+48/J+pY=",
"owner": "fufexan",
"repo": "nix-gaming",
- "rev": "ad11b470127157e4277a875b0fca4234cca25b78",
+ "rev": "1e3c1bd1461e9296334e039eeb20f7100153e98a",
"type": "github"
},
"original": {
@@ -1034,11 +1051,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1752048960,
- "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=",
+ "lastModified": 1753122741,
+ "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=",
"owner": "nixos",
"repo": "nixos-hardware",
- "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806",
+ "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22",
"type": "github"
},
"original": {
@@ -1059,11 +1076,11 @@
"nixpkgs-25_05": "nixpkgs-25_05"
},
"locked": {
- "lastModified": 1752060039,
- "narHash": "sha256-MqcbN/PgfXOv8S4q6GcmlORd6kJZ3UlFNhzCvLOEe4I=",
+ "lastModified": 1753285640,
+ "narHash": "sha256-ofa021NeHDXAxg5J8mSnn8rHa393PAlD85ZCetP4Qa0=",
"owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver",
- "rev": "80d21ed7a1ab8007597f7cd9adc26ebc98b9611f",
+ "rev": "ce87c8a9771d1a20c3fa3b60113b9b0821627dcb",
"type": "gitlab"
},
"original": {
@@ -1076,7 +1093,7 @@
"inputs": {
"flake-utils": "flake-utils_5",
"nixos-generators": "nixos-generators_2",
- "nixpkgs": "nixpkgs_10",
+ "nixpkgs": "nixpkgs_9",
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
@@ -1096,14 +1113,14 @@
"nixos-wsl": {
"inputs": {
"flake-compat": "flake-compat_5",
- "nixpkgs": "nixpkgs_11"
+ "nixpkgs": "nixpkgs_10"
},
"locked": {
- "lastModified": 1752199438,
- "narHash": "sha256-xSBMmGtq8K4Qv80TMqREmESCAsRLJRHAbFH2T/2Bf1Y=",
+ "lastModified": 1753450337,
+ "narHash": "sha256-l0QLEenVKuU6U2g1wI0zuf9IAm7QpisIbf8wAI6BUX4=",
"owner": "nix-community",
"repo": "NixOS-WSL",
- "rev": "d34d9412556d3a896e294534ccd25f53b6822e80",
+ "rev": "a8dfcd2962f6e788759a75b36ca86b14aa44d8e5",
"type": "github"
},
"original": {
@@ -1115,17 +1132,17 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1747179050,
- "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
+ "lastModified": 1750441195,
+ "narHash": "sha256-yke+pm+MdgRb6c0dPt8MgDhv7fcBbdjmv1ZceNTyzKg=",
+ "owner": "cachix",
+ "repo": "devenv-nixpkgs",
+ "rev": "0ceffe312871b443929ff3006960d29b120dc627",
"type": "github"
},
"original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
+ "owner": "cachix",
+ "ref": "rolling",
+ "repo": "devenv-nixpkgs",
"type": "github"
}
},
@@ -1147,28 +1164,16 @@
},
"nixpkgs-darwin": {
"locked": {
-<<<<<<< Updated upstream
- "lastModified": 1752483536,
- "narHash": "sha256-RaaMPRtewLITsV0JMIgoTSkSR+Wuu/a/I/Za0hiCes8=",
+ "lastModified": 1753473540,
+ "narHash": "sha256-kaG2a9/6iWiRehjLZLToAlM1zFxRf3s+BOYOurPOmK4=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "1156bb3c3d94de7c6a7dc798b42c98bb975f3a75",
-=======
- "lastModified": 1735564410,
- "narHash": "sha256-HB/FA0+1gpSs8+/boEavrGJH+Eq08/R2wWNph1sM1Dg=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "1e7a8f391f1a490460760065fa0630b5520f9cf8",
->>>>>>> Stashed changes
+ "rev": "15c2251b2407166a0d7a211af9966a9fe1406cf0",
"type": "github"
},
"original": {
"owner": "nixos",
-<<<<<<< Updated upstream
"ref": "nixpkgs-25.05-darwin",
-=======
- "ref": "nixpkgs-24.05-darwin",
->>>>>>> Stashed changes
"repo": "nixpkgs",
"type": "github"
}
@@ -1205,11 +1210,11 @@
},
"nixpkgs-lib_3": {
"locked": {
- "lastModified": 1752369545,
+ "lastModified": 1752974445,
"narHash": "sha256-jj/HBJFSapTk4LfeJgNLk2wEE2BO6dgBYVRbXMNOCeM=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
- "rev": "65d21753676aaf55d8e67249138ab1286599a62b",
+ "rev": "9100109c11b6b5482ea949c980b86e24740dca08",
"type": "github"
},
"original": {
@@ -1218,7 +1223,6 @@
"type": "github"
}
},
-<<<<<<< Updated upstream
"nixpkgs-old": {
"locked": {
"lastModified": 1751274312,
@@ -1237,43 +1241,30 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1752308619,
- "narHash": "sha256-pzrVLKRQNPrii06Rm09Q0i0dq3wt2t2pciT/GNq5EZQ=",
+ "lastModified": 1753345091,
+ "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "650e572363c091045cdbc5b36b0f4c1f614d3058",
-=======
- "nixpkgs-stable": {
- "locked": {
- "lastModified": 1735563628,
- "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
->>>>>>> Stashed changes
+ "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9",
"type": "github"
},
"original": {
"owner": "nixos",
-<<<<<<< Updated upstream
"ref": "nixos-25.05",
-=======
- "ref": "nixos-24.05",
->>>>>>> Stashed changes
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unfree": {
"inputs": {
- "nixpkgs": "nixpkgs_13"
+ "nixpkgs": "nixpkgs_12"
},
"locked": {
- "lastModified": 1752157431,
- "narHash": "sha256-2hXKttg+ja/CJdibgRUZVg4vuopwfJ1XO25aTPQ+t50=",
+ "lastModified": 1753539813,
+ "narHash": "sha256-gGQBQOtw0cTTeqwDU+0miEgk04idA7OTb3OeP/Jnxkc=",
"owner": "numtide",
"repo": "nixpkgs-unfree",
- "rev": "176afe59412399703877c42a9a528f7faf9cc967",
+ "rev": "5babecf0fa5adc12bf5ab4687f7f6b63f9148bbd",
"type": "github"
},
"original": {
@@ -1292,19 +1283,11 @@
]
},
"locked": {
-<<<<<<< Updated upstream
- "lastModified": 1752562123,
- "narHash": "sha256-vFgilSNwK5BFyKHb252VmUDY096qwOHlHF424xJxA1Q=",
+ "lastModified": 1753534779,
+ "narHash": "sha256-1/+PKrAALvtX5mbom82ibhvmWuH89E/Ufsv7lLeyJnY=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
- "rev": "2a1fbe8df21216eaff2ccf3a60ab94a33838ba97",
-=======
- "lastModified": 1752547084,
- "narHash": "sha256-lgHLCehVd9Y7BOQ3Q5x2IpeYh/xYVj/LSS/PSeeNx50=",
- "owner": "nix-community",
- "repo": "nixpkgs-wayland",
- "rev": "230a740fc870ba7b23f6c35eeb43e881479a059f",
->>>>>>> Stashed changes
+ "rev": "7dc5b2d7682d1940c9777134d45d9511186d9379",
"type": "github"
},
"original": {
@@ -1315,22 +1298,6 @@
},
"nixpkgs_10": {
"locked": {
- "lastModified": 1729256560,
- "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_11": {
- "locked": {
"lastModified": 1751792365,
"narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=",
"owner": "NixOS",
@@ -1345,13 +1312,13 @@
"type": "github"
}
},
- "nixpkgs_12": {
+ "nixpkgs_11": {
"locked": {
- "lastModified": 1752480373,
- "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=",
+ "lastModified": 1753429684,
+ "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08",
+ "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d",
"type": "github"
},
"original": {
@@ -1361,13 +1328,13 @@
"type": "github"
}
},
- "nixpkgs_13": {
+ "nixpkgs_12": {
"locked": {
- "lastModified": 1751984180,
- "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
+ "lastModified": 1753429684,
+ "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
+ "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d",
"type": "github"
},
"original": {
@@ -1375,13 +1342,13 @@
"type": "indirect"
}
},
- "nixpkgs_14": {
+ "nixpkgs_13": {
"locked": {
- "lastModified": 1752480373,
- "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=",
+ "lastModified": 1753429684,
+ "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08",
+ "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d",
"type": "github"
},
"original": {
@@ -1393,22 +1360,6 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1750441195,
- "narHash": "sha256-yke+pm+MdgRb6c0dPt8MgDhv7fcBbdjmv1ZceNTyzKg=",
- "owner": "cachix",
- "repo": "devenv-nixpkgs",
- "rev": "0ceffe312871b443929ff3006960d29b120dc627",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "ref": "rolling",
- "repo": "devenv-nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_3": {
- "locked": {
"lastModified": 1730768919,
"narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=",
"owner": "NixOS",
@@ -1423,7 +1374,7 @@
"type": "github"
}
},
- "nixpkgs_4": {
+ "nixpkgs_3": {
"locked": {
"lastModified": 1740560979,
"narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
@@ -1439,7 +1390,7 @@
"type": "github"
}
},
- "nixpkgs_5": {
+ "nixpkgs_4": {
"locked": {
"lastModified": 1719690277,
"narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=",
@@ -1455,7 +1406,7 @@
"type": "github"
}
},
- "nixpkgs_6": {
+ "nixpkgs_5": {
"locked": {
"lastModified": 1744157173,
"narHash": "sha256-bWSjxDwq7iVePrhmA7tY2dyMWHuNJo8knkO4y+q4ZkY=",
@@ -1471,13 +1422,13 @@
"type": "github"
}
},
- "nixpkgs_7": {
+ "nixpkgs_6": {
"locked": {
- "lastModified": 1751203939,
- "narHash": "sha256-omYD+H5LlSihz2DRfv90I8Oeo7JNEwvcHPHX+6nMIM4=",
+ "lastModified": 1753004467,
+ "narHash": "sha256-QznRD2YNqBVT+LjrV36rIuOZO1XKbjm1BgtMTIrTDVg=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "650e71cbf76de8dd16f5648a96981b726c4ef8fe",
+ "rev": "147633ad35aba48f75af49be7ddc956c71c35acc",
"type": "github"
},
"original": {
@@ -1487,7 +1438,7 @@
"type": "github"
}
},
- "nixpkgs_8": {
+ "nixpkgs_7": {
"locked": {
"lastModified": 1746904237,
"narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
@@ -1503,13 +1454,13 @@
"type": "github"
}
},
- "nixpkgs_9": {
+ "nixpkgs_8": {
"locked": {
- "lastModified": 1752012998,
- "narHash": "sha256-Q82Ms+FQmgOBkdoSVm+FBpuFoeUAffNerR5yVV7SgT8=",
+ "lastModified": 1752900028,
+ "narHash": "sha256-dPALCtmik9Wr14MGqVXm+OQcv7vhPBXcWNIOThGnB/Q=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "2a2130494ad647f953593c4e84ea4df839fbd68c",
+ "rev": "6b4955211758ba47fac850c040a27f23b9b4008f",
"type": "github"
},
"original": {
@@ -1519,25 +1470,33 @@
"type": "github"
}
},
+ "nixpkgs_9": {
+ "locked": {
+ "lastModified": 1729256560,
+ "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"nur": {
"inputs": {
"flake-parts": "flake-parts_5",
- "nixpkgs": "nixpkgs_14"
+ "nixpkgs": "nixpkgs_13"
},
"locked": {
-<<<<<<< Updated upstream
- "lastModified": 1752575257,
- "narHash": "sha256-34S3op5XjbcHahifCUkzxOL0t6YkRzJaj5PXI8tEz6k=",
- "owner": "nix-community",
- "repo": "NUR",
- "rev": "b4815529806b1e30a4e6c66c1091e010e0a4c2b8",
-=======
- "lastModified": 1752555807,
- "narHash": "sha256-uPf6vXeHq/npoRt6gkcoajX6KtfBO1ATmQ0LbxJBc3o=",
+ "lastModified": 1753557882,
+ "narHash": "sha256-J967+c6kyWAp1zO/WYoFC4aOwJjFKzc58ld0cmxNuE0=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "5dfd4f5779c92e6031346e444b61ae6023239092",
->>>>>>> Stashed changes
+ "rev": "3c0dd6127373509dd1b3877fbd820926c83ae3af",
"type": "github"
},
"original": {
@@ -1546,7 +1505,6 @@
"type": "github"
}
},
-<<<<<<< Updated upstream
"openai-codex": {
"inputs": {
"flake-utils": "flake-utils_7",
@@ -1556,11 +1514,11 @@
"rust-overlay": "rust-overlay_4"
},
"locked": {
- "lastModified": 1752529892,
- "narHash": "sha256-vTe5ipzKp0gsDHW7SItdoPrIoWo9ZGlHoAjrIs5aFPQ=",
+ "lastModified": 1753551349,
+ "narHash": "sha256-aehl11ls81kR0nxON6Bv7sb35B4vb4jYGUwqXpkW2Og=",
"owner": "openai",
"repo": "codex",
- "rev": "f14b5adabf5db34864c44c1ffc6c566b018fe0cc",
+ "rev": "5a0079fea2d325d2638e2b1857cba0871fba6402",
"type": "github"
},
"original": {
@@ -1569,16 +1527,14 @@
"type": "github"
}
},
-=======
->>>>>>> Stashed changes
"polybar-themes": {
"flake": false,
"locked": {
- "lastModified": 1750950071,
- "narHash": "sha256-Hanx8zEueKvI4jBrcUQIo6GnkzcS2TgsixBLS8V9ZKM=",
+ "lastModified": 1753542051,
+ "narHash": "sha256-f/54m7RJnqNW6eC/75IrnFxmSWTY+zd5epm6TQsYeYA=",
"owner": "adi1090x",
"repo": "polybar-themes",
- "rev": "ccf23ef328f1e988650487c40678c6953038e2b2",
+ "rev": "e6326ff356b296256b7fac9c5bcc42a1ef4a4d5b",
"type": "github"
},
"original": {
@@ -1653,6 +1609,7 @@
"disko": "disko",
"flake-parts": "flake-parts_2",
"flake-utils": "flake-utils_2",
+ "gemini-cli": "gemini-cli",
"git-hooks": "git-hooks_2",
"helix": "helix",
"homix": "homix",
@@ -1668,20 +1625,14 @@
"nixos-mailserver": "nixos-mailserver",
"nixos-rk3588": "nixos-rk3588",
"nixos-wsl": "nixos-wsl",
- "nixpkgs": "nixpkgs_12",
+ "nixpkgs": "nixpkgs_11",
"nixpkgs-darwin": "nixpkgs-darwin",
-<<<<<<< Updated upstream
"nixpkgs-old": "nixpkgs-old",
-=======
->>>>>>> Stashed changes
"nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unfree": "nixpkgs-unfree",
"nixpkgs-wayland": "nixpkgs-wayland",
"nur": "nur",
-<<<<<<< Updated upstream
"openai-codex": "openai-codex",
-=======
->>>>>>> Stashed changes
"polybar-themes": "polybar-themes",
"waybar": "waybar",
"windsurf": "windsurf",
@@ -1740,11 +1691,11 @@
]
},
"locked": {
- "lastModified": 1751165203,
- "narHash": "sha256-3QhlpAk2yn+ExwvRLtaixWsVW1q3OX3KXXe0l8VMLl4=",
+ "lastModified": 1752979888,
+ "narHash": "sha256-qRRP3QavbwW0o+LOh31QNEfCgPlzK5SKlWALUJL6T7E=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "90f547b90e73d3c6025e66c5b742d6db51c418c3",
+ "rev": "95719de18aefa63a624bf75a1ff98744b089ec12",
"type": "github"
},
"original": {
@@ -1753,7 +1704,6 @@
"type": "github"
}
},
-<<<<<<< Updated upstream
"rust-overlay_4": {
"inputs": {
"nixpkgs": [
@@ -1775,8 +1725,6 @@
"type": "github"
}
},
-=======
->>>>>>> Stashed changes
"spectrum": {
"flake": false,
"locked": {
@@ -1883,7 +1831,6 @@
"type": "github"
}
},
-<<<<<<< Updated upstream
"systems_7": {
"locked": {
"lastModified": 1681028828,
@@ -1899,8 +1846,6 @@
"type": "github"
}
},
-=======
->>>>>>> Stashed changes
"waybar": {
"inputs": {
"flake-compat": "flake-compat_7",
@@ -1909,11 +1854,11 @@
]
},
"locked": {
- "lastModified": 1752390446,
- "narHash": "sha256-OcVcNM7Jt1E1/5HfPEXAodeJ4z8rvsR+1eY5OUYCt1I=",
+ "lastModified": 1753252308,
+ "narHash": "sha256-rwN74KZdAQVLdengxHpUwkyaZTdoRzFjJ3SSr6rx2/o=",
"owner": "alexays",
"repo": "waybar",
- "rev": "94777921d96c2657c37c7d83a18f13968df486de",
+ "rev": "0776e694df56c2c849b682369148210d81324e93",
"type": "github"
},
"original": {
@@ -1929,11 +1874,7 @@
]
},
"locked": {
-<<<<<<< Updated upstream
"lastModified": 1740186345,
-=======
- "lastModified": 1741246078,
->>>>>>> Stashed changes
"narHash": "sha256-Qox5x+FI4OhCs/7T/v4hZlR9Rm7ZfpXP7ISy+OrHCyw=",
"path": "/home/y/nixconf/derivations/windsurf",
"type": "path"
@@ -1965,11 +1906,7 @@
]
},
"locked": {
-<<<<<<< Updated upstream
"lastModified": 1740469068,
-=======
- "lastModified": 1747476774,
->>>>>>> Stashed changes
"narHash": "sha256-uoitiN9zrv9QaGf8mKIXhRxXtsNi6MupZVK+Zy3jOoA=",
"path": "/home/y/nixconf/derivations/yek",
"type": "path"
@@ -1986,11 +1923,11 @@
]
},
"locked": {
- "lastModified": 1752293576,
- "narHash": "sha256-84tAzrC/kioWRmG0jLt1HWRP/wHON7zjLtXCwWRNI/g=",
+ "lastModified": 1753503382,
+ "narHash": "sha256-Dv0VUtDlGjfdRKfvHNr7skyTyKi8RtXZOJld2CiOO0I=",
"owner": "youwen5",
"repo": "zen-browser-flake",
- "rev": "1a40cdcb093a0025631ef692caa53130f821dd77",
+ "rev": "c3c8e1f6836546fc688007cbb1ee38ca9bacfd40",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 6f994ea..f0f8d37 100644
--- a/flake.nix
+++ b/flake.nix
@@ -84,6 +84,10 @@
url = "path:/home/y/nixconf/derivations/yek";
inputs.nixpkgs.follows = "nixpkgs";
};
+ gemini-cli = {
+ url = "path:/home/y/nixconf/derivations/gemini";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
############# non flakes ############
diff --git a/hosts/cloud/sortug/mail.nix b/hosts/cloud/sortug/mail.nix
index 68a960a..443e959 100644
--- a/hosts/cloud/sortug/mail.nix
+++ b/hosts/cloud/sortug/mail.nix
@@ -6,7 +6,7 @@
# services.dovecot2.sieve.extensions = ["fileinto"];
mailserver = {
enable = true;
- stateVersion = 1;
+ stateVersion = 3;
fqdn = "mail.sortug.com";
domains = ["sortug.com" "yago.onl"];
# workaround
diff --git a/hosts/editors.nix b/hosts/editors.nix
index 78d0fdd..2128d90 100644
--- a/hosts/editors.nix
+++ b/hosts/editors.nix
@@ -7,9 +7,10 @@
environment.variables.F = "hx";
environment.systemPackages = with pkgs; [
neovim
- #inputs.helix.packages.${pkgs.system}.helix
- nodePackages.prettier
+ # inputs.helix.packages.${pkgs.system}.helix
helix
+ # for json formatting on helix
+ nodePackages.prettier
vscode-langservers-extracted
nil
alejandra
diff --git a/hosts/local/master/hardware-configuration.nix b/hosts/local/master/hardware-configuration.nix
index 8439f01..a20ea6e 100644
--- a/hosts/local/master/hardware-configuration.nix
+++ b/hosts/local/master/hardware-configuration.nix
@@ -7,14 +7,12 @@
pkgs,
modulesPath,
...
-}: let
- rtl8188gu = config.boot.kernelPackages.callPackage ./rtl8188gu.nix {};
-in {
+}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
- boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
+ boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "sd_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
@@ -30,18 +28,15 @@ in {
options = ["fmask=0077" "dmask=0077"];
};
+ # fileSystems."/home/y/sata" =
+ # { device = "/dev/disk/by-uuid/1f689125-e290-4904-9046-f67b51d05c6b";
+ # fsType = "ext4";
+ # };
+
swapDevices = [
{device = "/dev/disk/by-uuid/e34d7981-458b-462a-b551-007bce4f40f9";}
];
- # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
- # (the default) this is the recommended approach. When using systemd-networkd it's
- # still possible to use this option, but it's recommended to use it in conjunction
- # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
- networking.useDHCP = lib.mkDefault true;
- # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
- # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
-
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}
diff --git a/hosts/local/master/hw.nix b/hosts/local/master/hw.nix
new file mode 100644
index 0000000..8439f01
--- /dev/null
+++ b/hosts/local/master/hw.nix
@@ -0,0 +1,47 @@
+# Do not modify this file! It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations. Please make changes
+# to /etc/nixos/configuration.nix instead.
+{
+ config,
+ lib,
+ pkgs,
+ modulesPath,
+ ...
+}: let
+ rtl8188gu = config.boot.kernelPackages.callPackage ./rtl8188gu.nix {};
+in {
+ imports = [
+ (modulesPath + "/installer/scan/not-detected.nix")
+ ];
+
+ boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
+ boot.initrd.kernelModules = [];
+ boot.kernelModules = ["kvm-intel"];
+ boot.extraModulePackages = [];
+
+ fileSystems."/" = {
+ device = "/dev/disk/by-uuid/3f1343f2-1ba3-4c57-b95e-bb808d3dffd3";
+ fsType = "ext4";
+ };
+
+ fileSystems."/boot" = {
+ device = "/dev/disk/by-uuid/C676-FD24";
+ fsType = "vfat";
+ options = ["fmask=0077" "dmask=0077"];
+ };
+
+ swapDevices = [
+ {device = "/dev/disk/by-uuid/e34d7981-458b-462a-b551-007bce4f40f9";}
+ ];
+
+ # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+ # (the default) this is the recommended approach. When using systemd-networkd it's
+ # still possible to use this option, but it's recommended to use it in conjunction
+ # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+ networking.useDHCP = lib.mkDefault true;
+ # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
+ # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
+
+ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+ hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/hosts/pkgs.nix b/hosts/pkgs.nix
index 1fb5865..bf940f6 100644
--- a/hosts/pkgs.nix
+++ b/hosts/pkgs.nix
@@ -71,7 +71,7 @@
claude-code
codex
nushell
- # gemini-cli
+ # inputs.gemini-cli.packages.x86_64-linux.default
]
++ lib.optionals pkgs.stdenv.isLinux [
# linuxKernel.packages.linux_latest_libre.cpupower
@@ -93,8 +93,8 @@
appimage-run
# disk automount
udiskie
- nodejs
- bun
+ # nodejs
+ # bun
# /mac
]
++ lib.optionals pkgs.stdenv.isDarwin [
diff --git a/result b/result
new file mode 120000
index 0000000..7d154f4
--- /dev/null
+++ b/result
@@ -0,0 +1 @@
+/nix/store/8drkdhll600qa5ky3j98fchc97h9mj2h-nixos-system-spanmail-25.11.20250725.7fd36ee \ No newline at end of file