From b1ce87fbf979f80a6a610869d97103404a909ac2 Mon Sep 17 00:00:00 2001 From: EdenQwQ Date: Wed, 13 May 2026 14:25:45 +0800 Subject: [PATCH] mimo; github token; update flakes --- flake.lock | 343 +++++++++++++++++++------- flake.nix | 6 +- home/programs/browser/firefox.nix | 1 + home/programs/coding/misc.nix | 2 +- home/programs/desktop/default.nix | 45 +--- home/programs/desktop/niri/waybar.nix | 5 +- home/programs/utils/ai.nix | 2 + home/programs/utils/default.nix | 1 + hosts/default.nix | 2 + hosts/xiaomi/home.nix | 2 +- nix/github_token.nix | 9 + os/programs/default.nix | 8 - overlays/default.nix | 1 - secrets/age.nix | 2 + secrets/mimo_token.age | Bin 0 -> 484 bytes secrets/nix_github_token.age | 10 + secrets/secrets.nix | 2 + 17 files changed, 299 insertions(+), 142 deletions(-) create mode 100644 nix/github_token.nix create mode 100644 secrets/mimo_token.age create mode 100644 secrets/nix_github_token.age diff --git a/flake.lock b/flake.lock index 032efdc..52a1d49 100644 --- a/flake.lock +++ b/flake.lock @@ -213,24 +213,6 @@ "type": "github" } }, - "driftwm": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1776424715, - "narHash": "sha256-jryEkSU9NUBAa7pDeEB1IBqpNQPnM4gyLPbpyTjXNd8=", - "owner": "malbiruk", - "repo": "driftwm", - "rev": "b13d651392bdb1e1496e98baaeb35e2a4d30295c", - "type": "github" - }, - "original": { - "owner": "malbiruk", - "repo": "driftwm", - "type": "github" - } - }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -329,6 +311,27 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "hermes-agent", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, @@ -346,7 +349,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_3" }, @@ -364,7 +367,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -385,7 +388,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_6": { "inputs": { "nixpkgs-lib": [ "nur", @@ -406,7 +409,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_7": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -552,7 +555,7 @@ "inputs": { "flake-compat": "flake-compat_2", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "zig": "zig", "zon2nix": "zon2nix" }, @@ -589,6 +592,29 @@ "type": "gitlab" } }, + "hermes-agent": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_6", + "npm-lockfile-fix": "npm-lockfile-fix", + "pyproject-build-systems": "pyproject-build-systems", + "pyproject-nix": "pyproject-nix_2", + "uv2nix": "uv2nix_2" + }, + "locked": { + "lastModified": 1777366837, + "narHash": "sha256-MLQ3kkUn6eX3+/XLPT+l2mVfyykuhvkmGtzeAgzgll0=", + "owner": "NousResearch", + "repo": "hermes-agent", + "rev": "4e5ebf07ea57e5adb688bebcbe4b04d8d6e70285", + "type": "github" + }, + "original": { + "owner": "NousResearch", + "repo": "hermes-agent", + "type": "github" + } + }, "hexecute": { "inputs": { "nixpkgs": "nixpkgs_7" @@ -635,11 +661,11 @@ ] }, "locked": { - "lastModified": 1774584114, - "narHash": "sha256-uWR9fC+4NykFJVn4GN4Ini9LX+w8Llj7BnWKKp0N6bw=", + "lastModified": 1778248595, + "narHash": "sha256-dhFgEjoeJMYN/7OY6xfxS799YB4IjbbYXTjyGIJyLpc=", "owner": "nix-community", "repo": "home-manager", - "rev": "4b1be5c38be350ee9452a4847945ce71d950dc31", + "rev": "fdb2ccba9d5e1238d32e0c4a3ec1a277efa80c1d", "type": "github" }, "original": { @@ -680,10 +706,10 @@ "kimi-cli": { "inputs": { "nixpkgs": "nixpkgs_8", - "pyproject-build-systems": "pyproject-build-systems", - "pyproject-nix": "pyproject-nix", + "pyproject-build-systems": "pyproject-build-systems_2", + "pyproject-nix": "pyproject-nix_4", "systems": "systems_3", - "uv2nix": "uv2nix" + "uv2nix": "uv2nix_3" }, "locked": { "lastModified": 1770820866, @@ -720,7 +746,7 @@ }, "mangowc": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "nixpkgs": "nixpkgs_9", "scenefx": "scenefx" }, @@ -821,11 +847,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1776372253, - "narHash": "sha256-sZJ6PwUiGESkNESk2cENidMBiIbZ59jBc+QrNwKHc7s=", + "lastModified": 1777941584, + "narHash": "sha256-S7TyDDhu+PAoDSKxBHJ4BCTvg7Tu2ct1ZRZH6gOnN34=", "owner": "JustinSpedding", "repo": "niri", - "rev": "9ed88e26b3d08fbc1096dbeb47c9c6d97dddaf1b", + "rev": "484903954cd3f4047ad8a8a564f02a48d9f7536f", "type": "github" }, "original": { @@ -877,7 +903,7 @@ }, "nixd": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "flake-root": "flake-root", "nixpkgs": [ "nixpkgs" @@ -971,22 +997,6 @@ "type": "github" } }, - "nixpkgs-new-libinput": { - "locked": { - "lastModified": 1773138432, - "narHash": "sha256-9FtasZuEakGyXCqt7IbSALG5bgvKRKpp5DpHqlUS6V4=", - "owner": "skowalak", - "repo": "nixpkgs", - "rev": "3444cf952961ac97b3366df43fa36ec393f85599", - "type": "github" - }, - "original": { - "owner": "skowalak", - "ref": "libinput-update-1.31.0", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-r": { "locked": { "lastModified": 1773964973, @@ -1104,11 +1114,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1774595715, - "narHash": "sha256-8za7tFAK1nO2lqzLHYMPu+gmrBG9nN8UgvwOGMmOJfA=", + "lastModified": 1778228972, + "narHash": "sha256-L34YTBob9sdjnc+rd7nMC2X8ddw0LT4RfufnlFyArRU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a48933708565662eb1309c018d6a9810016ae2a", + "rev": "1c5503ba41146fb6b49ed9706823b30de7f3a78f", "type": "github" }, "original": { @@ -1136,11 +1146,11 @@ }, "nixpkgs_15": { "locked": { - "lastModified": 1771574726, - "narHash": "sha256-D1PA3xQv/s4W3lnR9yJFSld8UOLr0a/cBWMQMXS+1Qg=", + "lastModified": 1768323494, + "narHash": "sha256-yBXJLE6WCtrGo7LKiB6NOt6nisBEEkguC/lq/rP3zRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c217913993d6c6f6805c3b1a3bda5e639adfde6d", + "rev": "2c3e5ec5df46d3aeee2a1da0bfedd74e21f4bf3a", "type": "github" }, "original": { @@ -1231,22 +1241,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1776169885, - "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 315532800, "narHash": "sha256-sV6pJNzFkiPc6j9Bi9JuHBnWdVhtKB/mHgVmMPvDFlk=", @@ -1259,7 +1253,7 @@ "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1758360447, "narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=", @@ -1272,6 +1266,22 @@ "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1775036866, + "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_7": { "locked": { "lastModified": 1759831965, @@ -1322,7 +1332,7 @@ }, "nixvim": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_5", "nixpkgs": "nixpkgs_15", "nuschtosSearch": "nuschtosSearch", "systems": "systems_7" @@ -1352,11 +1362,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1775957204, - "narHash": "sha256-d4CVRtAty2GzDYXx4xYQmR+nlOjjKovyprQfZhgLckU=", + "lastModified": 1777773024, + "narHash": "sha256-pLU+KB84A0Jei/vTD6pOS4Ovkmq3QDfPQHg1MlKsRqM=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "68e82fe34c68ee839a9c37e3466820e266af0c86", + "rev": "d3e26ccd9eecde9139be00caf5dc2d4260fb31ee", "type": "github" }, "original": { @@ -1373,11 +1383,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1776302695, - "narHash": "sha256-xZc9o1JLQpmWn2Dqui323+Tq2Ai4sSdtdvbFZCs4qLo=", + "lastModified": 1778104114, + "narHash": "sha256-+tbqLv7IW5Aem8kGF6cp4n3MtNBcwqmuGlMt6S1kQjs=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "a7c724181fca5d1aff2d47b18fa733504cfdbda2", + "rev": "eb2b53ddaa7564f5c93031cbe65cd5b6ef3c12a9", "type": "github" }, "original": { @@ -1386,9 +1396,30 @@ "type": "github" } }, + "npm-lockfile-fix": { + "inputs": { + "nixpkgs": [ + "hermes-agent", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1775903712, + "narHash": "sha256-2GV79U6iVH4gKAPWYrxUReB0S41ty/Y3dBLquU8AlaA=", + "owner": "jeslie0", + "repo": "npm-lockfile-fix", + "rev": "c6093acb0c0548e0f9b8b3d82918823721930fe8", + "type": "github" + }, + "original": { + "owner": "jeslie0", + "repo": "npm-lockfile-fix", + "type": "github" + } + }, "nur": { "inputs": { - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_6", "nixpkgs": "nixpkgs_16" }, "locked": { @@ -1454,6 +1485,29 @@ } }, "pyproject-build-systems": { + "inputs": { + "nixpkgs": [ + "hermes-agent", + "nixpkgs" + ], + "pyproject-nix": "pyproject-nix", + "uv2nix": "uv2nix" + }, + "locked": { + "lastModified": 1772555609, + "narHash": "sha256-3BA3HnUvJSbHJAlJj6XSy0Jmu7RyP2gyB/0fL7XuEDo=", + "owner": "pyproject-nix", + "repo": "build-system-pkgs", + "rev": "c37f66a953535c394244888598947679af231863", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "build-system-pkgs", + "type": "github" + } + }, + "pyproject-build-systems_2": { "inputs": { "nixpkgs": [ "kimi-cli", @@ -1483,6 +1537,71 @@ } }, "pyproject-nix": { + "inputs": { + "nixpkgs": [ + "hermes-agent", + "pyproject-build-systems", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1769936401, + "narHash": "sha256-kwCOegKLZJM9v/e/7cqwg1p/YjjTAukKPqmxKnAZRgA=", + "owner": "nix-community", + "repo": "pyproject.nix", + "rev": "b0d513eeeebed6d45b4f2e874f9afba2021f7812", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "pyproject.nix", + "type": "github" + } + }, + "pyproject-nix_2": { + "inputs": { + "nixpkgs": [ + "hermes-agent", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1772865871, + "narHash": "sha256-/ZTSg97aouL0SlPHaokA4r3iuH9QzHVuWPACD2CUCFY=", + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "rev": "e537db02e72d553cea470976b9733581bcf5b3ed", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "type": "github" + } + }, + "pyproject-nix_3": { + "inputs": { + "nixpkgs": [ + "hermes-agent", + "uv2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1771518446, + "narHash": "sha256-nFJSfD89vWTu92KyuJWDoTQJuoDuddkJV3TlOl1cOic=", + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "rev": "eb204c6b3335698dec6c7fc1da0ebc3c6df05937", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "type": "github" + } + }, + "pyproject-nix_4": { "inputs": { "nixpkgs": [ "kimi-cli", @@ -1551,9 +1670,9 @@ "awww": "awww", "caelestia-shell": "caelestia-shell", "dank-material-shell": "dank-material-shell", - "driftwm": "driftwm", "flake-parts": "flake-parts", "ghostty": "ghostty", + "hermes-agent": "hermes-agent", "hexecute": "hexecute", "home-manager": "home-manager_2", "kimi-cli": "kimi-cli", @@ -1566,7 +1685,6 @@ "nixGL": "nixGL", "nixd": "nixd", "nixpkgs": "nixpkgs_13", - "nixpkgs-new-libinput": "nixpkgs-new-libinput", "nixpkgs-r": "nixpkgs-r", "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-wayland": "nixpkgs-wayland", @@ -1649,7 +1767,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_7", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" @@ -1969,6 +2087,55 @@ } }, "uv2nix": { + "inputs": { + "nixpkgs": [ + "hermes-agent", + "pyproject-build-systems", + "nixpkgs" + ], + "pyproject-nix": [ + "hermes-agent", + "pyproject-build-systems", + "pyproject-nix" + ] + }, + "locked": { + "lastModified": 1770770348, + "narHash": "sha256-A2GzkmzdYvdgmMEu5yxW+xhossP+txrYb7RuzRaqhlg=", + "owner": "pyproject-nix", + "repo": "uv2nix", + "rev": "5d1b2cb4fe3158043fbafbbe2e46238abbc954b0", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "uv2nix", + "type": "github" + } + }, + "uv2nix_2": { + "inputs": { + "nixpkgs": [ + "hermes-agent", + "nixpkgs" + ], + "pyproject-nix": "pyproject-nix_3" + }, + "locked": { + "lastModified": 1773039484, + "narHash": "sha256-+boo33KYkJDw9KItpeEXXv8+65f7hHv/earxpcyzQ0I=", + "owner": "pyproject-nix", + "repo": "uv2nix", + "rev": "b68be7cfeacbed9a3fa38a2b5adc0cfb81d9bb1f", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "uv2nix", + "type": "github" + } + }, + "uv2nix_3": { "inputs": { "nixpkgs": [ "kimi-cli", @@ -2001,11 +2168,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1775234369, - "narHash": "sha256-VGCQjc6ywfCswsXPzeIXF2iugj+SS5salrSLBi+mCxM=", + "lastModified": 1776656914, + "narHash": "sha256-sSd96oEBZaUhTLR5ulU/+m1VGEeoej+61DcMh/AfAOc=", "owner": "EdenQwQ", "repo": "waydeeper", - "rev": "d13b8b7f498d8c9ee8c9c50bd197915abea46b84", + "rev": "b073ce57d4ef364cbdc5fa39232907cd3a739a2d", "type": "github" }, "original": { @@ -2078,7 +2245,7 @@ }, "zon2nix": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1758405547, diff --git a/flake.nix b/flake.nix index 0d530e0..720bd9b 100644 --- a/flake.nix +++ b/flake.nix @@ -33,7 +33,7 @@ settings.global.excludes = [ "*.age" ]; settings.formatter = { jsonc = { - command = "${pkgs.nodePackages.prettier}/bin/prettier"; + command = "${pkgs.prettier}/bin/prettier"; includes = [ "*.jsonc" ]; }; scripts = { @@ -49,7 +49,6 @@ nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; nixpkgs-r.url = "github:NixOS/nixpkgs/nixos-25.11"; - nixpkgs-new-libinput.url = "github:skowalak/nixpkgs/libinput-update-1.31.0"; home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; @@ -106,8 +105,7 @@ hexecute.url = "github:ThatOtherAndrew/Hexecute"; kimi-cli.url = "github:MoonshotAI/kimi-cli"; awww.url = "git+https://codeberg.org/LGFae/awww"; - # waydeeper.url = "git+file:///home/eden/Repos/waydeeper-rust"; waydeeper.url = "github:EdenQwQ/waydeeper"; - driftwm.url = "github:malbiruk/driftwm"; + hermes-agent.url = "github:NousResearch/hermes-agent"; }; } diff --git a/home/programs/browser/firefox.nix b/home/programs/browser/firefox.nix index 5ebc86a..392e203 100644 --- a/home/programs/browser/firefox.nix +++ b/home/programs/browser/firefox.nix @@ -2,6 +2,7 @@ { programs.firefox = { enable = true; + configPath = ".mozilla/firefox"; profiles.default = { isDefault = true; settings = { diff --git a/home/programs/coding/misc.nix b/home/programs/coding/misc.nix index 12b802e..573d41f 100644 --- a/home/programs/coding/misc.nix +++ b/home/programs/coding/misc.nix @@ -4,7 +4,7 @@ alejandra nixfmt texlab - nodePackages.prettier + prettier julia-bin ]; } diff --git a/home/programs/desktop/default.nix b/home/programs/desktop/default.nix index 919f3ce..f9dc0a2 100644 --- a/home/programs/desktop/default.nix +++ b/home/programs/desktop/default.nix @@ -12,41 +12,16 @@ # ./scroll # ./mango ]; - home.packages = - with pkgs; - let - system = pkgs.stdenv.hostPlatform.system; - newLibinput = inputs.nixpkgs-new-libinput.legacyPackages.${system}.libinput; - driftwm-fixed = inputs.driftwm.packages.${system}.default.overrideAttrs (oldAttrs: { - buildInputs = (builtins.filter (p: (p.pname or "") != "libinput") oldAttrs.buildInputs) ++ [ - newLibinput - ]; - postFixup = '' - patchelf --add-rpath "${ - pkgs.lib.makeLibraryPath ( - (builtins.filter (p: (p.pname or "") != "libinput") oldAttrs.buildInputs) ++ [ newLibinput ] - ) - }" $out/bin/driftwm - ''; - cargoDeps = pkgs.rustPlatform.importCargoLock { - lockFile = "${inputs.driftwm}/Cargo.lock"; - outputHashes = { - "smithay-drm-extras-0.1.0" = "sha256-6iTLezGeSnefQbCoZHsXayinjFvrsC7ezW88tlZx9Y0="; - }; - }; - }); - in - [ - awww - swaybg - kanshi - wlsunset - xwayland-satellite - wmname - inputs.hexecute.packages.${system}.default - driftwm-fixed - halley - ]; + home.packages = with pkgs; [ + awww + swaybg + kanshi + wlsunset + xwayland-satellite + wmname + inputs.hexecute.packages.${system}.default + halley + ]; home.file."scripts" = { source = ./scripts; recursive = true; diff --git a/home/programs/desktop/niri/waybar.nix b/home/programs/desktop/niri/waybar.nix index d8b90c5..a42ab19 100644 --- a/home/programs/desktop/niri/waybar.nix +++ b/home/programs/desktop/niri/waybar.nix @@ -135,10 +135,7 @@ in { programs.waybar = { # enable = true; - systemd = { - enable = true; - target = config.wayland.systemd.target; - }; + systemd.enable = true; }; home.file = { ".config/waybar/config.jsonc".text = diff --git a/home/programs/utils/ai.nix b/home/programs/utils/ai.nix index 0d54650..cde739c 100644 --- a/home/programs/utils/ai.nix +++ b/home/programs/utils/ai.nix @@ -19,6 +19,7 @@ MOONSHOT_API_KEY = "$(cat ${config.age.secrets.kimi_token.path})"; TELEGRAM_BOT_TOKEN = "$(cat ${config.age.secrets.telegram_bot_token.path})"; OPENROUTER_API_KEY = "$(cat ${config.age.secrets.openrouter_token.path})"; + XIAOMI_API_KEY = "$(cat ${config.age.secrets.mimo_token.path})"; }; home.packages = with pkgs; [ inputs.kimi-cli.packages.${pkgs.stdenv.hostPlatform.system}.default @@ -26,5 +27,6 @@ opencode codex gitingest + inputs.hermes-agent.packages.${pkgs.stdenv.hostPlatform.system}.default ]; } diff --git a/home/programs/utils/default.nix b/home/programs/utils/default.nix index 10875ba..0a24a49 100644 --- a/home/programs/utils/default.nix +++ b/home/programs/utils/default.nix @@ -50,6 +50,7 @@ upower android-tools tree-sitter + inputs.agenix.packages.${pkgs.stdenv.hostPlatform.system}.agenix ]; imports = [ ./eye-candy.nix diff --git a/hosts/default.nix b/hosts/default.nix index 6be01c6..0c258ce 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -16,6 +16,7 @@ let sharedHomeModules = [ ../home ../nix/nixpkgs.nix + ../nix/github_token.nix inputs.stylix.homeModules.stylix inputs.niri.homeModules.niri inputs.nixvim.homeModules.nixvim @@ -59,6 +60,7 @@ let extraSpecialArgs = { inherit inputs + nixpkgs self host user diff --git a/hosts/xiaomi/home.nix b/hosts/xiaomi/home.nix index 800b1eb..13debc0 100644 --- a/hosts/xiaomi/home.nix +++ b/hosts/xiaomi/home.nix @@ -37,7 +37,7 @@ stylix.cursor = { package = pkgs.hachiyo-cursors; name = "hachiyo"; - size = 32; + size = 12; }; home.stateVersion = "26.05"; } diff --git a/nix/github_token.nix b/nix/github_token.nix new file mode 100644 index 0000000..ffda614 --- /dev/null +++ b/nix/github_token.nix @@ -0,0 +1,9 @@ +{ config, pkgs, ... }: +{ + nix = { + package = pkgs.nix; + extraOptions = '' + !include ${config.age.secrets.nix_github_token.path} + ''; + }; +} diff --git a/os/programs/default.nix b/os/programs/default.nix index 7d1ba15..53ef349 100644 --- a/os/programs/default.nix +++ b/os/programs/default.nix @@ -12,13 +12,5 @@ services.displayManager.sessionPackages = [ pkgs.halley - (inputs.driftwm.packages.${pkgs.system}.default.overrideAttrs (oldAttrs: { - cargoDeps = pkgs.rustPlatform.importCargoLock { - lockFile = "${inputs.driftwm}/Cargo.lock"; - outputHashes = { - "smithay-drm-extras-0.1.0" = "sha256-6iTLezGeSnefQbCoZHsXayinjFvrsC7ezW88tlZx9Y0="; - }; - }; - })) ]; } diff --git a/overlays/default.nix b/overlays/default.nix index 1a977e5..0840f9d 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -29,7 +29,6 @@ passthru.providedSessions = [ "scroll" ]; }); inherit (inputs.awww.packages.${final.stdenv.hostPlatform.system}) awww; - inherit (inputs.nixpkgs-new-libinput.legacyPackages.${final.stdenv.hostPlatform.system}) libinput; libfprint = prev.libfprint.overrideAttrs (oldAttrs: { src = final.fetchFromGitLab { domain = "gitlab.freedesktop.org"; diff --git a/secrets/age.nix b/secrets/age.nix index 2d05e0e..b4090de 100644 --- a/secrets/age.nix +++ b/secrets/age.nix @@ -11,5 +11,7 @@ kimi_token.file = ./kimi_token.age; telegram_bot_token.file = ./telegram_bot_token.age; openrouter_token.file = ./openrouter_token.age; + mimo_token.file = ./mimo_token.age; + nix_github_token.file = ./nix_github_token.age; }; } diff --git a/secrets/mimo_token.age b/secrets/mimo_token.age new file mode 100644 index 0000000000000000000000000000000000000000..e5eb361dbd0c3b73f6905456374784c9d50d5065 GIT binary patch literal 484 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCUlEy(k`)({!~&m`jFRAN7jN&hG~jL!IbQWEHyU`@> zLP9uS?9##)-|YQPT7LK`8~R ssh-ed25519 MpnI9A /m+EwfqTz6u/zLr2g4qxkY4DPaAAw4WiPfXAbsakXWE ++fvfGOojcHyJDItmhnK6N5j71URdjop6B4aEAsbCoAY +-> ssh-ed25519 6VlDkQ djRVVZYwO5QdOpngflqKu/ockBmaUEjlfy4APGnqATM +DTN0zMvSC7ElLiwPP+YEU6fN2diOo2rRVRMc5GYSeC0 +-> ssh-ed25519 zU8FRQ V0imp+q/Ahc2bos6xHB84IP4iU0fkYavKwpLVSsx5jE +387ekiq2J197uygifijcTB+x3Wk2WWlZHYzN4u44Mcw +--- +Dq+rl+Rzfl9pGs3sSeV+3uHuAwF34WEHk7r2cqDY2Q +}@-nM7E&GA*fV画F