From 970480cb53555fbd4450e8fc9df72e139c071d78 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Tue, 4 Apr 2023 22:02:28 +0200 Subject: [PATCH] format with alejandra --- common.nix | 18 +++-------- gnome.nix | 8 ++--- home.nix | 10 +++--- vinzenz-lpt-hardware-configuration.nix | 45 ++++++++++++++------------ 4 files changed, 39 insertions(+), 42 deletions(-) diff --git a/common.nix b/common.nix index 34bb1f9..1ceb7f0 100644 --- a/common.nix +++ b/common.nix @@ -11,18 +11,14 @@ nixpkgs.config.allowUnfree = true; - boot = { - # supportedFilesystems = [ "btrfs" ]; - loader = { - systemd-boot.enable = true; - efi = { - canTouchEfiVariables = true; - efiSysMountPoint = "/boot/efi"; - }; + boot.loader = { + systemd-boot.enable = true; + efi = { + canTouchEfiVariables = true; + efiSysMountPoint = "/boot/efi"; }; }; - networking = { # wireless.enable = true; # Enables wireless support via wpa_supplicant. @@ -50,12 +46,9 @@ }; }; - time.timeZone = "Europe/Berlin"; - i18n = { defaultLocale = "en_US.UTF-8"; - extraLocaleSettings = { LC_ADDRESS = "de_DE.UTF-8"; LC_IDENTIFICATION = "de_DE.UTF-8"; @@ -90,7 +83,6 @@ enable = true; permitRootLogin = "no"; }; - }; # Configure console keymap diff --git a/gnome.nix b/gnome.nix index 3abbd72..8726c2c 100644 --- a/gnome.nix +++ b/gnome.nix @@ -5,9 +5,9 @@ }: { services = { xserver = { - # Enable the GNOME Desktop Environment. - displayManager.gdm.enable = true; - desktopManager.gnome.enable = true; + # Enable the GNOME Desktop Environment. + displayManager.gdm.enable = true; + desktopManager.gnome.enable = true; }; gnome = { @@ -28,5 +28,5 @@ gnome-weather gnome-music pkgs.gnome-connections -]; + ]; } diff --git a/home.nix b/home.nix index 93b76d2..8d2e341 100644 --- a/home.nix +++ b/home.nix @@ -56,7 +56,7 @@ my.insync-v3 jetbrains.rider alejandra - gnome-secrets + # gnome-secrets amberol dotnet-sdk_7 # gnome workbench @@ -124,10 +124,10 @@ enableUpdateCheck = false; extensions = [pkgs.vscode-extensions.bbenoist.nix]; userSettings = { - "files.insertFinalNewline" = true; - "[nix]" = { - "editor.tabSize" = 2; - }; + "files.insertFinalNewline" = true; + "[nix]" = { + "editor.tabSize" = 2; + }; }; }; }; diff --git a/vinzenz-lpt-hardware-configuration.nix b/vinzenz-lpt-hardware-configuration.nix index 79643cb..a44d0b1 100644 --- a/vinzenz-lpt-hardware-configuration.nix +++ b/vinzenz-lpt-hardware-configuration.nix @@ -1,31 +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 = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/34cb86c4-8823-4785-9672-92ef0bcd5eaf"; - fsType = "btrfs"; - options = [ "subvol=@" ]; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/34cb86c4-8823-4785-9672-92ef0bcd5eaf"; + fsType = "btrfs"; + options = ["subvol=@"]; + }; - fileSystems."/boot/efi" = - { device = "/dev/disk/by-uuid/2381-1CD2"; - fsType = "vfat"; - }; + fileSystems."/boot/efi" = { + device = "/dev/disk/by-uuid/2381-1CD2"; + fsType = "vfat"; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/f5932f70-60e4-4abe-b23d-2cab3c095c7d"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/f5932f70-60e4-4abe-b23d-2cab3c095c7d";} + ]; # 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