diff --git a/flake.lock b/flake.lock index 57d9775..f33d382 100644 --- a/flake.lock +++ b/flake.lock @@ -68,11 +68,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1782789853, - "narHash": "sha256-LEmctqYRQRq0wB1MoS+IVr/0/uu/0nKahqNeJBGTjJ8=", + "lastModified": 1783016143, + "narHash": "sha256-3qejDAo4g2XfzTyWCaX8RVKH17JXnw/fujsbXQA+Mzc=", "ref": "refs/heads/master", - "rev": "cd36a91440b971582fcf2d4eedf9a46fb755f6e1", - "revCount": 92, + "rev": "83284d752d2ac325d4bf3ab7b38acad1c2fffe3a", + "revCount": 98, "type": "git", "url": "ssh://gitea@code.m3ta.dev/m3tam3re/AGENTS" }, @@ -315,18 +315,18 @@ }, "dms": { "inputs": { + "flake-compat": "flake-compat", "nixpkgs": [ "m3ta-home", "nixpkgs" - ], - "quickshell": "quickshell" + ] }, "locked": { - "lastModified": 1777431599, - "narHash": "sha256-g6r/Gx8PTDzO3jCNzzySA+Ff1lmLF9nDlMCNyyoQjoE=", + "lastModified": 1783529634, + "narHash": "sha256-zdHsPGPE5MVi/y+uIt548XScTfZjQzdF21dME7ISEJM=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "eb5afcdc40ea5446c27e18552ff4a19f9daf9484", + "rev": "bdfd565b72cbb416441a9ab828efcac4fd516c70", "type": "github" }, "original": { @@ -344,11 +344,11 @@ ] }, "locked": { - "lastModified": 1782780764, - "narHash": "sha256-Q2wPFsuDo1y6neZ3ttxxOOItupg/4+mPkyAZbC0+wfw=", + "lastModified": 1783591397, + "narHash": "sha256-e4DDmVAas6IPwwY+gfSDKh3PMzW/FXLCbjyWXOnnnbM=", "owner": "AvengeMedia", "repo": "dms-plugin-registry", - "rev": "9fa716427ab5905845b2a10a01d67bee0b1e4c4b", + "rev": "8b61e8fca730986e673737529fa56802dc9326bb", "type": "github" }, "original": { @@ -357,6 +357,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -501,15 +517,16 @@ "uv2nix": "uv2nix_4" }, "locked": { - "lastModified": 1782794050, - "narHash": "sha256-+qKEwIhTkml3DNSmIvGFJyssW9ZXTp78KGclFdcDvX8=", + "lastModified": 1782936460, + "narHash": "sha256-Wt72AQtA6Eizi7Ubj23JBhwZ7GKYcjY4mcV6upqHOaU=", "owner": "NousResearch", "repo": "hermes-agent", - "rev": "972b1620906a1b80772c2f67492ad50b3c83f048", + "rev": "7c1a029553d87c43ecff8a3821336bc95872213b", "type": "github" }, "original": { "owner": "NousResearch", + "ref": "v2026.7.1", "repo": "hermes-agent", "type": "github" } @@ -542,11 +559,11 @@ ] }, "locked": { - "lastModified": 1783024095, - "narHash": "sha256-oE+TNK98Pl7nHW4VU1oBvUKD5JR45U+py/NJmLoTNHI=", + "lastModified": 1783618078, + "narHash": "sha256-F43DGcBoIO8xOZFAfodg3jy0VghB9NGdb6xbTYAIx1A=", "owner": "nix-community", "repo": "home-manager", - "rev": "a4d410db95a6416d1008049330bd86b85b5db45a", + "rev": "144f4e36d0186195037da9fce80a727108978070", "type": "github" }, "original": { @@ -585,11 +602,11 @@ ] }, "locked": { - "lastModified": 1782749631, - "narHash": "sha256-slFTUgDy0KTPA4LBAmC/9SngDq8GCPdX+ZR0yQHHN1E=", + "lastModified": 1783550008, + "narHash": "sha256-qbbZUk9IG9dLNwCPwdPBs6I5clxwugRpP+1YU+GPK20=", "owner": "nix-community", "repo": "home-manager", - "rev": "5d72a29fc36ac21adae6ae35568fe5ee6700850f", + "rev": "f4d01c1d87c7c2ec909549165d5a8338f1bd3315", "type": "github" }, "original": { @@ -630,11 +647,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1783432822, - "narHash": "sha256-NaUTAkPf7i8qLEWYf+bE106Revl2cUpm5YjoYawDduM=", + "lastModified": 1783669679, + "narHash": "sha256-WDGDMsPXxceC0k1ktqcobmwE4GCTrzzULUKlp1CzSKQ=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "1845e484191deab963a4e123e6d81e250a0afbd0", + "rev": "6e9f6664e72433966557ab83a7c3e8c0bbf64a44", "type": "github" }, "original": { @@ -660,11 +677,11 @@ "nur": "nur" }, "locked": { - "lastModified": 1783445983, - "narHash": "sha256-FczF1Denyh5EQ+LcIXKNxSclWf3+PF3ZXd607xMsSss=", + "lastModified": 1783689486, + "narHash": "sha256-dXHzh9nJTR3sp3le+5GCZVMsrKP4eKr4yDgJUi7+sD4=", "ref": "refs/heads/master", - "rev": "10876be5e6d831ba54fa1d87b37d1ac398476d42", - "revCount": 86, + "rev": "c85600a3b073832d8edf83fd27b35811e36e4688", + "revCount": 89, "type": "git", "url": "ssh://gitea@code.m3ta.dev/m3tam3re/m3ta-home" }, @@ -685,11 +702,11 @@ "openspec": "openspec" }, "locked": { - "lastModified": 1783016129, - "narHash": "sha256-Uxie6uBNLUFJ8Tts7e6AYk5cOER5/EnCqKNL77Tzgc4=", + "lastModified": 1783269665, + "narHash": "sha256-bA4PooGV1x3vtmhs6NEprZbWErwaEJdgxoKfAWaH0do=", "ref": "refs/heads/master", - "rev": "fc5092d72dda7db13f81e5910a159de5108590d5", - "revCount": 350, + "rev": "f279ae9c89d59f3e0deb0fd6307800f4cb993815", + "revCount": 356, "type": "git", "url": "ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs" }, @@ -707,11 +724,11 @@ "openspec": "openspec_2" }, "locked": { - "lastModified": 1783269665, - "narHash": "sha256-bA4PooGV1x3vtmhs6NEprZbWErwaEJdgxoKfAWaH0do=", + "lastModified": 1783682547, + "narHash": "sha256-usY1tQB2srsjjFPoKA6BRwoRTzP48ChiM2qu3vju85w=", "ref": "refs/heads/master", - "rev": "f279ae9c89d59f3e0deb0fd6307800f4cb993815", - "revCount": 356, + "rev": "01bede8826fb0b35a0e432d788ce0a8fad2453f1", + "revCount": 358, "type": "git", "url": "ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs" }, @@ -808,38 +825,6 @@ "type": "github" } }, - "nixpkgs-45570c2": { - "locked": { - "lastModified": 1750950224, - "narHash": "sha256-vMCk6wKJVgR7H2pVrQV4/qygzTtvpnS/9jCT3cjzXVM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "45570c299dc2b63c8c574c4cd77f0b92f7e2766e", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "45570c299dc2b63c8c574c4cd77f0b92f7e2766e", - "type": "github" - } - }, - "nixpkgs-9e58ed7": { - "locked": { - "lastModified": 1746823729, - "narHash": "sha256-6E3jRDNK9w1gwDsreG6ZS8Ec0Dv35DkDqKzxZATEUts=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9e58ed7ba759d81c98f033b7f5eba21ca68f53b0", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9e58ed7ba759d81c98f033b7f5eba21ca68f53b0", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "lastModified": 1697935651, @@ -870,22 +855,6 @@ "type": "github" } }, - "nixpkgs-locked": { - "locked": { - "lastModified": 1739661218, - "narHash": "sha256-hEGW0SKD0ORTEmoTuEEONxgENP5kMqe+NCtJug0U6R0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2744d988fa116fc6d46cdfa3d1c936d0abd7d121", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2744d988fa116fc6d46cdfa3d1c936d0abd7d121", - "type": "github" - } - }, "nixpkgs-master": { "locked": { "lastModified": 1782540244, @@ -920,11 +889,11 @@ }, "nixpkgs-master_3": { "locked": { - "lastModified": 1783075633, - "narHash": "sha256-zhH5yPKh4+qt8zLrPrdfWy3Nyo5svmYZ68/ao8lKT5w=", + "lastModified": 1783679842, + "narHash": "sha256-hj0C6XNISewIJq80sdINrBo5i/osjQDToi6gS+SOnM0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ae931d69f2f335f74046c8ed97038cdfa5e011be", + "rev": "e81a14fdbbdb819781f5a396e7253bc2f9016a8b", "type": "github" }, "original": { @@ -1032,11 +1001,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1782723713, - "narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=", + "lastModified": 1783224372, + "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b5aa0fbd538984f6e3d201be0005b4463d8b09f8", + "rev": "d407951447dcd00442e97087bf374aad70c04cea", "type": "github" }, "original": { @@ -1080,11 +1049,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1782918843, - "narHash": "sha256-ETYnV9U7Sr+A45dohzZdfCZKOss4qrTkO+wgNZNvEc0=", + "lastModified": 1783279667, + "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e8273b29fe1390ec8d4603f2477357555291432e", + "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b", "type": "github" }, "original": { @@ -1143,11 +1112,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1782796354, - "narHash": "sha256-zHZEX+twYRO4n369Nrk21DBb519JZCGJLHBo/trhHO0=", + "lastModified": 1783593872, + "narHash": "sha256-KvFRxsi81gBoK7JOTHD2LoR1y2sWobHkrHGPhM3v/NY=", "owner": "nix-community", "repo": "NUR", - "rev": "df4f4323fe161a8bab3aafa2d067ff9d7e223a67", + "rev": "73078fa6f0d34686ad26808f90cc74e81039ba9f", "type": "github" }, "original": { @@ -1164,11 +1133,11 @@ ] }, "locked": { - "lastModified": 1783074755, - "narHash": "sha256-uIM4Y01oNf4scwwfI31aPx2MFFRBKve5+790VwbC4B8=", + "lastModified": 1783680628, + "narHash": "sha256-IpMvSBiDqoz3lHQZxRXZouMRos8ZY/e06vegE/eS4io=", "owner": "nix-community", "repo": "NUR", - "rev": "cac396262b183157a45b6738a6044ed27ac0a093", + "rev": "c978e0ef4fd585c1d8bbc46bbd0d207e1249ab0b", "type": "github" }, "original": { @@ -1400,29 +1369,6 @@ "type": "github" } }, - "quickshell": { - "inputs": { - "nixpkgs": [ - "m3ta-home", - "dms", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1776854048, - "narHash": "sha256-lLbV66V3RMNp1l8/UelmR4YzoJ5ONtgvEtiUMJATH/o=", - "ref": "refs/heads/master", - "rev": "783c953987dc56ff0601abe6845ed96f1d00495a", - "revCount": 806, - "type": "git", - "url": "https://git.outfoxxed.me/quickshell/quickshell" - }, - "original": { - "rev": "783c953987dc56ff0601abe6845ed96f1d00495a", - "type": "git", - "url": "https://git.outfoxxed.me/quickshell/quickshell" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -1435,9 +1381,6 @@ "nix-colors": "nix-colors_2", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_9", - "nixpkgs-45570c2": "nixpkgs-45570c2", - "nixpkgs-9e58ed7": "nixpkgs-9e58ed7", - "nixpkgs-locked": "nixpkgs-locked", "nixpkgs-master": "nixpkgs-master_3", "nixpkgs-stable": "nixpkgs-stable", "nur": "nur_2", diff --git a/flake.nix b/flake.nix index 605a9f4..a566028 100644 --- a/flake.nix +++ b/flake.nix @@ -17,9 +17,9 @@ }; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-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 = { diff --git a/hosts/common/default.nix b/hosts/common/default.nix index d823882..49d2598 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -34,12 +34,12 @@ #outputs.overlays.additions #outputs.overlays.modifications outputs.overlays.stable-packages - outputs.overlays.locked-packages - outputs.overlays.pinned-packages + # outputs.overlays.locked-packages + # outputs.overlays.pinned-packages outputs.overlays.master-packages inputs.m3ta-nixpkgs.overlays.default - inputs.m3ta-nixpkgs.overlays.modifications + # inputs.m3ta-nixpkgs.overlays.modifications (outputs.lib.mkLlmAgentsOverlay system) # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default diff --git a/hosts/m3-kratos/configuration.nix b/hosts/m3-kratos/configuration.nix index 33c9a77..36d6ea9 100644 --- a/hosts/m3-kratos/configuration.nix +++ b/hosts/m3-kratos/configuration.nix @@ -1,7 +1,11 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page, on # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). -{pkgs, ...}: { +{ + config, + pkgs, + ... +}: { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix @@ -15,7 +19,6 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; boot.initrd.kernelModules = ["amdgpu"]; - boot.kernelPackages = pkgs.linuxPackages_7_0; services.xserver.videoDrivers = ["amdgpu"]; security.polkit.enable = true; security.pam.services.gdm.enableGnomeKeyring = true; diff --git a/overlays/default.nix b/overlays/default.nix index 00ced70..0cc38a1 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -25,12 +25,12 @@ # }); }; - temp-packages = final: _prev: { - temp = import inputs.nixpkgs-9e9486b { - system = final.stdenv.hostPlatform.system; - config.allowUnfree = true; - }; - }; + # temp-packages = final: _prev: { + # temp = import inputs.nixpkgs-9e9486b { + # system = final.stdenv.hostPlatform.system; + # config.allowUnfree = true; + # }; + # }; stable-packages = final: _prev: { stable = import inputs.nixpkgs-stable { @@ -39,19 +39,19 @@ }; }; - pinned-packages = final: _prev: { - pinned = import inputs.nixpkgs-9472de4 { - system = final.stdenv.hostPlatform.system; - config.allowUnfree = true; - }; - }; + # pinned-packages = final: _prev: { + # pinned = import inputs.nixpkgs-9472de4 { + # system = final.stdenv.hostPlatform.system; + # config.allowUnfree = true; + # }; + # }; - locked-packages = final: _prev: { - locked = import inputs.nixpkgs-locked { - system = final.stdenv.hostPlatform.system; - config.allowUnfree = true; - }; - }; + # locked-packages = final: _prev: { + # locked = import inputs.nixpkgs-locked { + # system = final.stdenv.hostPlatform.system; + # config.allowUnfree = true; + # }; + # }; master-packages = final: _prev: { master = import inputs.nixpkgs-master { diff --git a/secrets/m3tam3re-secrets.age b/secrets/m3tam3re-secrets.age index 8e4c784..c7b3aae 100644 Binary files a/secrets/m3tam3re-secrets.age and b/secrets/m3tam3re-secrets.age differ