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

This commit is contained in:
2026-03-07 13:54:37 +01:00
parent 786748caeb
commit 2afc3dd068
4 changed files with 29 additions and 29 deletions

17
flake.lock generated
View File

@@ -347,6 +347,22 @@
"type": "github" "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1768127708, "lastModified": 1768127708,
@@ -483,6 +499,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"neovim-nightly-overlay": "neovim-nightly-overlay", "neovim-nightly-overlay": "neovim-nightly-overlay",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nixpkgs-master": "nixpkgs-master", "nixpkgs-master": "nixpkgs-master",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",

View File

@@ -15,6 +15,8 @@
# flake = false; # flake = false;
# }; # };
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
home-manager = { home-manager = {

View File

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

View File

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