From a12958b68fcd55a72bdd44cb8f0c55ecf94e4513 Mon Sep 17 00:00:00 2001 From: m3tm3re Date: Wed, 18 Feb 2026 16:28:31 +0100 Subject: [PATCH] chore: flake update --- flake.lock | 59 +++++----- flake.nix | 210 ++++++++++++++++++------------------ hosts/m3-kratos/default.nix | 5 +- 3 files changed, 140 insertions(+), 134 deletions(-) diff --git a/flake.lock b/flake.lock index 6212a94..12dece0 100644 --- a/flake.lock +++ b/flake.lock @@ -24,14 +24,17 @@ "agents": { "flake": false, "locked": { - "lastModified": 1771353501, - "narHash": "sha256-M7m6g10+1cMmJKp41QWy1pMsD1OZUiHjMGIsICvpE1A=", - "path": "/home/m3tam3re/p/AI/AGENTS", - "type": "path" + "lastModified": 1771353084, + "narHash": "sha256-QsrA7+md+bw1ACQeuvDn2mE5X11gM0hqVGse58spedA=", + "ref": "refs/heads/master", + "rev": "5b204c95e419eb75b04c5f85e1bd56ed56a5abe4", + "revCount": 60, + "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": { @@ -79,11 +82,11 @@ ] }, "locked": { - "lastModified": 1769524058, - "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=", + "lastModified": 1771355198, + "narHash": "sha256-89m5VKxIs8QNiIvLsxHu5NpyhDsoXTtoN801IAurnW4=", "owner": "nix-community", "repo": "disko", - "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d", + "rev": "92fceb111901a6f13e81199be4fab95fce86a5c9", "type": "github" }, "original": { @@ -159,11 +162,11 @@ ] }, "locked": { - "lastModified": 1770263241, - "narHash": "sha256-R1WFtIvp38hS9x63dnijdJw1KyIiy30KGea6e6N7LHs=", + "lastModified": 1771422582, + "narHash": "sha256-xK5kl3OBZaF1VwziVMX+SZ2LT9Fbu5o8vRDt78uR7no=", "owner": "nix-community", "repo": "home-manager", - "rev": "04e5203db66417d548ae1ff188a9f591836dfaa7", + "rev": "b3ccd4bb262f4e6d3248b46cede92b90c4a42094", "type": "github" }, "original": { @@ -242,11 +245,11 @@ "opencode": "opencode" }, "locked": { - "lastModified": 1771351183, - "narHash": "sha256-dIzUuSreb5AAp0bagYAHOPupJnAY6HL+fwdzchp7roY=", + "lastModified": 1771355771, + "narHash": "sha256-Uhq6aMCuzKqC2UIAbEkx+LQS77MGEVDEL7zpfoW6VB8=", "ref": "refs/heads/master", - "rev": "d43bb33dcb4ae358dd398166a377f00d96e1f03b", - "revCount": 118, + "rev": "dc206b13e256941298868d559fff9be31d7e0e34", + "revCount": 119, "type": "git", "url": "https://code.m3ta.dev/m3tam3re/nixpkgs" }, @@ -405,11 +408,11 @@ }, "nixpkgs-master_2": { "locked": { - "lastModified": 1770276510, - "narHash": "sha256-1z3GzjNxm2QREjQC579bD6oFAwkLBjJIUt5al08n2oo=", + "lastModified": 1771426280, + "narHash": "sha256-EJOpj/ha/y7cLBHqPWCbYh4fFM83mO/c9bYm8zVVRkY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "feb0a690655b2ef4c35843eb88c4ba415e1e8c61", + "rev": "85680c67a23fe3cc29b85d4568e984185c58e0c9", "type": "github" }, "original": { @@ -421,11 +424,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1770136044, - "narHash": "sha256-tlFqNG/uzz2++aAmn4v8J0vAkV3z7XngeIIB3rM3650=", + "lastModified": 1771208521, + "narHash": "sha256-X01Q3DgSpjeBpapoGA4rzKOn25qdKxbPnxHeMLNoHTU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e576e3c9cf9bad747afcddd9e34f51d18c855b4e", + "rev": "fa56d7d6de78f5a7f997b0ea2bc6efd5868ad9e8", "type": "github" }, "original": { @@ -485,11 +488,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -523,11 +526,11 @@ ] }, "locked": { - "lastModified": 1770270187, - "narHash": "sha256-+vK4PsLWiDZ9IO8FdBI9bmZp62Py3DPV1aa+iEueR6w=", + "lastModified": 1771425294, + "narHash": "sha256-owiQE9oINf1cgaulbrr2sMjelk2cmR8rkxLRPYYL6Kg=", "owner": "nix-community", "repo": "NUR", - "rev": "27c438bb3ed9d4c6f4a25c689b3fb2a855a646a9", + "rev": "242d44cd6af365da2dfa77422263b29d0ac9f39f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6074913..0584c2a 100644 --- a/flake.nix +++ b/flake.nix @@ -17,12 +17,9 @@ }; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11"; - nixpkgs-45570c2.url = - "github:nixos/nixpkgs/45570c299dc2b63c8c574c4cd77f0b92f7e2766e"; - nixpkgs-locked.url = - "github:nixos/nixpkgs/2744d988fa116fc6d46cdfa3d1c936d0abd7d121"; - nixpkgs-9e58ed7.url = - "github:nixos/nixpkgs/9e58ed7ba759d81c98f033b7f5eba21ca68f53b0"; + nixpkgs-45570c2.url = "github:nixos/nixpkgs/45570c299dc2b63c8c574c4cd77f0b92f7e2766e"; + nixpkgs-locked.url = "github:nixos/nixpkgs/2744d988fa116fc6d46cdfa3d1c936d0abd7d121"; + nixpkgs-9e58ed7.url = "github:nixos/nixpkgs/9e58ed7ba759d81c98f033b7f5eba21ca68f53b0"; nixpkgs-master.url = "github:nixos/nixpkgs/master"; m3ta-nixpkgs.url = "git+https://code.m3ta.dev/m3tam3re/nixpkgs"; @@ -39,118 +36,122 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixos-generators = { url = "github:nix-community/nixos-generators"; }; + nixos-generators = {url = "github:nix-community/nixos-generators";}; hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor"; nix-colors.url = "github:misterio77/nix-colors"; agents = { - url = "path:/home/m3tam3re/p/AI/AGENTS"; - # url = "git+https://code.m3ta.dev/m3tam3re/AGENTS"; + # url = "path:/home/m3tam3re/p/AI/AGENTS"; + url = "git+https://code.m3ta.dev/m3tam3re/AGENTS"; flake = false; }; }; - outputs = { self, agenix, home-manager, nixpkgs, m3ta-nixpkgs, nur, agents - , ... }@inputs: - let - inherit (self) outputs; - systems = [ - "aarch64-linux" - "i686-linux" - "x86_64-linux" - "aarch64-darwin" - "x86_64-darwin" - ]; - forAllSystems = nixpkgs.lib.genAttrs systems; + outputs = { + self, + agenix, + home-manager, + nixpkgs, + m3ta-nixpkgs, + nur, + agents, + ... + } @ inputs: let + inherit (self) outputs; + systems = [ + "aarch64-linux" + "i686-linux" + "x86_64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; + forAllSystems = nixpkgs.lib.genAttrs systems; + in { + packages = + forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); + overlays = import ./overlays {inherit inputs outputs;}; + homeManagerModules = import ./modules/home-manager; + + nixosConfigurations = { + m3-ares = nixpkgs.lib.nixosSystem { + specialArgs = { + inherit inputs outputs; + hostname = "m3-ares"; + }; + modules = [ + ./hosts/m3-ares + agenix.nixosModules.default + m3ta-nixpkgs.nixosModules.default + ]; + }; + m3-atlas = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs outputs;}; + system = "x86_64-linux"; + modules = [ + ./hosts/m3-atlas + inputs.disko.nixosModules.disko + agenix.nixosModules.default + m3ta-nixpkgs.nixosModules.default + ]; + }; + m3-kratos = nixpkgs.lib.nixosSystem { + specialArgs = { + inherit inputs outputs; + hostname = "m3-kratos"; + }; + modules = [ + ./hosts/m3-kratos + agenix.nixosModules.default + nur.modules.nixos.default + m3ta-nixpkgs.nixosModules.default + ]; + }; + m3-helios = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs outputs;}; + system = "x86_64-linux"; + modules = [ + ./hosts/m3-helios + inputs.disko.nixosModules.disko + agenix.nixosModules.default + m3ta-nixpkgs.nixosModules.default + ]; + }; + }; + homeConfigurations = { + "m3tam3re@m3-daedalus" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages."x86_64-linux"; + extraSpecialArgs = { + inherit inputs outputs; + hostname = "m3-daedalus"; + }; + modules = [./home/m3tam3re/m3-daedalus.nix]; + }; + }; + devShells = forAllSystems (system: let + pkgs = import nixpkgs { + inherit system; + config.allowUnfree = true; # Allow unfree packages in devShell + }; + m3taLib = m3ta-nixpkgs.lib.x86_64-linux; + rules = m3taLib.opencode-rules.mkOpencodeRules { + inherit agents; + languages = ["nix"]; + }; in { - packages = - forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); - overlays = import ./overlays { inherit inputs outputs; }; - homeManagerModules = import ./modules/home-manager; - - nixosConfigurations = { - m3-ares = nixpkgs.lib.nixosSystem { - specialArgs = { - inherit inputs outputs; - hostname = "m3-ares"; - }; - modules = [ - ./hosts/m3-ares - agenix.nixosModules.default - m3ta-nixpkgs.nixosModules.default - ]; - }; - m3-atlas = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; - system = "x86_64-linux"; - modules = [ - ./hosts/m3-atlas - inputs.disko.nixosModules.disko - agenix.nixosModules.default - m3ta-nixpkgs.nixosModules.default - ]; - }; - m3-kratos = nixpkgs.lib.nixosSystem { - specialArgs = { - inherit inputs outputs; - hostname = "m3-kratos"; - }; - modules = [ - ./hosts/m3-kratos - agenix.nixosModules.default - nur.modules.nixos.default - m3ta-nixpkgs.nixosModules.default - ]; - }; - m3-helios = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; - system = "x86_64-linux"; - modules = [ - ./hosts/m3-helios - inputs.disko.nixosModules.disko - agenix.nixosModules.default - m3ta-nixpkgs.nixosModules.default - ]; - }; - }; - homeConfigurations = { - "m3tam3re@m3-daedalus" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages."x86_64-linux"; - extraSpecialArgs = { - inherit inputs outputs; - hostname = "m3-daedalus"; - }; - modules = [ ./home/m3tam3re/m3-daedalus.nix ]; - }; - }; - devShells.x86_64-linux.infraShell = - let pkgs = nixpkgs.legacyPackages.x86_64-linux; - in pkgs.mkShell { - buildInputs = with pkgs; [ opentofu nixos-anywhere ]; - shellHook = '' - echo "Infrastructure Management Shell" - echo "Commands:" - echo " - cd infra/proxmox && tofu init" - echo " - tofu plan" - echo " - tofu apply" - ''; - }; - - devShells.x86_64-linux.default = let - pkgs = nixpkgs.legacyPackages.x86_64-linux; - m3taLib = m3ta-nixpkgs.lib.x86_64-linux; - rules = m3taLib.opencode-rules.mkOpencodeRules { - inherit agents; - languages = [ "nix" ]; - }; - in pkgs.mkShell { + default = pkgs.mkShell { + buildInputs = with pkgs; [ + alejandra + nixd + openssh + agenix.packages.${system}.default + ]; inherit (rules) instructions; shellHook = '' ${rules.shellHook} echo "======================================" - echo "Nix Development Shell with Opencode Rules" + echo "🧑‍🚀 Nix Development Shell with Opencode Rules" echo "======================================" echo "" echo "Active rules:" @@ -177,5 +178,6 @@ echo "======================================" ''; }; - }; + }); + }; } diff --git a/hosts/m3-kratos/default.nix b/hosts/m3-kratos/default.nix index 53ff859..ea2e04b 100644 --- a/hosts/m3-kratos/default.nix +++ b/hosts/m3-kratos/default.nix @@ -50,8 +50,9 @@ }; services.ollama = { environmentVariables = { - HCC_AMDGPU_TARGET = "gfx1100"; + HCC_AMDGPU_TARGET = "gfx1103"; + ROCR_VISIBLE_DEVICES = "0"; }; - rocmOverrideGfx = "11.0.0"; + rocmOverrideGfx = "11.0.3"; }; }