New ThinkPad hardware-configuration.nix

Changes

5 changed files (+12/-21)

• Framework-13/default.nix
  • @@ -15,4 +15,6 @@
    # TODO: Microphone doesn't work and importing the nixos-hardware config doesn't help # https://github.com/NixOS/nixos-hardware/blob/master/framework/13-inch/amd-ai-300-series/default.nix + + nixathena.enable = true; }
• ThinkPad-X1-Yoga-Gen-6/hardware-configuration.nix
  • @@ -18,21 +18,20 @@
    "xhci_pci" "thunderbolt" "nvme" + "usb_storage" + "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = { - device = "/dev/disk/by-uuid/854ed839-314f-44bd-b57f-655437c254bd"; + device = "/dev/disk/by-uuid/c5570a90-fac1-483d-b263-8a027074e383"; fsType = "btrfs"; }; - boot.initrd.luks.devices."luksdev".device = - "/dev/disk/by-uuid/f4e1fd6b-f03c-428f-a31e-7355a10b9a2c"; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/3A93-17DE"; + device = "/dev/disk/by-uuid/6215-2D72"; fsType = "vfat"; options = [ "fmask=0077"
  • @@ -42,14 +41,6 @@
    swapDevices = [ ]; - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s13f0u2u1u2.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }
• flake.lock
  • @@ -28,11 +28,11 @@
    ] }, "locked": { - "lastModified": 1781587929, - "narHash": "sha256-+EtJE2if6uf5W4DgpAPzdpNKjCVpEH4F9IFnr79vNAg=", + "lastModified": 1781819283, + "narHash": "sha256-zP25bHapUYCebzvBeejwpfzAVwIkygf7XBYw61OIQ/g=", "ref": "refs/heads/main", - "rev": "d34f79b63900322ab75887ffde910bdfc34bf497", - "revCount": 116, + "rev": "e2dd36e3da3bdf18fc221bc24d1fd23ba972cece", + "revCount": 119, "type": "git", "url": "https://forgejo.mit.edu/SIPB/nixathena.git" },
• flake.nix
  • @@ -31,11 +31,11 @@
    inputs.nixathena.nixosModules.default ]; }; - ThinkPad-Yoga-14 = nixpkgs.lib.nixosSystem { + ThinkPad-X1-Yoga-Gen-6 = nixpkgs.lib.nixosSystem { modules = [ ./configuration.nix ./laptop.nix - ./ThinkPad-Yoga-14 + ./ThinkPad-X1-Yoga-Gen-6 ]; }; Unnamed-Server = nixpkgs.lib.nixosSystem {
• laptop.nix
  • @@ -13,8 +13,6 @@ let
    }) { }; in { - nixathena.enable = true; - # For NeoChat ugh nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ];