From 2339fba37290774336fa517a417330e3ff788ba5 Mon Sep 17 00:00:00 2001 From: polwex Date: Sun, 27 Jul 2025 03:34:16 +0700 Subject: spanch --- derivations/codex/default.nix | 63 +++++++++++++++++++++++ derivations/codex/flake.nix | 19 +++++++ derivations/gemini/default.nix | 103 +++++++++++++++++++++++++++++++++++++ derivations/gemini/flake.nix | 20 +++++++ hosts/cloud/span/configuration.nix | 4 +- hosts/cloud/span/default.nix | 1 + hosts/cloud/span/flake.lock | 27 ---------- hosts/cloud/span/flake.nix | 16 ------ hosts/cloud/span/mail.nix | 16 +----- hosts/cloud/span/nginx.nix | 2 + hosts/cloud/span/packages.nix | 47 ----------------- 11 files changed, 211 insertions(+), 107 deletions(-) create mode 100644 derivations/codex/default.nix create mode 100644 derivations/codex/flake.nix create mode 100644 derivations/gemini/default.nix create mode 100644 derivations/gemini/flake.nix delete mode 100644 hosts/cloud/span/flake.lock delete mode 100644 hosts/cloud/span/flake.nix delete mode 100644 hosts/cloud/span/packages.nix diff --git a/derivations/codex/default.nix b/derivations/codex/default.nix new file mode 100644 index 0000000..5a0f366 --- /dev/null +++ b/derivations/codex/default.nix @@ -0,0 +1,63 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, + pkg-config, + openssl, + versionCheckHook, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "codex"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "openai"; + repo = "codex"; + rev = "f14b5adabf5db34864c44c1ffc6c566b018fe0cc"; + # tag = "rust-v${finalAttrs.version}"; + hash = "sha256-rRe0JFEO5ixxrZYDL8kxXDOH0n7lqabkXNNaSlNnQDg="; + }; + + sourceRoot = "${finalAttrs.src.name}/codex-rs"; + + useFetchCargoVendor = true; + cargoHash = "sha256-QIZ3V4NUo1VxJN3cwdQf3S0zwePnwdKKfch0jlIJacU="; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + openssl + ]; + + checkFlags = [ + "--skip=keeps_previous_response_id_between_tasks" # Requires network access + "--skip=retries_on_early_close" # Requires network access + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [versionCheckHook]; + + passthru = { + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^rust-v(\\d+\\.\\d+\\.\\d+)$" + ]; + }; + }; + + meta = { + description = "Lightweight coding agent that runs in your terminal"; + homepage = "https://github.com/openai/codex"; + changelog = "https://raw.githubusercontent.com/openai/codex/refs/tags/rust-v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.asl20; + mainProgram = "codex"; + maintainers = with lib.maintainers; [ + malo + delafthi + ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/derivations/codex/flake.nix b/derivations/codex/flake.nix new file mode 100644 index 0000000..3a0a46f --- /dev/null +++ b/derivations/codex/flake.nix @@ -0,0 +1,19 @@ +{ + description = "Gemini CLI flake"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + }; + + outputs = { + self, + nixpkgs, + }: let + system = "x86_64-linux"; + pkgs = nixpkgs.legacyPackages.${system}; + in { + packages.${system}.default = pkgs.callPackage ./default.nix { + inherit (pkgs) lib buildNpmPackage fetchFromGitHub fetchNpmDeps gitUpdater; + }; + }; +} diff --git a/derivations/gemini/default.nix b/derivations/gemini/default.nix new file mode 100644 index 0000000..ee53130 --- /dev/null +++ b/derivations/gemini/default.nix @@ -0,0 +1,103 @@ +# { +# lib, +# buildNpmPackage, +# fetchFromGitHub, +# fetchNpmDeps, +# writeShellApplication, +# cacert, +# curl, +# gnused, +# jq, +# nix-prefetch-github, +# prefetch-npm-deps, +# gitUpdater, +# }: +# buildNpmPackage (finalAttrs: { +# pname = "superapp"; +# version = "0.4.2"; +# src = fetchFromGitHub { +# owner = "sortugdev"; +# repo = "superapp"; +# tag = "v${finalAttrs.version}"; +# hash = "sha256-DAenod/w9BydYdYsOnuLj7kCQRcTnZ81tf4MhLUug6c="; +# }; +# npmDeps = fetchNpmDeps { +# inherit (finalAttrs) src; +# hash = "sha256-otogkSsKJ5j1BY00y4SRhL9pm7CK9nmzVisvGCDIMlU="; +# }; +# preConfigure = '' +# mkdir -p packages/generated +# echo "export const GIT_COMMIT_INFO = { commitHash: '${finalAttrs.src.rev}' };" > packages/generated/git-commit.ts +# ''; +# installPhase = '' +# runHook preInstall +# mkdir -p $out/{bin,share/superapp-cli} +# cp -r node_modules $out/share/superapp-cli/ +# rm -f $out/share/superapp-cli/node_modules/@sortug/superapp-cli +# rm -f $out/share/superapp-cli/node_modules/@sortug/superapp-cli-core +# cp -r packages/cli $out/share/superapp-cli/node_modules/@sortug/superapp-cli +# cp -r packages/core $out/share/superapp-cli/node_modules/@sortug/superapp-cli-core +# ln -s $out/share/superapp-cli/node_modules/@sortug/superapp-cli/dist/index.js $out/bin/superapp +# runHook postInstall +# ''; +# postInstall = '' +# chmod +x "$out/bin/superapp" +# ''; +# passthru.updateScript = gitUpdater {}; +# meta = { +# description = "Super app that will save the world"; +# homepage = "https://github.com/sortugdev/superapp"; +# license = lib.licenses.asl20; +# maintainers = with lib.maintainers; [pepe]; +# platforms = lib.platforms.all; +# mainProgram = "superapp"; +# }; +# }) +{ + lib, + buildNpmPackage, + fetchFromGitHub, + fetchNpmDeps, + gitUpdater, +}: +buildNpmPackage (finalAttrs: { + pname = "gemini-cli"; + version = "0.1.7"; + src = fetchFromGitHub { + owner = "google-gemini"; + repo = "gemini-cli"; + tag = "v${finalAttrs.version}"; + hash = "sha256-DAenod/w9BydYdYsOnuLj7kCQRcTnZ81tf4MhLUug6c="; + }; + npmDeps = fetchNpmDeps { + inherit (finalAttrs) src; + hash = "sha256-otogkSsKJ5j1BY00y4SRhL9pm7CK9nmzVisvGCDIMlU="; + }; + preConfigure = '' + mkdir -p packages/generated + echo "export const GIT_COMMIT_INFO = { commitHash: '${finalAttrs.src.rev}' };" > packages/generated/git-commit.ts + ''; + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,share/gemini-cli} + cp -r node_modules $out/share/gemini-cli/ + rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli + rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli-core + cp -r packages/cli $out/share/gemini-cli/node_modules/@google/gemini-cli + cp -r packages/core $out/share/gemini-cli/node_modules/@google/gemini-cli-core + ln -s $out/share/gemini-cli/node_modules/@google/gemini-cli/dist/index.js $out/bin/gemini + runHook postInstall + ''; + postInstall = '' + chmod +x "$out/bin/gemini" + ''; + passthru.updateScript = gitUpdater {}; + meta = { + description = "AI agent that brings the power of Gemini directly into your terminal"; + homepage = "https://github.com/google-gemini/gemini-cli"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [donteatoreo]; + platforms = lib.platforms.all; + mainProgram = "gemini"; + }; +}) diff --git a/derivations/gemini/flake.nix b/derivations/gemini/flake.nix new file mode 100644 index 0000000..9dd913d --- /dev/null +++ b/derivations/gemini/flake.nix @@ -0,0 +1,20 @@ +{ + description = "Gemini CLI flake"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + }; + + outputs = { + self, + nixpkgs, + }: let + system = "x86_64-linux"; + pkgs = nixpkgs.legacyPackages.${system}; + in { + packages.${system}.default = pkgs.callPackage ./default.nix { + inherit (pkgs) lib buildNpmPackage fetchFromGitHub fetchNpmDeps gitUpdater; + inherit nixpkgs; + }; + }; +} diff --git a/hosts/cloud/span/configuration.nix b/hosts/cloud/span/configuration.nix index 1157308..cdf39d7 100644 --- a/hosts/cloud/span/configuration.nix +++ b/hosts/cloud/span/configuration.nix @@ -10,8 +10,8 @@ # Include the results of the hardware scan. ./hardware-configuration.nix ./users.nix - ./mail.nix - ./packages.nix + # ./mail.nix + ../packages.nix ./nginx.nix ]; diff --git a/hosts/cloud/span/default.nix b/hosts/cloud/span/default.nix index 3669483..6bce414 100644 --- a/hosts/cloud/span/default.nix +++ b/hosts/cloud/span/default.nix @@ -1,4 +1,5 @@ inputs: [ inputs.disko.nixosModules.disko + inputs.nixos-mailserver.nixosModule ./configuration.nix ] diff --git a/hosts/cloud/span/flake.lock b/hosts/cloud/span/flake.lock deleted file mode 100644 index 6bc7bd0..0000000 --- a/hosts/cloud/span/flake.lock +++ /dev/null @@ -1,27 +0,0 @@ -{ - "nodes": { - "nixpkgs": { - "locked": { - "lastModified": 1704008649, - "narHash": "sha256-rGPSWjXTXTurQN9beuHdyJhB8O761w1Zc5BqSSmHvoM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d44d59d2b5bd694cd9d996fd8c51d03e3e9ba7f7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/hosts/cloud/span/flake.nix b/hosts/cloud/span/flake.nix deleted file mode 100644 index b801212..0000000 --- a/hosts/cloud/span/flake.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - - outputs = { nixpkgs, ... }: - { - nixosConfigurations.spanmail = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./configuration.nix - ./users.nix - ./packages.nix - ./mail.nix - ]; - }; - }; -} diff --git a/hosts/cloud/span/mail.nix b/hosts/cloud/span/mail.nix index 9cc44a7..69be6a9 100644 --- a/hosts/cloud/span/mail.nix +++ b/hosts/cloud/span/mail.nix @@ -3,17 +3,6 @@ pkgs, ... }: { - imports = [ - (builtins.fetchTarball { - url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-23.11/nixos-mailserver-nixos-23.11.tar.gz"; - # To get the sha256 of the nixos-mailserver tarball, we can use the nix-prefetch-url command: - # release="nixos-23.05"; nix-prefetch-url "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/${release}/nixos-mailserver-${release}.tar.gz" --unpack - - sha256 = "122vm4n3gkvlkqmlskiq749bhwfd0r71v6vcmg1bbyg4998brvx8"; - }) - ]; - - services.dovecot2.sieve.extensions = ["fileinto"]; mailserver = { enable = true; fqdn = "mail.spandrell.ch"; @@ -32,7 +21,7 @@ hashedPasswordFile = "/home/span/mail.key"; }; "lol@spandrell.ch" = { - hashedPasswordFile = "/home/span/mail2.key"; + hashedPasswordFile = "/home/span/mail.key"; }; "sub@spandrell.ch" = { hashedPasswordFile = "/home/span/mail.key"; @@ -52,8 +41,6 @@ # down nginx and opens port 80. certificateScheme = "acme-nginx"; }; - security.acme.acceptTerms = true; - security.acme.defaults.email = "security@spandrell.ch"; services.roundcube = { enable = true; # this is the url of the vhost, not necessarily the same as the fqdn of @@ -67,5 +54,4 @@ $config['smtp_pass'] = "%p"; ''; }; - services.nginx.enable = true; } diff --git a/hosts/cloud/span/nginx.nix b/hosts/cloud/span/nginx.nix index 4da4b68..9bfa8ea 100644 --- a/hosts/cloud/span/nginx.nix +++ b/hosts/cloud/span/nginx.nix @@ -3,6 +3,8 @@ pkgs, ... }: { + security.acme.acceptTerms = true; + security.acme.defaults.email = "admin@spandrell.ch"; services.nginx = { enable = true; appendHttpConfig = '' diff --git a/hosts/cloud/span/packages.nix b/hosts/cloud/span/packages.nix deleted file mode 100644 index 6574071..0000000 --- a/hosts/cloud/span/packages.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ config, pkgs, ... }: - -{ - nixpkgs.config = { - allowUnfree = true; - }; - - environment.systemPackages = with pkgs; [ - vim - helix - fish - # unix utilities - tmux - bat # cat replacement written in Rust - colordiff - direnv # Per-directory environment variables - lsd - fd # find replacement written in Rust - fzf # Fuzzy finder - git - htop # Resource monitoring - jq # JSON parsing for the CLI - lsof - ripgrep # grep replacement written in Rust - sd # Fancy sed replacement - silver-searcher - strace # debug stack trace - tealdeer # tldr for various shell tools - testdisk - tokei # Handy tool to see lines of code by language - watchexec # Fileystem watcher/executor useful for speedy development - xsv # CSV file parsing utility - just # Intriguing new make replacement - mdcat # Markdown converter/reader for the CLI - tree - unzip - zip - - # networking - curl - wget - - minio - ncdu - ]; -} - -- cgit v1.2.3 From cd6e43bc73c43643b06d42e3e025986f1e4edea1 Mon Sep 17 00:00:00 2001 From: polwex Date: Sun, 27 Jul 2025 04:38:40 +0700 Subject: spanch --- flake.lock | 359 ++++++++++++++----------------------- hosts/cloud/packages.nix | 5 +- hosts/cloud/span/configuration.nix | 3 +- hosts/cloud/span/mail.nix | 1 + hosts/local/fw11/configuration.nix | 5 + 5 files changed, 150 insertions(+), 223 deletions(-) diff --git a/flake.lock b/flake.lock index d63d1d3..5d3605f 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,6 @@ "type": "github" } }, -======= ->>>>>>> Stashed changes "git-hooks": { "inputs": { "flake-compat": [ @@ -558,7 +555,7 @@ "inputs": { "flake-compat": "flake-compat_2", "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1750779888, @@ -711,15 +708,15 @@ }, "helix": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1752426734, - "narHash": "sha256-a434OTO7gxtAnDE6/1JWSf4in3ed24bEYJb0dUSZipE=", + "lastModified": 1753557739, + "narHash": "sha256-5ErmE8Lcwkmt4UNiuUFWtyg3Knq5lLHNFN4cEx1y758=", "owner": "helix-editor", "repo": "helix", - "rev": "6fd1efd1c29f4c0dbdab3a82d961fd5456e0cb1c", + "rev": "8dbc664a30dbf099a4187ad20a30846b37b301c6", "type": "github" }, "original": { @@ -752,7 +749,7 @@ }, "homix": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1720719665, @@ -785,7 +782,7 @@ }, "kmonad": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "dir": "nix", @@ -808,16 +805,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 +829,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 +845,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 +873,10 @@ "devenv", "git-hooks" ], - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "devenv", + "nixpkgs" + ], "nixpkgs-23-11": [ "devenv" ], @@ -885,11 +885,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 +922,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 +1034,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 +1059,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 +1076,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 +1096,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 +1115,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 +1147,16 @@ }, "nixpkgs-darwin": { "locked": { -<<<<<<< Updated upstream - "lastModified": 1752483536, - "narHash": "sha256-RaaMPRtewLITsV0JMIgoTSkSR+Wuu/a/I/Za0hiCes8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1156bb3c3d94de7c6a7dc798b42c98bb975f3a75", -======= - "lastModified": 1735564410, - "narHash": "sha256-HB/FA0+1gpSs8+/boEavrGJH+Eq08/R2wWNph1sM1Dg=", + "lastModified": 1753473540, + "narHash": "sha256-kaG2a9/6iWiRehjLZLToAlM1zFxRf3s+BOYOurPOmK4=", "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 +1193,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 +1206,6 @@ "type": "github" } }, -<<<<<<< Updated upstream "nixpkgs-old": { "locked": { "lastModified": 1751274312, @@ -1237,43 +1224,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 +1266,11 @@ ] }, "locked": { -<<<<<<< Updated upstream - "lastModified": 1752562123, - "narHash": "sha256-vFgilSNwK5BFyKHb252VmUDY096qwOHlHF424xJxA1Q=", - "owner": "nix-community", - "repo": "nixpkgs-wayland", - "rev": "2a1fbe8df21216eaff2ccf3a60ab94a33838ba97", -======= - "lastModified": 1752547084, - "narHash": "sha256-lgHLCehVd9Y7BOQ3Q5x2IpeYh/xYVj/LSS/PSeeNx50=", + "lastModified": 1753534779, + "narHash": "sha256-1/+PKrAALvtX5mbom82ibhvmWuH89E/Ufsv7lLeyJnY=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "230a740fc870ba7b23f6c35eeb43e881479a059f", ->>>>>>> Stashed changes + "rev": "7dc5b2d7682d1940c9777134d45d9511186d9379", "type": "github" }, "original": { @@ -1314,22 +1280,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=", @@ -1345,13 +1295,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 +1311,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 +1325,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": { @@ -1392,22 +1342,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=", @@ -1423,7 +1357,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1740560979, "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", @@ -1439,7 +1373,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1719690277, "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", @@ -1455,7 +1389,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1744157173, "narHash": "sha256-bWSjxDwq7iVePrhmA7tY2dyMWHuNJo8knkO4y+q4ZkY=", @@ -1471,13 +1405,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 +1421,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1746904237, "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", @@ -1503,13 +1437,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 +1453,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": 1753556255, + "narHash": "sha256-qeku7jYyXE87xuOTHjEWgFQkEo+AQ9iBNmXFHsTWJ1E=", "owner": "nix-community", "repo": "NUR", - "rev": "5dfd4f5779c92e6031346e444b61ae6023239092", ->>>>>>> Stashed changes + "rev": "bc5deaa73afd5c55ac6f6f427f6bab8c64919a52", "type": "github" }, "original": { @@ -1546,7 +1488,6 @@ "type": "github" } }, -<<<<<<< Updated upstream "openai-codex": { "inputs": { "flake-utils": "flake-utils_7", @@ -1556,11 +1497,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 +1510,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": { @@ -1668,20 +1607,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 +1673,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 +1686,6 @@ "type": "github" } }, -<<<<<<< Updated upstream "rust-overlay_4": { "inputs": { "nixpkgs": [ @@ -1775,8 +1707,6 @@ "type": "github" } }, -======= ->>>>>>> Stashed changes "spectrum": { "flake": false, "locked": { @@ -1883,7 +1813,6 @@ "type": "github" } }, -<<<<<<< Updated upstream "systems_7": { "locked": { "lastModified": 1681028828, @@ -1899,8 +1828,6 @@ "type": "github" } }, -======= ->>>>>>> Stashed changes "waybar": { "inputs": { "flake-compat": "flake-compat_7", @@ -1909,11 +1836,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 +1856,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 +1888,7 @@ ] }, "locked": { -<<<<<<< Updated upstream - "lastModified": 1740469068, -======= "lastModified": 1747476774, ->>>>>>> Stashed changes "narHash": "sha256-uoitiN9zrv9QaGf8mKIXhRxXtsNi6MupZVK+Zy3jOoA=", "path": "/home/y/nixconf/derivations/yek", "type": "path" @@ -1986,11 +1905,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/hosts/cloud/packages.nix b/hosts/cloud/packages.nix index 64f2c95..a62b1f9 100644 --- a/hosts/cloud/packages.nix +++ b/hosts/cloud/packages.nix @@ -43,8 +43,9 @@ # networking curl - caddy # simple web server made with go - innernet + wget + # caddy # simple web server made with go + # innernet # s3 minio diff --git a/hosts/cloud/span/configuration.nix b/hosts/cloud/span/configuration.nix index cdf39d7..d887d37 100644 --- a/hosts/cloud/span/configuration.nix +++ b/hosts/cloud/span/configuration.nix @@ -8,9 +8,10 @@ }: { imports = [ # Include the results of the hardware scan. + ../../base.nix ./hardware-configuration.nix ./users.nix - # ./mail.nix + ./mail.nix ../packages.nix ./nginx.nix ]; diff --git a/hosts/cloud/span/mail.nix b/hosts/cloud/span/mail.nix index 69be6a9..beee817 100644 --- a/hosts/cloud/span/mail.nix +++ b/hosts/cloud/span/mail.nix @@ -4,6 +4,7 @@ ... }: { mailserver = { + stateVersion = 3; enable = true; fqdn = "mail.spandrell.ch"; domains = ["spandrell.ch"]; diff --git a/hosts/local/fw11/configuration.nix b/hosts/local/fw11/configuration.nix index 69b51a2..11c09d1 100644 --- a/hosts/local/fw11/configuration.nix +++ b/hosts/local/fw11/configuration.nix @@ -34,6 +34,11 @@ # environment.systemPackages = [ # wrappers # ]; + # + + nixpkgs.config = { + allowUnfree = true; + }; environment = { etc = { "sway/config".source = ./swayconfig; -- cgit v1.2.3