mira/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update

Browse source
This commit is contained in:
twoneis 2024-01-02 16:49:48 +01:00
parent 7adca7b032
commit 63774580b8
2 changed files with 9 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

7
flake.lock generated
View file

@ -31,7 +31,6 @@
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "master",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"type": "github" "type": "github"
} }
@ -54,11 +53,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1704199801, "lastModified": 1704210337,
"narHash": "sha256-sg+RrgeW6sTn8x4XKLtz9Yxczq1gbHMf3O3OWTY6HNI=", "narHash": "sha256-rRLL+IAanCm/aL55YgSNZvSHbC7oZLJe0lDtRVL6HiQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "6a4c627e8b6504f328d60a0cb1f373f6f6e3f40e", "rev": "5aaff8bf9354976e682c034b184a3298c8c30f3e",
"type": "github" "type": "github"
}, },
"original": { "original": {

23
flake.nix
View file

@ -1,6 +1,4 @@
{ {
description = "Nix flake for my system configuration with nix and home-manager";
inputs = { inputs = {
nixpkgs = { nixpkgs = {
url = "github:nixos/nixpkgs/nixos-unstable"; url = "github:nixos/nixpkgs/nixos-unstable";
@ -12,7 +10,7 @@
}; };
nixos-hardware = { nixos-hardware = {
url = "github:nixos/nixos-hardware/master"; url = "github:nixos/nixos-hardware";
}; };
nur = { nur = {
@ -21,18 +19,12 @@
}; };
outputs = { nixpkgs, home-manager, nixos-hardware, nur, ... }: outputs = { nixpkgs, home-manager, nixos-hardware, nur, ... }:
let {
x86 = "x86_64-linux";
common = ./modules/system;
in {
nixosConfigurations = { nixosConfigurations = {
desktop = nixpkgs.lib.nixosSystem { desktop = nixpkgs.lib.nixosSystem {
specialArgs = { system = "x86_64-linux";
inherit x86;
};
modules = [ modules = [
common ./modules/system
./devices/desktop ./devices/desktop
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager {
@ -49,12 +41,9 @@
}; };
surface = nixpkgs.lib.nixosSystem { surface = nixpkgs.lib.nixosSystem {
specialArgs = { system = "x86_64-linux";
inherit x86;
};
modules = [ modules = [
common ./modules/system
./devices/surface ./devices/surface
nixos-hardware.nixosModules.microsoft-surface-pro-intel nixos-hardware.nixosModules.microsoft-surface-pro-intel