feat: migrate matej-nixos to framework16 amd-ai series

flake.lock

@@ -347,6 +347,22 @@
         "type": "github"
       }
     },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1771969195,
+        "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1768127708,
@@ -483,6 +499,7 @@
         "home-manager": "home-manager",
         "lanzaboote": "lanzaboote",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
+        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_3",
         "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-unstable": "nixpkgs-unstable",

flake.nix

@@ -15,6 +15,8 @@
     #   flake = false;
     # };
 
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+
     flake-utils.url = "github:numtide/flake-utils";
 
     home-manager = {
@@ -51,19 +53,7 @@
     let
       my-lib = import ./lib { inherit (nixpkgs) lib; };
 
-      overlays = [
-        (_: prev: {
-          inherit
-            (
-              (import inputs.nixpkgs-unstable {
-                inherit (prev.stdenv.hostPlatform) system;
-                config.allowUnfree = true;
-              })
-            )
-            claude-code
-            ;
-        })
-      ];
+      overlays = [ ];
 
       mkHost = my-lib.mkHost {
         inherit
@@ -99,6 +89,11 @@
         inherit my-lib;
         inherit (nixpkgs) lib;
       } { };
+
+      homeManagerModules = import ./modules/home-manager {
+        inherit my-lib;
+        inherit (nixpkgs) lib;
+      } { };
     }
     // flake-utils.lib.eachDefaultSystem (
       system:

hosts/matej-nixos/configuration.nix

@@ -13,6 +13,7 @@ in
 
 {
   imports = [
+    inputs.nixos-hardware.nixosModules.framework-16-amd-ai-300-series
     inputs.stylix.nixosModules.stylix
     inputs.self.nixosModules.yubikey
     inputs.self.nixosModules.sway
@@ -23,8 +24,6 @@ in
     inputs.self.nixosModules.gnupg
     inputs.self.nixosModules.tuigreet
     inputs.self.nixosModules.workstation
-    inputs.self.nixosModules.nvidia
-    inputs.self.nixosModules.initrd-ssh
     inputs.self.nixosModules.localisation
   ];
 
@@ -40,23 +39,7 @@ in
     command = "sway";
   };
 
-  sway = {
-    enable = true;
-    cmdFlags = [ "--unsupported-gpu" ];
-  };
-
-  nvidia.enable = true;
-
-  initrd-ssh = {
-    enable = true;
-    networkModule = "r8169";
-    ip = {
-      enable = true;
-      address = "10.222.0.247";
-      gateway = "10.222.0.1";
-      interface = "enp5s0";
-    };
-  };
+  sway.enable = true;
 
   stylix = {
     enable = true;
@@ -94,22 +77,18 @@ in
     localNetworkGameTransfers.openFirewall = true;
   };
 
+  services.hardware.bolt.enable = true;
   hardware.keyboard.zsa.enable = true;
   hardware.ledger.enable = true;
   hardware.bluetooth.powerOnBoot = true;
+  hardware.inputmodule.enable = true;
+
+  programs.nm-applet.enable = true;
 
   networking = {
     hostName = "matej-nixos";
-    useDHCP = false;
     networkmanager.enable = true;
-    interfaces.enp5s0.ipv4.addresses = [
-      {
-        address = "10.222.0.247";
-        prefixLength = 24;
-      }
-    ];
     firewall.enable = false;
-    defaultGateway = "10.222.0.1";
     nameservers = [
       "1.1.1.1"
       "8.8.8.8"

hosts/matej-nixos/hardware-configuration.nix

@@ -17,8 +17,10 @@
   boot.initrd.availableKernelModules = [
     "nvme"
     "xhci_pci"
-    "ahci"
+    "thunderbolt"
     "usbhid"
+    "uas"
+    "sd_mod"
   ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-amd" ];
@@ -33,7 +35,7 @@
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/7151-CE52";
+    device = "/dev/disk/by-uuid/42D9-FAFD";
     fsType = "vfat";
     options = [
       "fmask=0022"

modules/home-manager/claude.nix

@@ -0,0 +1,26 @@
+{
+  config,
+  lib,
+  pkgs,
+  inputs,
+  ...
+}:
+let
+  packages = inputs.self.outputs.packages.${pkgs.stdenv.hostPlatform.system};
+in
+{
+  options = {
+    claude = {
+      enable = lib.mkEnableOption "claude code";
+      package = lib.mkPackageOption pkgs "claude-code" { };
+    };
+  };
+
+  config = lib.mkIf config.claude.enable {
+    home.packages = [
+      config.claude.package
+      packages.todo-mcp
+      pkgs.mcp-nixos
+    ];
+  };
+}

modules/home-manager/default.nix

@@ -0,0 +1 @@
+{ lib, my-lib }: args: (my-lib.autoDir ./.)

users/matej/home-manager.nix

@@ -8,9 +8,16 @@
 
 let
   packages = inputs.self.outputs.packages.${pkgs.stdenv.hostPlatform.system};
+  hmModules = inputs.self.outputs.homeManagerModules;
 in
 
 {
+  imports = [ hmModules.claude ];
+  claude = {
+    enable = true;
+    package = inputs.claude-code-overlay.packages.${pkgs.stdenv.hostPlatform.system}.default;
+  };
+
   home.stateVersion = "24.11";
 
   # TODO:(@janezicmatej) do i need this here?
@@ -21,9 +28,6 @@ in
 
     pkgs.starship
 
-    inputs.claude-code-overlay.packages.${pkgs.stdenv.hostPlatform.system}.default
-    packages.todo-mcp
-
     # git and co
     pkgs.git
     packages.git-linearize