diff --git a/flake.lock b/flake.lock index daf48df..a68e418 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1757508292, - "narHash": "sha256-7lVWL5bC6xBIMWWDal41LlGAG+9u2zUorqo3QCUL4p4=", + "lastModified": 1758287904, + "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", "owner": "nix-community", "repo": "disko", - "rev": "146f45bee02b8bd88812cfce6ffc0f933788875a", + "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", "type": "github" }, "original": { @@ -168,11 +168,11 @@ ] }, "locked": { - "lastModified": 1757809953, - "narHash": "sha256-29mlXbfAJhz9cWVrPP4STvVPDVZFCfCOmaIN5lFJa+Y=", + "lastModified": 1759573136, + "narHash": "sha256-ILSPD0Dm8p0w0fCVzOx98ZH8yFDrR75GmwmH3fS2VnE=", "owner": "nix-community", "repo": "home-manager", - "rev": "17a10049486f6698fca32097d8f52c0c895542b0", + "rev": "5f06ceafc6c9b773a776b9195c3f47bbe1defa43", "type": "github" }, "original": { @@ -249,14 +249,17 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1759658382, - "narHash": "sha256-VfiWf2rFWZEULnNACqX8AZR5K3/2cnaHyGmswlC4RBE=", - "path": "/home/m3tam3re/p/nix/nixpkgs", - "type": "path" + "lastModified": 1759661061, + "narHash": "sha256-LAd1fNNIL19HrOm1cVeoKP5v8si932HsX1ZDwJh9O8o=", + "ref": "refs/heads/master", + "rev": "27d92a238ba9b9df117680c2080e082a2732bfc5", + "revCount": 7, + "type": "git", + "url": "https://code.m3ta.dev/m3tam3re/nixpkgs" }, "original": { - "path": "/home/m3tam3re/p/nix/nixpkgs", - "type": "path" + "type": "git", + "url": "https://code.m3ta.dev/m3tam3re/nixpkgs" } }, "nix-ai-tools": { @@ -266,11 +269,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1759115451, - "narHash": "sha256-cjQAR33C5QLo0UIpzc5G0kJSU5nPFYxo2ZJQlusgyLQ=", + "lastModified": 1759662326, + "narHash": "sha256-DlLJ95u+Y+dQUgYXK9w4+oXEN1tAoBTuOBbROkJFw5Y=", "owner": "numtide", "repo": "nix-ai-tools", - "rev": "10c57241916bd4be938d0cf9b110849db88b972e", + "rev": "f9b693bea48cea1dbe1f1b4471f546fe1e7a0c29", "type": "github" }, "original": { @@ -413,11 +416,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1757861651, - "narHash": "sha256-7ykbxtcD1kh54j1UsgdBpI9sQKw+acGKcl1az6t3xzU=", + "lastModified": 1759661032, + "narHash": "sha256-cqZAN2FmnUX/M42m1T9/glzcp8C+66bV/25xUB7TbAw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5816a8aa0af7a6f3148bbd0c71cbe7fcb6ec7a14", + "rev": "b7ffd1a8c2550781d74d6a2b48dc6bcd9da29996", "type": "github" }, "original": { @@ -429,11 +432,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1757545623, - "narHash": "sha256-mCxPABZ6jRjUQx3bPP4vjA68ETbPLNz9V2pk9tO7pRQ=", + "lastModified": 1759580034, + "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8cd5ce828d5d1d16feff37340171a98fc3bf6526", + "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", "type": "github" }, "original": { @@ -477,11 +480,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1758690382, - "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e643668fd71b949c53f8626614b21ff71a07379d", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -509,11 +512,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -547,11 +550,11 @@ ] }, "locked": { - "lastModified": 1759475326, - "narHash": "sha256-bXXGDZQm05KmaSf/TDqAOkPK4i6Ba5y12aL6/hcJiro=", + "lastModified": 1759659817, + "narHash": "sha256-S26D4k/9He1tLCn5ARx+3BNzK7IKBLBJWUqx9GF8X7s=", "owner": "nix-community", "repo": "NUR", - "rev": "1d38cb6e7f916b7a31f4d8ef1995ba9fbaf93380", + "rev": "df8713776e7e236129f7c260017e770393b4f278", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index df93f74..3566f41 100644 --- a/flake.nix +++ b/flake.nix @@ -22,8 +22,9 @@ 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"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/m3-ares/configuration.nix b/hosts/m3-ares/configuration.nix index 0a9e725..5457904 100644 --- a/hosts/m3-ares/configuration.nix +++ b/hosts/m3-ares/configuration.nix @@ -24,14 +24,12 @@ boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.memtest86.enable = true; boot.initrd.services.lvm.enable = false; - boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback]; - boot.kernelModules = ["v4l2loopback"]; + # boot.kernelModules = []; boot.kernelPackages = pkgs.linuxPackages_latest; boot.extraModprobeConfig = '' options kvm_intel nested=1 options kvm_intel emulate_invalid_guest_state=0 options kvm ignore_msrs=1 - options v4l2loopback exclusive_caps=1 max_buffers=2 ''; networking.hostName = "m3-ares"; # Define your hostname. diff --git a/hosts/m3-ares/services/tailscale.nix b/hosts/m3-ares/services/tailscale.nix index e120ef1..d723f16 100644 --- a/hosts/m3-ares/services/tailscale.nix +++ b/hosts/m3-ares/services/tailscale.nix @@ -1,6 +1,6 @@ {config, ...}: { services.tailscale = { - enable = true; + enable = false; authKeyFile = config.age.secrets.tailscale-key.path; useRoutingFeatures = "both"; extraUpFlags = [