From 1f4f716de1e890bea7f720c9cb099ac3d2624571 Mon Sep 17 00:00:00 2001 From: Doloro1978 Date: Fri, 24 Jul 2026 13:18:22 +0100 Subject: [PATCH] meow --- config/hosts/aspects/doloro-desktop/home.nix | 3 +- config/hosts/aspects/doloro-desktop/host.nix | 20 +- config/inputs.nix | 1 + config/modules/ai/ai.nix | 32 +-- config/modules/ai/pi.nix | 227 ++++++++++++++++++- config/modules/hyprland/hyprland.nix | 2 +- config/modules/secrets/content/secrets.yaml | 6 +- flake.lock | 189 ++++++++------- flake.nix | 1 + 9 files changed, 352 insertions(+), 129 deletions(-) diff --git a/config/hosts/aspects/doloro-desktop/home.nix b/config/hosts/aspects/doloro-desktop/home.nix index 9f684c7..375b24e 100644 --- a/config/hosts/aspects/doloro-desktop/home.nix +++ b/config/hosts/aspects/doloro-desktop/home.nix @@ -39,9 +39,10 @@ # modules.easyeffects # modules.lavd modules.ai + modules.pi-coding # modules.omp modules.podman - + # ]; nixos = { diff --git a/config/hosts/aspects/doloro-desktop/host.nix b/config/hosts/aspects/doloro-desktop/host.nix index 9cc61e9..19e80b2 100644 --- a/config/hosts/aspects/doloro-desktop/host.nix +++ b/config/hosts/aspects/doloro-desktop/host.nix @@ -38,14 +38,26 @@ "rd.systemd.show_status=auto" ]; - services.openssh.enable = true; +services.openssh.enable = true; - networking.networkmanager.enable = true; +xdg.portal = { + enable = true; + configPackages = [ pkgs.xdg-desktop-portal-wlr ]; + wlr = { + enable = true; + }; +}; + +networking.networkmanager.enable = true; networking.firewall.enable = false; - security.rtkit.enable = true; +environment.systemPackages = with pkgs; [ polkit_gnome ]; - hardware.graphics = { +security.rtkit.enable = true; + +security.polkit.enable = true; + +hardware.graphics = { enable = true; extraPackages = with pkgs; [ libva-minimal diff --git a/config/inputs.nix b/config/inputs.nix index 2889ae5..f99526b 100644 --- a/config/inputs.nix +++ b/config/inputs.nix @@ -6,5 +6,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; den.url = "github:vic/den?ref=8101ec865c0bf4027d40b9fd8951e3e435a86d64"; + nixpkgs-master.url = "github:NixOS/nixpkgs/master"; }; } diff --git a/config/modules/ai/ai.nix b/config/modules/ai/ai.nix index 6f6bd4a..b2f80bc 100644 --- a/config/modules/ai/ai.nix +++ b/config/modules/ai/ai.nix @@ -54,7 +54,8 @@ "@xberg-io/opencode-xberg" "@xberg-io/opencode-crawlberg" "@xberg-io/opencode-html-to-markdown" - "@xberg-io/opencode-liter-llm" + # "@xberg-io/opencode-liter-llm" + "opencode-plugin-litellm@latest" "@xberg-io/opencode-tree-sitter-language-pack" ]; provider.litellm = { @@ -64,35 +65,6 @@ baseURL = "https://9f5db439.fwds.scug.io/v1"; apiKey = "{env:SCUG_IO_API_KEY}"; }; - models = { - "openai/Qwen3.6-35B-A3B" = { - id = "Qwen3.6-35B-A3B"; - name = "Qwen3.6-35B-A3B"; - family = "Qwen"; - limit = { - context = 262144; - input = 262144; - output = 16384; - }; - cost = { - input = 0.00002; - output = 0.00006; - }; - provider = { - api = "openai"; - }; - modalities = { - input = [ "text" ]; - output = [ "text" ]; - }; - status = "active"; - reasoning = true; - temperature = false; - tool_call = true; - attachment = false; - experimental = false; - }; - }; }; }; }; diff --git a/config/modules/ai/pi.nix b/config/modules/ai/pi.nix index 3455821..9d6b8f4 100644 --- a/config/modules/ai/pi.nix +++ b/config/modules/ai/pi.nix @@ -1,10 +1,227 @@ -{ den, modules, ... }: +{ + den, + modules, + inputs, + ... +}: { modules.pi-coding = { - homeManager = { - programs.pi-coding-agent = { - enable = true; + homeManager = + { pkgs, ... }: + { + programs.pi-coding-agent = { + enable = true; + extraPackages = [ + pkgs.nodejs + # pkgs.lean-lsp-mcp + ]; + package = pkgs.pi-coding-agent.overrideAttrs ( + new: old: { + version = "0.81.1"; + + src = pkgs.fetchFromGitHub { + owner = "earendil-works"; + repo = "pi"; + tag = "v${new.version}"; + hash = "sha256-xo3uoR7HceOCL3wqoMcacOe8WXP1o7ReAXne5t6Hgao="; + }; + + npmDepsHash = "sha256-lzKQZbnITzgV9koucsMno6f61ubBLYUcwQEXtak1r1s="; + # npmDepsHash = pkgs.lib.fakeHash; + + # npmDepsHash = "sha256-lDoj/94tjJd4ZGU9WgrMOqNSmdpeCljU4c6jGX+TSDY="; + + npmDeps = pkgs.fetchNpmDeps { + inherit (new) src; + name = "pi-coding-agent-0.81.1-npm-deps"; + hash = new.npmDepsHash; + }; + modelData = pkgs.fetchurl { + url = "https://registry.npmjs.org/@earendil-works/pi-ai/-/pi-ai-${new.version}.tgz"; + hash = "sha256-x53MD5DU370ZdNoz36P+OWZjGVpoM5sfVcEU2/ckDy8="; + # hash = pkgs.lib.fakeHash; + }; + preConfigure = '' + mkdir -p packages/ai/src/providers/data + tar --extract --gzip --file=${new.modelData} \ + --directory=packages/ai/src/providers/data \ + --strip-components=4 \ + package/dist/providers/data + ''; + passthru.updateScript = pkgs.nix-update-script { + extraArgs = [ + "--custom-dep" + "modelData" + ]; + }; + } + ); + settings = { + "litellm" = { + "providers" = { + "litellm" = { + "displayName" = "scuggo"; + "baseUrl" = "https://9f5db439.fwds.scug.io"; + "apiKey" = "$SCUG_IO_API_KEY"; + "compat" = { + "sendSessionAffinityHeaders" = true; + }; + }; + }; + "skills" = { + "enabled" = true; + }; + "compat" = { + "sendSessionAffinityHeaders" = true; + }; + "mcp" = { + "enabled" = true; + }; + "showCacheMissNotices" = true; + "qol" = { + "permissionGate" = { + "enabled" = true; + "commands" = "rm -Rf,rm -rf,sudo,chmod,chown,mkfs,dd,shutdown,reboot,poweroff"; + "previewLines" = 12; + "previewChars" = 1200; + }; + }; + }; + "mcp" = { + "enabled" = true; + }; + packages = [ + # "npm:@odinlayer/pi-provider-litellm" + # "npm:pi-provider-litellm" + "npm:@juanibiapina/pi-extension-settings" + "git:github.com/balcsida/pi-provider-litellm" + # "npm:pi-web-access" + # "npm:@gotgenes/pi-permission-system" + "npm:@vanillagreen/pi-qol" + "npm:pi-vitals" + "npm:pi-spark" + "npm:@zhushanwen/pi-context-engineering" + "npm:pi-caveman" + "npm:@tmustier/pi-usage-extension" + "npm:@heyhuynhgiabuu/pi-pretty" + "npm:pi-lens" + # "npm:pi-lean-ctx" + # "npm:@rohaquinlop/pi-deepseek-cache" + "npm:pi-cache-optimizer" + ]; + }; + context = "Heavily prefer to use any appropriate tools instead of raw cmd"; + }; + + # pi-vitals config + home.file.".pi/agent/powerline.json" = { + text = builtins.toJSON { + leftSegments = [ + "pi" + "separator" + "model" + "thinking" + "ext_status" + "separator" + "path" + "git" + "separator" + "token_total" + "token_in" + "token_out" + "cache_read" + "cache_write" + ]; + rightSegments = [ + "separator" + "cost" + "context_pct" + ]; + icons = { + pi = "π"; + model = "◈"; + thinking = "🧠"; + folder = "📁"; + repo = "📦"; + git = "⎇"; + tokens = "⊛"; + input = "↑"; + output = "↓"; + cacheRead = "↙"; + cacheWrite = "↗"; + contextPct = "◫"; + cost = "$"; + separator = "│"; + }; + colors = { + pi = "accent"; + model = "#d787af"; + path = "#00afaf"; + git = "success"; + gitDirty = "warning"; + gitClean = "success"; + thinking = "muted"; + context = "dim"; + contextWarn = "warning"; + contextError = "error"; + cost = "text"; + tokens = "muted"; + separator = "dim"; + }; + segmentOptions = { + path = { + mode = "basename"; + }; + git = { + showBranch = true; + showStaged = true; + showUnstaged = true; + showUntracked = true; + }; + context_pct = { + showAutoIcon = false; + }; + }; + }; + }; + + # pi-spark config + home.file.".pi/agent/spark.json" = { + text = builtins.toJSON { + editor = { + spinner = "tildes"; + }; + footer = false; + presets = { + "scuggo" = { + provider = "litellm"; + model = "meow"; + thinkingLevel = "medium"; + }; + "claude" = { + provider = "anthropic"; + model = "claude-opus-4-8"; + thinkingLevel = "high"; + }; + "gpt" = { + provider = "openai-codex"; + model = "gpt-5.5"; + thinkingLevel = "medium"; + }; + }; + recap = { + idle = "5m"; + provider = "openai-codex"; + model = "gpt-5.4-mini"; + thinkingLevel = "off"; + }; + title = { + provider = "openai-codex"; + model = "gpt-5.4-mini"; + thinkingLevel = "off"; + }; + }; + }; }; - }; }; } diff --git a/config/modules/hyprland/hyprland.nix b/config/modules/hyprland/hyprland.nix index 264cb70..a3fcab7 100644 --- a/config/modules/hyprland/hyprland.nix +++ b/config/modules/hyprland/hyprland.nix @@ -51,7 +51,7 @@ wayland.windowManager.hyprland = { enable = true; systemd.variables = ["--all"]; - configType = "hyprlang"; + configType = "lua"; }; }; }; diff --git a/config/modules/secrets/content/secrets.yaml b/config/modules/secrets/content/secrets.yaml index 906e40e..8a044bc 100644 --- a/config/modules/secrets/content/secrets.yaml +++ b/config/modules/secrets/content/secrets.yaml @@ -3,7 +3,7 @@ root-hashed_password: ENC[AES256_GCM,data:vzVtz1Ht4XD+omdKjU/Zvoaftq8jKE4kxOjAGZ wakatime-scug-io-api-key: ENC[AES256_GCM,data:XQUccNW4210U8ZpHSGVcsdbAirzyTvmcy4y6emk7n4N6MO/W,iv:9/f9ceLshA7l8hJB+IDIPvEwYwSkFlPOLmpvtYXLTpU=,tag:x7hESZCouzYVNef2C+iCSA==,type:str] meow: ENC[AES256_GCM,data:JVzenw==,iv:oCOo9//r5s2K4pSeH5UNEj0LL+9h2yq0G0DPOfwjmyQ=,tag:0gu9FNOrjQ8fpB+B+RbGSg==,type:str] meoww: ENC[AES256_GCM,data:WPeszDfMWxY=,iv:JJMOror5wj7cTNKfrUj2LDXlO3WCKzb7jk4AeZ0oD+Q=,tag:qs3oyM7K1FGy5cXvS6OHpQ==,type:str] -scug-io-ai-key: ENC[AES256_GCM,data:15YxkgOe2+Kia9z52bYbmrc8SQzpjrZKmQ==,iv:+iMkNsqGVC32THO0nvDBrRby+mKj09DvWEQJn+K6at8=,tag:mI7EvyasCKHhNc55UScCXA==,type:str] +scug-io-ai-key: ENC[AES256_GCM,data:b2AT2+A5eoGa1eZsCYKDFg449sOgffDcQA==,iv:NDIS3x1unq6/UtjtsyBTHx5v12utagDA3BbNzs5v3L0=,tag:MhbJGATIDWyOZUqXqRAeVA==,type:str] sops: age: - enc: | @@ -69,7 +69,7 @@ sops: 61QsSqCuJyEwSPpOzeWa5NChcCjitOUG1jEMsSHlpIslKA1P7g/P9g== -----END AGE ENCRYPTED FILE----- recipient: age1kc0xu0ue2nrrr7w4gam7wlzackv8jv243rxwwndgxjqklgtnp5csdtpgzp - lastmodified: "2026-07-17T08:50:10Z" - mac: ENC[AES256_GCM,data:WQJ8Ez/0iaRSvziyanxNUmrahir/Ocu+Dysh+qtj3FFhLMhLtPZqoX92L6Eia5pbfXOZcYZUN7uUMmSBn22JCiYUtgoeVjXV8el6GVfi1LHCGKfL25ohsjsTczJXV/+tBlVrrB3MGls9AjFqDV9QnoS/3X/a1MIRGKS3GY+OMAg=,iv:Id9I6BlrzfLpMcy1EmdVGgr9jYSf9JCsOrSiIglRTNc=,tag:gXkaSz5Z8K38Cde6gy3Zvg==,type:str] + lastmodified: "2026-07-22T22:45:05Z" + mac: ENC[AES256_GCM,data:jfbsnWcZ6yJSUbRn8VbONhj3oin1+DsHzJ590BbdPtikZwjD/0f06NQ86b0DI5/M+LKP4Dy5Cyf7xyJ99iWuOKbF9y12qK17IqMaNZCmPkw8Y+v7q38ESsW/Iizr3hfQ2L2GwJNTWsoifCeQphxGby7s2lKjMPYGKhYrgicZ5Fs=,iv:bbL+59d0S1fdfDInLS5z9Vx+AVW6nb0z2BNgZ+5PbUM=,tag:jJYnLsORyEuClRm/t4mwcA==,type:str] unencrypted_suffix: _unencrypted version: 3.13.2 diff --git a/flake.lock b/flake.lock index d29beca..b07f896 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1783566754, - "narHash": "sha256-EyVTx67qTNB2utnXRUgOWnaZxV6c07XE2rVCq/qgWxI=", + "lastModified": 1784569577, + "narHash": "sha256-pmwdKRPSavZ98QJv/Xlbj2U60AZ/+P4aevLBZ71jDaA=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "4065d7e175fb182a2e30b982b0d8121c97c8d46b", + "rev": "5ca2493c51b1cadec102c9c549345b43f669960b", "type": "github" }, "original": { @@ -136,11 +136,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1783564544, - "narHash": "sha256-oOgjJXRLkTDfOcgPQpHF7MwIBPOf1pHT77EC/YVfkm4=", + "lastModified": 1783974915, + "narHash": "sha256-kReDG2emoGxaG0Lr8tt9jUuu1kQu07yAJZhVWfbwxYc=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "c624c9c8cffc11dd619a7d37f903556c60d24e9c", + "rev": "ea739d734ec179864b21446856315bc49f7c52fa", "type": "github" }, "original": { @@ -172,11 +172,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1783857890, - "narHash": "sha256-rD4KU1jXXUuUP7ZWuxp8xoroXEne+NCeGrb77ZGhGvM=", + "lastModified": 1784874452, + "narHash": "sha256-tY44xXG2zeAXAEbxcLfspV0sr54aLQk334rHU+erlqw=", "owner": "Mic92", "repo": "direnv-instant", - "rev": "4d440be96bc6294c891f309d3c944bef64879c9a", + "rev": "2d6dab5941c8472e6a14b641bde9d64bea1be1f5", "type": "github" }, "original": { @@ -206,11 +206,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1779670703, - "narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=", + "lastModified": 1782007937, + "narHash": "sha256-PbnJr+eB+9Czol3ReI83dUgEhcn0sDK6TSy6ODTQm88=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9", + "rev": "981bd332015397fb1ca033fa982bd61635160c78", "type": "github" }, "original": { @@ -385,11 +385,11 @@ ] }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -453,18 +453,20 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1767737596, - "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", + "host": "gitlab.gnome.org", + "lastModified": 1776175984, + "narHash": "sha256-RJFlFW8GiMei6oqUGrMkGEvVqOH8U7Q8abc1yK4VKD8=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "github" + "rev": "e0fdc4c13250e9a9b8ea9594c83925274f4a5dca", + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", + "ref": "50.1", "repo": "gnome-shell", - "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "github" + "type": "gitlab" } }, "heliumFlake": { @@ -476,11 +478,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1784431410, - "narHash": "sha256-G671MLe+jUgQWte0S182mDB8vlxfbyY9hH88N5ZjLXU=", + "lastModified": 1784863038, + "narHash": "sha256-mWZeP4v2Fpx7EFyL2KnQKDt8JF5GokF/XtgA9RIEfMU=", "owner": "vikingnope", "repo": "helium-browser-nix-flake", - "rev": "52e6bfd6e6b5eaab2e96095f7d936e5bf6a72f24", + "rev": "b282f9f276c6593e1e7f575d653e4ff2b4f71256", "type": "github" }, "original": { @@ -496,11 +498,11 @@ ] }, "locked": { - "lastModified": 1784546264, - "narHash": "sha256-jxVr5EHMYAOkFvS2k0abIvt6NqyshyWmiHHzV17sT2g=", + "lastModified": 1784877405, + "narHash": "sha256-W649GocILahx7Vb/JMx834217+OLKBrq014VmC/8+NM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e3dea8e4792b09a6c0eb5836b0284ad05b1acba0", + "rev": "32de400b6ac9f43042bca706f4a64f6ad08117e8", "type": "github" }, "original": { @@ -584,11 +586,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1784574265, - "narHash": "sha256-3YP21xUS7i/FOZRNh3SqXAw7Icw8biu3BWN+YWqLMkI=", + "lastModified": 1784887189, + "narHash": "sha256-EcnF0oQE0QSL524UsCvvAtXU3GWd6QNyhMMldDT407g=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "2174f26a142d32823ceb8d7039e39eef52dbd050", + "rev": "e820db90cf9a87db53690fd92ec328c2bd2f486d", "type": "github" }, "original": { @@ -929,11 +931,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1784541752, - "narHash": "sha256-iONvlcXqaIUzEwZHabWLMtE90kqH3/iBmg5lQHZ1StY=", + "lastModified": 1784874881, + "narHash": "sha256-u4jhSIf/Un0qZB+Cn3hTTaHSI20XeAxYbA5o4faqdJs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "85a12e471a13eff3a3c476783a5d1cb0702c9da9", + "rev": "ef7a2a3d719af46b906c22a3ebfb7d65627b2cd2", "type": "github" }, "original": { @@ -962,11 +964,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1784456420, - "narHash": "sha256-38yvDuO09V/GG19oJO+B5nn38NhvvZEWKRGFE4WPUi4=", + "lastModified": 1784570726, + "narHash": "sha256-9EMn69JBcFWFgUM7f0VBAX+jBby5b9H3M59U75+5yI4=", "owner": "YaLTeR", "repo": "niri", - "rev": "f036de655d309edc13fef545a3809330796cbe83", + "rev": "7f26c3ee804fb6ed458ef7fb0e3c794f14e0b3bc", "type": "github" }, "original": { @@ -984,11 +986,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1783794640, - "narHash": "sha256-SgzzS5GtMFv323ritWP8A3rwhjphB7AYTfHLNSXGX3c=", + "lastModified": 1784832578, + "narHash": "sha256-3gkkqfiKHxqqnfKuzmqgpb7atWcdxoYrpTrfNCQAWxY=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "6472f543b68e0b874603ad944419747815cfeb7a", + "rev": "7c0ff5c1e38d6e3b63c003ce5e600cd3df3e48dd", "type": "github" }, "original": { @@ -1019,11 +1021,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1784310968, - "narHash": "sha256-rkSPTePrKqs4dg+i7ZFCq93+HrClac6oSwXX927SVjA=", + "lastModified": 1784723954, + "narHash": "sha256-1CfD8ZUjCkTgjsneLZ/lxCHhgDfqxxE7/GX0MmsgiqA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "779c32a00155994c86cde8213a8dd4df139d4355", + "rev": "a017f5b72210026af5b3ac5949f08d94380a6fbd", "type": "github" }, "original": { @@ -1087,11 +1089,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1784058842, - "narHash": "sha256-3u3tvbCIAid3Mv7RrJx13jusIEQC/HeKYhO/SUSxR3A=", + "lastModified": 1784642409, + "narHash": "sha256-hcbDqFuySAJawljt5r0sKBCJKYnbtGD0T/ZIozH1Dq0=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "24c8dc8e0f2170e1a377be24dfadc7d9d21dc1ad", + "rev": "eaeb18da90024448a60eb1ec7132eafa4003404e", "type": "github" }, "original": { @@ -1102,11 +1104,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1783776592, - "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", + "lastModified": 1784497964, + "narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", + "rev": "241313f4e8e508cb9b13278c2b0fa25b9ca27163", "type": "github" }, "original": { @@ -1118,11 +1120,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1784255083, - "narHash": "sha256-0Jz8G3+3g6i/l4aISUri0EidLnREelCff0m6+pE6aZg=", + "lastModified": 1784755387, + "narHash": "sha256-uxq8JKEE6bjRst96QKwH5snLXC5QkrqoY+CYuhGqGQg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc51889f81924f15fba77a3c0b79cfb3f78fe0d4", + "rev": "2b7a84e696b76759b60bea1eafd62fa34fb96a6e", "type": "github" }, "original": { @@ -1147,6 +1149,22 @@ "type": "github" } }, + "nixpkgs-master": { + "locked": { + "lastModified": 1784887191, + "narHash": "sha256-WMq80/S9JZoTOn7Cm61fx/dQeJU/l26xUGUX4EU+d0I=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "dae023c3459276c9c615b2f0f6448f2ef8365fe2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1782847189, @@ -1165,11 +1183,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1784497964, - "narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=", + "lastModified": 1784796856, + "narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "241313f4e8e508cb9b13278c2b0fa25b9ca27163", + "rev": "e2587caef70cea85dd97d7daab492899902dbf5d", "type": "github" }, "original": { @@ -1287,11 +1305,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1783760736, - "narHash": "sha256-PEXS6z/zIvH+O7J3Ua3N2OUE7IvMhhghwtKxZhVfm5U=", + "lastModified": 1784800284, + "narHash": "sha256-aegW1E+2ZJbIWTi6lRGfUD77qclmKARWJvRolEWmY9s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bbb4df715cb62e53cd329090c2b69eb07f2bddac", + "rev": "e77b9866887df0d9759099cef8e2de0845e70451", "type": "github" }, "original": { @@ -1355,11 +1373,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1784057377, - "narHash": "sha256-yycNej5//EsRbV10moBoh+/63vXEwZD1ZFEiRm6C9rQ=", + "lastModified": 1784814601, + "narHash": "sha256-T32JXjZ7kIbhBn8/Har171yGg6IBdl97cxAWameqZDE=", "owner": "nix-community", "repo": "nixvim", - "rev": "07180a087e4a00720dc0731cbcd8dec796974381", + "rev": "f316e949e0ed9df0e1e0bf645c6dce721d4e230e", "type": "github" }, "original": { @@ -1380,11 +1398,11 @@ ] }, "locked": { - "lastModified": 1780281641, - "narHash": "sha256-M/+hUKoKbHXpV0xGVfELbN1Ds1aoe3pL5p5/t46YhVo=", + "lastModified": 1783439237, + "narHash": "sha256-WUr8JF2v3n4Y30E5dxv4sAgNJXpVDBoCQNoQ/V4+n4o=", "owner": "nix-community", "repo": "NUR", - "rev": "30f9ae2f04174de63ba8bcf3580ca90843b28a01", + "rev": "b70bb66c7bcd162642f3a609bc16843c7059f503", "type": "github" }, "original": { @@ -1398,11 +1416,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1784415854, - "narHash": "sha256-PShHg/pFS4owK770E5HLOEViJNWl51hcEPNUO7edk2w=", + "lastModified": 1784883841, + "narHash": "sha256-BNUmV5FQJKIjEwSK2SnwTGLBo+aadSA4Nouu0OZ6qzs=", "ref": "main", - "rev": "93a71a0ab703bfb44bef2645a45dba120560877c", - "revCount": 286, + "rev": "772a34e7b07bc2e10f290783a3a6f5f053888d08", + "revCount": 304, "type": "git", "url": "https://git.molez.org/mandlm/omp-nix" }, @@ -1480,6 +1498,7 @@ "nixos-raspberrypi": "nixos-raspberrypi", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs_10", + "nixpkgs-master": "nixpkgs-master", "nixvim": "nixvim", "omp-nix": "omp-nix", "raspberry-pi-nix": "raspberry-pi-nix", @@ -1634,11 +1653,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1784059683, - "narHash": "sha256-q5MZrmKlg9A4ORx3EQcr7qkuidMU1gVZ+xJ3nCK+xgc=", + "lastModified": 1784676123, + "narHash": "sha256-ndyanKzw90yX2nUVFmTuYqXidUNymtMfgmIHyNdhht0=", "owner": "nix-community", "repo": "stylix", - "rev": "c8ccc31f3ea29dc3eb5b54945e5eb549529491d6", + "rev": "66714e5ce44269ecc58c20d9196da8dbe1b27a31", "type": "github" }, "original": { @@ -1757,11 +1776,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1777806186, - "narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=", + "lastModified": 1781968807, + "narHash": "sha256-yYO3Vw2M0y3TAUqt+9+Mj0zwP3XDTF5/PXcPhhFQ1ZM=", "owner": "tinted-theming", "repo": "schemes", - "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795", + "rev": "2ccef2f4b22e3cab5a9292811f7133a07eeba4a7", "type": "github" }, "original": { @@ -1773,11 +1792,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1778379944, - "narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=", + "lastModified": 1782012462, + "narHash": "sha256-2iDiD8DQLwS1lGuD9TS8WlvNyDoTs6krWntJbtB2zGo=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "fe0203a198690e71a5ff11e08812a4673de3678d", + "rev": "8c4e750f738a742bd73377ee41d3dadedebedef4", "type": "github" }, "original": { @@ -1789,11 +1808,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1778378178, - "narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=", + "lastModified": 1782009766, + "narHash": "sha256-VUhBjpGvWqHI7rWeyMYb/u87YJSXHKfVV6S+IelWeO8=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "9cd816033ff969415b190722cddf134e78a5665f", + "rev": "5e8350bcd354e3241ab681a265fa6ef060c40be1", "type": "github" }, "original": { @@ -1810,11 +1829,11 @@ ] }, "locked": { - "lastModified": 1780220602, - "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=", + "lastModified": 1784369104, + "narHash": "sha256-47cxbcZODibHv3rELFQ9vZly0vUNkND/atn/U7HLeb0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "db947814a175b7ca6ded66e21383d938df01c227", + "rev": "df3c0640565d04a0261253cdd89fce78ec50168a", "type": "github" }, "original": { @@ -1917,11 +1936,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1783895132, - "narHash": "sha256-Dl0Gvrig3EpE962hzF3ETPhUztlfuRhcmlpd8ioHN54=", + "lastModified": 1784679892, + "narHash": "sha256-Mb7jpqnrcYCfNSItIkkHpuR3YxWFxPuIBfcwNKlRBkk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "a2b5c635d8c8c99b286967658d0d177044887eb8", + "rev": "8d135d3b2854b30fd01ea6cd6c27e523dd50a839", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3f55a10..9d8a7f6 100644 --- a/flake.nix +++ b/flake.nix @@ -37,6 +37,7 @@ nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi/main"; nixos-wsl.url = "github:nix-community/NixOS-WSL"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-master.url = "github:NixOS/nixpkgs/master"; nixvim = { url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs";