Merge remote-tracking branch 'origin/nixos' into nixos-work

This commit is contained in:
Moritz Böhme 2023-04-12 10:15:01 +02:00
commit d224549e56
69 changed files with 622 additions and 719 deletions

View file

@ -1,12 +1,11 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ lib
, config
, pkgs
, inputs
{ pkgs
, ...
}: {
}:
{
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix

View file

@ -3,7 +3,6 @@
# to /etc/nixos/configuration.nix instead.
{ config
, lib
, pkgs
, modulesPath
, ...
}: {

View file

@ -1,8 +1,7 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ config
, pkgs
{ pkgs
, inputs
, ...
}: {
@ -11,11 +10,6 @@
./hardware-configuration.nix
];
# services.howdy = {
# enable = true;
# certainty = 3.0;
# };
# BOOT
boot = {
supportedFilesystems = [ "btrfs" ];

View file

@ -1,10 +1,7 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config
, lib
, pkgs
, modulesPath
{ modulesPath
, ...
}: {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];