auto-format
This commit is contained in:
parent
b884f4d835
commit
2a7665feba
5 changed files with 106 additions and 39 deletions
|
|
@ -1,4 +1,9 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
boot = {
|
boot = {
|
||||||
|
|
@ -10,7 +15,7 @@
|
||||||
enableCryptodisk = true;
|
enableCryptodisk = true;
|
||||||
device = "nodev";
|
device = "nodev";
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
source (crypto0)/os/arch/boot/grub/grub.cfg
|
source (crypto0)/os/arch/boot/grub/grub.cfg
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
efi.efiSysMountPoint = "/boot/efi";
|
efi.efiSysMountPoint = "/boot/efi";
|
||||||
|
|
@ -24,13 +29,33 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
systemd = {
|
systemd = {
|
||||||
initrdBin = with pkgs; [
|
initrdBin = with pkgs; [
|
||||||
cryptsetup
|
cryptsetup
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
kernelModules = [ "cryptd" "uas" "usbcore" "usb_storage" "vfat" "nls_cp437" "nls_iso8859_1" ];
|
kernelModules = [
|
||||||
availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "rtsx_pci_sdmmc" "dm_crypt" "crypto_user" ];
|
"cryptd"
|
||||||
supportedFilesystems = [ "btrfs" "vfat" "luks" ];
|
"uas"
|
||||||
|
"usbcore"
|
||||||
|
"usb_storage"
|
||||||
|
"vfat"
|
||||||
|
"nls_cp437"
|
||||||
|
"nls_iso8859_1"
|
||||||
|
];
|
||||||
|
availableKernelModules = [
|
||||||
|
"xhci_pci"
|
||||||
|
"nvme"
|
||||||
|
"usbhid"
|
||||||
|
"usb_storage"
|
||||||
|
"rtsx_pci_sdmmc"
|
||||||
|
"dm_crypt"
|
||||||
|
"crypto_user"
|
||||||
|
];
|
||||||
|
supportedFilesystems = [
|
||||||
|
"btrfs"
|
||||||
|
"vfat"
|
||||||
|
"luks"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
kernel.sysctl."kernel.sysrq" = 1;
|
kernel.sysctl."kernel.sysrq" = 1;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -2,28 +2,39 @@
|
||||||
# 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`).
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [
|
||||||
[ # Include the results of the hardware scan.
|
# Include the results of the hardware scan.
|
||||||
./security.nix
|
./security.nix
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
./hardware.nix
|
./hardware.nix
|
||||||
./bootloader.nix
|
./bootloader.nix
|
||||||
<home-manager/nixos>
|
<home-manager/nixos>
|
||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
networking.hostName = "niczos"; # Define your hostname.
|
networking.hostName = "niczos"; # Define your hostname.
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
time.timeZone = "Europe/Paris";
|
time.timeZone = "Europe/Paris";
|
||||||
i18n.defaultLocale = "en_US.UTF-8";
|
i18n.defaultLocale = "en_US.UTF-8";
|
||||||
|
|
||||||
virtualisation.waydroid = {
|
virtualisation = {
|
||||||
enable = true;
|
waydroid = {
|
||||||
package = pkgs.waydroid-nftables;
|
enable = true;
|
||||||
|
package = pkgs.waydroid-nftables;
|
||||||
|
};
|
||||||
|
docker = {
|
||||||
|
enable = true;
|
||||||
|
storageDriver = "btrfs";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.steam.enable = true;
|
programs.steam.enable = true;
|
||||||
|
|
@ -55,13 +66,22 @@
|
||||||
defaultUnit = "graphical.target";
|
defaultUnit = "graphical.target";
|
||||||
services."getty@tty1" = {
|
services."getty@tty1" = {
|
||||||
overrideStrategy = "asDropin";
|
overrideStrategy = "asDropin";
|
||||||
serviceConfig.ExecStart = ["" "@${pkgs.util-linux}/sbin/agetty agetty --login-program ${config.services.getty.loginProgram} --autologin zo --noclear --keep-baud %I 115200,38400,9600 $TERM"];
|
serviceConfig.ExecStart = [
|
||||||
|
""
|
||||||
|
"@${pkgs.util-linux}/sbin/agetty agetty --login-program ${config.services.getty.loginProgram} --autologin zo --noclear --keep-baud %I 115200,38400,9600 $TERM"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
users.users.zo = {
|
users.users.zo = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = [ "wheel" "audio" "video" "network" ];
|
extraGroups = [
|
||||||
|
"wheel"
|
||||||
|
"audio"
|
||||||
|
"video"
|
||||||
|
"network"
|
||||||
|
"docker"
|
||||||
|
];
|
||||||
packages = [ pkgs.home-manager ];
|
packages = [ pkgs.home-manager ];
|
||||||
shell = pkgs.bash;
|
shell = pkgs.bash;
|
||||||
};
|
};
|
||||||
|
|
@ -84,6 +104,7 @@
|
||||||
mplus-outline-fonts.githubRelease
|
mplus-outline-fonts.githubRelease
|
||||||
dina-font
|
dina-font
|
||||||
proggyfonts
|
proggyfonts
|
||||||
|
font-awesome
|
||||||
];
|
];
|
||||||
|
|
||||||
# Copy the NixOS configuration file and link it from the resulting system
|
# Copy the NixOS configuration file and link it from the resulting system
|
||||||
|
|
@ -111,4 +132,3 @@
|
||||||
system.stateVersion = "26.05"; # Did you read the comment?
|
system.stateVersion = "26.05"; # Did you read the comment?
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,18 @@
|
||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.kernelParams = [ "i915.modeset=1" ];
|
boot.kernelParams = [ "i915.modeset=1" ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
|
|
@ -23,14 +29,17 @@
|
||||||
fileSystems."/mnt/games" = {
|
fileSystems."/mnt/games" = {
|
||||||
device = "/dev/mapper/safe";
|
device = "/dev/mapper/safe";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "ssd" "lazytime" "subvol=game" ];
|
options = [
|
||||||
|
"ssd"
|
||||||
|
"lazytime"
|
||||||
|
"subvol=game"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot/efi" =
|
fileSystems."/boot/efi" = {
|
||||||
{
|
device = "/dev/disk/by-uuid/4FD7-458E";
|
||||||
device = "/dev/disk/by-uuid/4FD7-458E";
|
fsType = "vfat";
|
||||||
fsType = "vfat";
|
};
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices = [ ];
|
swapDevices = [ ];
|
||||||
|
|
||||||
|
|
|
||||||
16
hardware.nix
16
hardware.nix
|
|
@ -1,14 +1,22 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
services.xserver.videoDrivers = [ "nvidia" ];
|
services.xserver.videoDrivers = [ "nvidia" ];
|
||||||
|
|
||||||
services.printing.enable = true;
|
services.printing.enable = true;
|
||||||
services.printing.drivers = [ pkgs.epson-escpr pkgs.epsonscan2 ];
|
services.printing.drivers = [
|
||||||
|
pkgs.epson-escpr
|
||||||
|
pkgs.epsonscan2
|
||||||
|
];
|
||||||
|
|
||||||
boot.kernelParams = [
|
boot.kernelParams = [
|
||||||
"nvidia.NVreg_PreserveVideoMemoryAllocations=1"
|
"nvidia.NVreg_PreserveVideoMemoryAllocations=1"
|
||||||
"nvidia.NVreg_TemporaryFilePath=/var/tmp"
|
"nvidia.NVreg_TemporaryFilePath=/var/tmp"
|
||||||
];
|
];
|
||||||
|
|
||||||
hardware = {
|
hardware = {
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,9 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
networking.nftables.enable = true;
|
networking.nftables.enable = true;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue