formatting

This commit is contained in:
MFlossmann 2024-07-03 00:38:20 +02:00
parent 64fcff10aa
commit 48387d08e3
14 changed files with 129 additions and 111 deletions

View file

@ -1,11 +1,20 @@
{ config, pkgs, lib, inputs, outputs, system, helperLib, ... }: {
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
outputs.nixosModules.default
];
{
config,
pkgs,
lib,
inputs,
outputs,
system,
helperLib,
...
}: {
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
outputs.nixosModules.default
];
nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix.settings.experimental-features = ["nix-command" "flakes"];
# Bootloader.
boot.loader = {
@ -24,7 +33,6 @@
services.displayManager.defaultSession = "plasma";
programs.ssh.askPassword = lib.mkForce "${pkgs.kdePackages.ksshaskpass.out}/bin/ksshaskpass";
myNixOS = {
bundles.general-desktop.enable = true;
@ -67,13 +75,12 @@
services.xserver.videoDrivers = ["nvidia"];
hardware.nvidia = {
# Modesetting is required.
modesetting.enable = true;
# Nvidia power management. Experimental, and can cause sleep/suspend to fail.
# Enable this if you have graphical corruption issues or application crashes after waking
# up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
# up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
# of just the bare essentials.
powerManagement.enable = true;
@ -83,15 +90,15 @@
# Use the NVidia open source kernel module (not to be confused with the
# independent third-party "nouveau" open source driver).
# Support is limited to the Turing and later architectures. Full list of
# supported GPUs is at:
# https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
# Support is limited to the Turing and later architectures. Full list of
# supported GPUs is at:
# https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
# Only available from driver 515.43.04+
# Currently alpha-quality/buggy, so false is currently the recommended setting.
open = false;
# Enable the Nvidia settings menu,
# accessible via `nvidia-settings`.
# accessible via `nvidia-settings`.
nvidiaSettings = true;
# Optionally, you may need to select the appropriate driver version for your specific GPU.
@ -104,7 +111,7 @@
};
programs.gamemode.enable = true;
environment.systemPackages = with pkgs; [ protonup ];
environment.systemPackages = with pkgs; [protonup];
environment.sessionVariables = {
STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/prunebutt/.steam/root/compatibilitytools.d";
};
@ -122,5 +129,4 @@
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.11"; # Did you read the comment?
}

View file

@ -1,32 +1,36 @@
# 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, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/c849b1d0-f6b0-414b-a2f8-15add0b2b637";
fsType = "btrfs";
options = [ "subvol=@" ];
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/c849b1d0-f6b0-414b-a2f8-15add0b2b637";
fsType = "btrfs";
options = ["subvol=@"];
};
boot.initrd.luks.devices."luks-2875a668-8d20-46b1-9c37-843c250be560".device = "/dev/disk/by-uuid/2875a668-8d20-46b1-9c37-843c250be560";
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/4D76-7705";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/4D76-7705";
fsType = "vfat";
};
swapDevices = [ ];
swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's

View file

@ -1,9 +1,11 @@
{ config, pkgs, ... }:
{
config,
pkgs,
...
}: {
# home.username = "prunebutt";
# home.homeDirectory = "/home/prunebutt";
home = let
home = let
user = "prunebutt";
in {
username = "${user}";
@ -43,7 +45,7 @@
};
programs.zsh.enable = true;
# Let Home Manager install and manage itself.
# programs.home-manager.enable = true;
}