insects/nix-config
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

treewide: format with nixfmt

Browse source
This commit is contained in:
insects 2024-09-22 10:56:40 +02:00
parent 303e982a8e
commit 26ad72592a
47 changed files with 380 additions and 725 deletions
Download patch file Download diff file Expand all files Collapse all files

52
nixos/enoko/configuration.nix
View file

@ -1,10 +1,4 @@
{ inputs
, lib
, config
, pkgs
, ...
}:
{
{ inputs, lib, config, pkgs, ... }: {
imports = [
../common
./hardware-configuration.nix
@ -12,27 +6,20 @@
../desktop/plasma.nix
];
nixpkgs = {
config = {
allowUnfree = true;
nixpkgs = { config = { allowUnfree = true; }; };
nix = let flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
in {
settings = {
flake-registry = "";
nix-path = config.nix.nixPath;
};
channel.enable = false;
registry = lib.mapAttrs (_: flake: { inherit flake; }) flakeInputs;
nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
};
nix =
let
flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
in
{
settings = {
flake-registry = "";
nix-path = config.nix.nixPath;
};
channel.enable = false;
registry = lib.mapAttrs (_: flake: { inherit flake; }) flakeInputs;
nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
};
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
@ -64,17 +51,12 @@
lu = {
shell = pkgs.fish;
isNormalUser = true;
extraGroups = [
"wheel"
"storage"
];
extraGroups = [ "wheel" "storage" ];
};
};
# network stuff
networking.networkmanager = {
enable = true;
};
networking.networkmanager = { enable = true; };
# fish shell
programs.fish = {
@ -89,9 +71,9 @@
# enable ppd specifically for the framework
services.power-profiles-daemon.enable = true;
boot.kernelParams =
lib.optionals (lib.versionOlder config.boot.kernelPackages.kernel.version "6.8")
[ "rtc_cmos.use_acpi_alarm=1" ];
boot.kernelParams = lib.optionals
(lib.versionOlder config.boot.kernelPackages.kernel.version "6.8")
[ "rtc_cmos.use_acpi_alarm=1" ];
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
system.stateVersion = "24.05";

28
nixos/enoko/hardware-configuration.nix
View file

@ -1,25 +1,13 @@
# 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")
];
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"thunderbolt"
"usb_storage"
"sd_mod"
];
boot.initrd.availableKernelModules =
[ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
@ -32,10 +20,7 @@
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/6157-ADC8";
fsType = "vfat";
options = [
"fmask=0022"
"dmask=0022"
];
options = [ "fmask=0022" "dmask=0022" ];
};
swapDevices = [ ];
@ -48,5 +33,6 @@
# networking.interfaces.wlp1s0.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;
}