add nixos-hardware to fix framework laptop issues
This commit is contained in:
parent
ccc55e6fa4
commit
4b2e515cb2
3 changed files with 37 additions and 13 deletions
|
@ -1,4 +1,8 @@
|
||||||
{pkgs, lib, ...}: {
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
system.stateVersion = "22.11";
|
system.stateVersion = "22.11";
|
||||||
|
|
||||||
time.timeZone = "America/Los_Angeles";
|
time.timeZone = "America/Los_Angeles";
|
||||||
|
|
40
flake.lock
40
flake.lock
|
@ -41,11 +41,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1672349765,
|
"lastModified": 1672780900,
|
||||||
"narHash": "sha256-Ul3lSGglgHXhgU3YNqsNeTlRH1pqxbR64h+2hM+HtnM=",
|
"narHash": "sha256-DxuSn6BdkZapIbg76xzYx1KhVPEZeBexMkt1q/sMVPA=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "dd99675ee81fef051809bc87d67eb07f5ba022e8",
|
"rev": "54245e1820caabd8a0b53ce4d47e4d0fefe04cd4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -65,11 +65,11 @@
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "contrib",
|
"dir": "contrib",
|
||||||
"lastModified": 1672586299,
|
"lastModified": 1672792760,
|
||||||
"narHash": "sha256-a+fm3qTnpU63l84WN3qDva3U+13IKchw0FTJNvEOiYA=",
|
"narHash": "sha256-gjmp7L8hVdguIXY7z8aQoJUeG9cklL28sjoBl9O0dMU=",
|
||||||
"owner": "neovim",
|
"owner": "neovim",
|
||||||
"repo": "neovim",
|
"repo": "neovim",
|
||||||
"rev": "c590641febf4d03e89c46f8e7ef4c3fb2a455520",
|
"rev": "ef18c9f9b05caf1f39ed32762f53802e378f143b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -128,6 +128,21 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixos-hardware": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1672644464,
|
||||||
|
"narHash": "sha256-RYlvRMcQNT7FDoDkViijQBHg9g+blsB+U6AvL/gAsPI=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixos-hardware",
|
||||||
|
"rev": "ca29e25c39b8e117d4d76a81f1e229824a9b3a26",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixos-hardware",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixos-wsl": {
|
"nixos-wsl": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
|
@ -154,11 +169,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1672350804,
|
"lastModified": 1672617983,
|
||||||
"narHash": "sha256-jo6zkiCabUBn3ObuKXHGqqORUMH27gYDIFFfLq5P4wg=",
|
"narHash": "sha256-68WDiCBs631mbDDk4UAKdGURKcsfW6hjb7wgudTAe5o=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "677ed08a50931e38382dbef01cba08a8f7eac8f6",
|
"rev": "0fc9fca9c8d43edd79d33fea0dd8409d7c4580f4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -234,11 +249,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1672635614,
|
"lastModified": 1672807544,
|
||||||
"narHash": "sha256-zUZFJe6YUBF0XAHl4/ZDojhxEaFTklKXNhqBDMXfn+8=",
|
"narHash": "sha256-fYseOl11yf0iZq3osgGpLos/8Q9CyWlvE7QOPuaDnLI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "65ff12f2eb0857f2777211e40093d932e24ae992",
|
"rev": "498cadbe39b8b843540ea01e9b22d06fc9ad7de3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -252,6 +267,7 @@
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"neovim": "neovim",
|
"neovim": "neovim",
|
||||||
"nix-on-droid": "nix-on-droid",
|
"nix-on-droid": "nix-on-droid",
|
||||||
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixos-wsl": "nixos-wsl",
|
"nixos-wsl": "nixos-wsl",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
|
|
|
@ -22,6 +22,8 @@
|
||||||
nix-on-droid.url = "github:t184256/nix-on-droid";
|
nix-on-droid.url = "github:t184256/nix-on-droid";
|
||||||
nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
|
nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
nix-on-droid.inputs.home-manager.follows = "home-manager";
|
nix-on-droid.inputs.home-manager.follows = "home-manager";
|
||||||
|
|
||||||
|
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||||
};
|
};
|
||||||
outputs = {
|
outputs = {
|
||||||
self,
|
self,
|
||||||
|
@ -32,6 +34,7 @@
|
||||||
nur,
|
nur,
|
||||||
nixos-wsl,
|
nixos-wsl,
|
||||||
nix-on-droid,
|
nix-on-droid,
|
||||||
|
nixos-hardware,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
modules = {
|
modules = {
|
||||||
|
@ -85,6 +88,7 @@
|
||||||
./common/desktop/drivers/skynet.nix
|
./common/desktop/drivers/skynet.nix
|
||||||
./devices/skynet/base.nix
|
./devices/skynet/base.nix
|
||||||
./devices/skynet/hardware.nix
|
./devices/skynet/hardware.nix
|
||||||
|
nixos-hardware.nixosModules.framework-12th-gen-intel
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Reference in a new issue