reformat according to rfc standard

This commit is contained in:
Thilo Billerbeck 2024-05-28 14:38:22 +02:00
parent 5da37d8133
commit 3bceb198a8
34 changed files with 480 additions and 306 deletions

View file

@ -1,8 +1,15 @@
{ pkgs, config, lib, inputs, ... }:
{
pkgs,
config,
lib,
inputs,
...
}:
let
nixGL = import ./../../home-manager/utils/nixGLWrap.nix { inherit pkgs config; };
in {
in
{
imports = [ ./../../home-manager/modules/machine.nix ];
machine = {

View file

@ -1,11 +1,21 @@
{ config, lib, modulesPath, ... }:
{
config,
lib,
modulesPath,
...
}:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot = {
initrd = {
availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
availableKernelModules = [
"nvme"
"xhci_pci"
"usb_storage"
"sd_mod"
];
kernelModules = [ ];
};
kernelModules = [ "kvm-amd" ];
@ -17,8 +27,7 @@
fsType = "ext4";
};
boot.initrd.luks.devices."luks-6f077715-c436-4254-acb2-66d8be0a0c55".device =
"/dev/disk/by-uuid/6f077715-c436-4254-acb2-66d8be0a0c55";
boot.initrd.luks.devices."luks-6f077715-c436-4254-acb2-66d8be0a0c55".device = "/dev/disk/by-uuid/6f077715-c436-4254-acb2-66d8be0a0c55";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/877C-C918";
@ -36,6 +45,5 @@
# networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

View file

@ -4,7 +4,9 @@
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = { inherit inputs; };
extraSpecialArgs = {
inherit inputs;
};
users.thilo = {
imports = [ ./../../home-manager/modules/machine.nix ];
@ -16,7 +18,9 @@
isGraphical = true;
};
home.sessionVariables = { LD_LIBRARY_PATH = "${pkgs.libGL}/lib"; };
home.sessionVariables = {
LD_LIBRARY_PATH = "${pkgs.libGL}/lib";
};
};
};
}

View file

@ -1,7 +1,8 @@
{ pkgs, ... }:
{
imports = [ # Include the results of the hardware scan.
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
./../../nixos/common.nix
./../../nixos/builders.nix
@ -15,14 +16,19 @@
boot.plymouth.enable = true;
# Setup keyfile
boot.initrd.secrets = { "/crypto_keyfile.bin" = null; };
boot.initrd.secrets = {
"/crypto_keyfile.bin" = null;
};
networking.hostName = "thilo-laptop"; # Define your hostname.
# Configure console keymap
console.keyMap = "de";
environment.gnome.excludePackages = with pkgs; [ tracker tracker-miners ];
environment.gnome.excludePackages = with pkgs; [
tracker
tracker-miners
];
hardware.bluetooth.enable = true;
@ -66,18 +72,16 @@
];
};
environment.systemPackages = with pkgs; [ brlaser brgenml1lpr ];
nixpkgs.config.permittedInsecurePackages = [
"nix-2.16.2"
environment.systemPackages = with pkgs; [
brlaser
brgenml1lpr
];
nixpkgs.config.permittedInsecurePackages = [ "nix-2.16.2" ];
xdg.portal = {
enable = true;
extraPortals = [
pkgs.kdePackages.xdg-desktop-portal-kde
];
extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
};
system.stateVersion = "23.05";

View file

@ -1,15 +1,27 @@
# 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, modulesPath, ... }:
{
config,
lib,
modulesPath,
...
}:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot = {
initrd = {
availableKernelModules =
[ "nvme" "xhci_pci" "ahci" "usbhid" "uas" "usb_storage" "sd_mod" ];
availableKernelModules = [
"nvme"
"xhci_pci"
"ahci"
"usbhid"
"uas"
"usb_storage"
"sd_mod"
];
kernelModules = [ ];
};
kernelModules = [ "kvm-amd" ];
@ -44,6 +56,5 @@
# networking.interfaces.enp8s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

View file

@ -4,7 +4,9 @@
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = { inherit inputs; };
extraSpecialArgs = {
inherit inputs;
};
users.thilo = {
imports = [ ./../../home-manager/modules/machine.nix ];
@ -16,13 +18,17 @@
isGraphical = true;
};
/* xsession.pointerCursor = {
name = "Bibata-Modern-Classic";
package = pkgs.bibata-cursors;
size = 128;
}; */
/*
xsession.pointerCursor = {
name = "Bibata-Modern-Classic";
package = pkgs.bibata-cursors;
size = 128;
};
*/
home.sessionVariables = { LD_LIBRARY_PATH = "${pkgs.libGL}/lib"; };
home.sessionVariables = {
LD_LIBRARY_PATH = "${pkgs.libGL}/lib";
};
home.packages = with pkgs; [ libsForQt5.discover ];
};

View file

@ -58,7 +58,10 @@
programs.nix-ld.enable = true;
hardware.opengl = {
extraPackages = with pkgs; [ vaapiVdpau libvdpau-va-gl ];
extraPackages = with pkgs; [
vaapiVdpau
libvdpau-va-gl
];
};
hardware.bluetooth.enable = true;
@ -86,9 +89,7 @@
];
};
nixpkgs.config.permittedInsecurePackages = [
"nix-2.16.2"
];
nixpkgs.config.permittedInsecurePackages = [ "nix-2.16.2" ];
system.stateVersion = "23.05";
}