From 105e573c537dc17e5431b4c642300c4af23fc4fd Mon Sep 17 00:00:00 2001 From: m3tm3re Date: Sun, 15 Feb 2026 18:16:11 +0100 Subject: [PATCH] Switch to local m3ta-nixpkgs and enable services Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode) Co-authored-by: Sisyphus --- flake.lock | 77 +++++++++++++++------------- flake.nix | 4 +- home/features/coding/default.nix | 2 +- hosts/m3-ares/services/tailscale.nix | 2 +- 4 files changed, 46 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index d8db55b..557da2a 100644 --- a/flake.lock +++ b/flake.lock @@ -24,14 +24,17 @@ "agents": { "flake": false, "locked": { - "lastModified": 1770833637, - "narHash": "sha256-T97AWZYIQE1mI9eL1dfuOJ4YPkpU6kfETi1QZsC0WyE=", - "path": "/home/m3tam3re/p/AI/AGENTS", - "type": "path" + "lastModified": 1770836286, + "narHash": "sha256-8vdozOXwlpOjSRFu6H+HnGByGCnBV+ggX4uIRHUfiaY=", + "ref": "refs/heads/master", + "rev": "94b89da5335da059c75bccc686be91a923726075", + "revCount": 48, + "type": "git", + "url": "https://code.m3ta.dev/m3tam3re/AGENTS" }, "original": { - "path": "/home/m3tam3re/p/AI/AGENTS", - "type": "path" + "type": "git", + "url": "https://code.m3ta.dev/m3tam3re/AGENTS" } }, "base16-schemes": { @@ -238,11 +241,12 @@ "m3ta-nixpkgs": { "inputs": { "nixpkgs": "nixpkgs_3", + "nixpkgs-master": "nixpkgs-master", "opencode": "opencode" }, "locked": { - "lastModified": 1770832025, - "narHash": "sha256-b6iPOU2ruuSDscCsIvNCO9/vhOsUCYtSaHlQbJ7PTnE=", + "lastModified": 1770918709, + "narHash": "sha256-X1vykZe7eFZHCPniWPTB4uWCl78BAx/vFZoK15gvSBY=", "path": "/home/m3tam3re/p/NIX/nixpkgs", "type": "path" }, @@ -288,7 +292,7 @@ "nixos-generators": { "inputs": { "nixlib": "nixlib", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1769813415, @@ -384,6 +388,22 @@ } }, "nixpkgs-master": { + "locked": { + "lastModified": 1770917518, + "narHash": "sha256-XSwv/tVrNo/L8SPH8Lx9xZH1PrZd/3Z3J/0SH7Xertg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3f4a3c08f2f318ee29fc8a2689f390071a94aaf0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-master_2": { "locked": { "lastModified": 1770276510, "narHash": "sha256-1z3GzjNxm2QREjQC579bD6oFAwkLBjJIUt5al08n2oo=", @@ -448,22 +468,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1770073757, - "narHash": "sha256-Vy+G+F+3E/Tl+GMNgiHl9Pah2DgShmIUBJXmbiQPHbI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "47472570b1e607482890801aeaf29bfb749884f6", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1736657626, "narHash": "sha256-FWlPMUzp0lkQBdhKlPqtQdqmp+/C+1MBiEytaYfrCTY=", @@ -479,7 +483,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1770197578, "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", @@ -495,7 +499,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1710272261, "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", @@ -534,19 +538,22 @@ }, "opencode": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": [ + "m3ta-nixpkgs", + "nixpkgs-master" + ] }, "locked": { - "lastModified": 1770824220, - "narHash": "sha256-+vvNQzfhuP91mK/BjBufWGdS+2vHJAtB8iDl14z4y48=", + "lastModified": 1770875904, + "narHash": "sha256-8ZEVlGe1saA/2KtDTKgkwWfpLCbxfwFip+m+3FlQQK0=", "owner": "anomalyco", "repo": "opencode", - "rev": "42bea5d297125c4f8ea5c1d6055fa06829de0a51", + "rev": "03de51bd3cf9e05bd92c9f51763b74a3cdfbe61a", "type": "github" }, "original": { "owner": "anomalyco", - "ref": "v1.1.59", + "ref": "v1.1.60", "repo": "opencode", "type": "github" } @@ -561,11 +568,11 @@ "m3ta-nixpkgs": "m3ta-nixpkgs", "nix-colors": "nix-colors", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nixpkgs-45570c2": "nixpkgs-45570c2", "nixpkgs-9e58ed7": "nixpkgs-9e58ed7", "nixpkgs-locked": "nixpkgs-locked", - "nixpkgs-master": "nixpkgs-master", + "nixpkgs-master": "nixpkgs-master_2", "nixpkgs-stable": "nixpkgs-stable", "nur": "nur", "rose-pine-hyprcursor": "rose-pine-hyprcursor" @@ -574,7 +581,7 @@ "rose-pine-hyprcursor": { "inputs": { "hyprlang": "hyprlang", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "utils": "utils" }, "locked": { diff --git a/flake.nix b/flake.nix index 950b502..71ee96d 100644 --- a/flake.nix +++ b/flake.nix @@ -22,8 +22,8 @@ nixpkgs-9e58ed7.url = "github:nixos/nixpkgs/9e58ed7ba759d81c98f033b7f5eba21ca68f53b0"; nixpkgs-master.url = "github:nixos/nixpkgs/master"; - m3ta-nixpkgs.url = "git+https://code.m3ta.dev/m3tam3re/nixpkgs"; - # m3ta-nixpkgs.url = "path:/home/m3tam3re/p/NIX/nixpkgs"; + # m3ta-nixpkgs.url = "git+https://code.m3ta.dev/m3tam3re/nixpkgs"; + m3ta-nixpkgs.url = "path:/home/m3tam3re/p/NIX/nixpkgs"; # nur = { url = "github:nix-community/NUR"; diff --git a/home/features/coding/default.nix b/home/features/coding/default.nix index 7fea08a..0090112 100644 --- a/home/features/coding/default.nix +++ b/home/features/coding/default.nix @@ -23,7 +23,7 @@ torch srt ])) - # opencode-desktop + opencode-desktop pyrefly nixd alejandra diff --git a/hosts/m3-ares/services/tailscale.nix b/hosts/m3-ares/services/tailscale.nix index d723f16..e120ef1 100644 --- a/hosts/m3-ares/services/tailscale.nix +++ b/hosts/m3-ares/services/tailscale.nix @@ -1,6 +1,6 @@ {config, ...}: { services.tailscale = { - enable = false; + enable = true; authKeyFile = config.age.secrets.tailscale-key.path; useRoutingFeatures = "both"; extraUpFlags = [