add stuff to flakes

This commit is contained in:
Noa Aarts 2024-03-15 20:01:04 +01:00
parent 5110e0a321
commit 970cf4aaac
3 changed files with 38 additions and 8 deletions

33
flake.lock generated
View file

@ -58,6 +58,26 @@
"type": "github" "type": "github"
} }
}, },
"disko": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1710427903,
"narHash": "sha256-sV0Q5ndvfjK9JfCg/QM/HX/fcittohvtq8dD62isxdM=",
"owner": "nix-community",
"repo": "disko",
"rev": "21d89b333ca300bef82c928c856d48b94a9f997c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "disko",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -174,11 +194,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710506163, "lastModified": 1710527391,
"narHash": "sha256-Xpl2LzbAIUHcTkAZ08UZM0USxVaQn194I8ma9c8wnAA=", "narHash": "sha256-3uM8+g/nb7ROgzSmJwOrKefctZpjR5uBJtUz4lpwWJI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "dc2f3812b41f825ed466c24c4211160d75cb890c", "rev": "c781b28add41b74423ab2e64496d4fc91192e13a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -245,11 +265,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1710519433, "lastModified": 1710528257,
"narHash": "sha256-KODRuf2tf2SueqCEcj6Pu5cpBy8WcXsM0DkEeR5noBk=", "narHash": "sha256-DpKAky4UH1hovUq35MxIHikBKVxIw6KXrXkyFjn8I74=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "a958884b5259ec5d6a2c97078b373c722ae20c39", "rev": "72d78eff95948a3eb3260791cfdf625c0102d33a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -475,6 +495,7 @@
"root": { "root": {
"inputs": { "inputs": {
"automapaper": "automapaper", "automapaper": "automapaper",
"disko": "disko",
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "hyprland": "hyprland",
"nix-colors": "nix-colors", "nix-colors": "nix-colors",

View file

@ -30,9 +30,14 @@
# inputs.nixpkgs.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";
}; };
disko = {
url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = { self, nixpkgs, nix-colors, automapaper, ... }@inputs: };
outputs = { self, nixpkgs, nix-colors, automapaper, disko, ... }@inputs:
{ {
nixosConfigurations = { nixosConfigurations = {
default = nixpkgs.lib.nixosSystem { default = nixpkgs.lib.nixosSystem {
@ -52,6 +57,7 @@
inherit nix-colors; inherit nix-colors;
}; };
modules = [ modules = [
disko.nixosModules.disko
./hosts/server/configuration.nix ./hosts/server/configuration.nix
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
]; ];

View file

@ -2,13 +2,16 @@
# your system. Help is available in the configuration.nix(5) man page, on # your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ pkgs, inputs, nix-colors, ... }: { modulesPath, pkgs, inputs, nix-colors, ... }:
{ {
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
./disk-config.nix
(modulesPath + "/installer/scan/not-detected.nix")
(modulesPath + "/profiles/qemu-guest.nix")
]; ];
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.