steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

format and change

Browse source
This commit is contained in:
steveej 2023-02-07 18:23:51 +01:00
parent 882ff4e5e9
commit 28c116337c
181 changed files with 2748 additions and 2578 deletions
Download patch file Download diff file Expand all files Collapse all files

7
nix/os/profiles/common/boot.nix
View file

@ -1,6 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
boot.kernelPackages = pkgs.linuxPackages;
boot.loader.grub = {
enable = true;
@ -14,6 +12,5 @@
boot.tmpOnTmpfs = true;
# Workaround for nm-pptp to enforce module load
boot.kernelModules = [ "nf_conntrack_proto_gre" "nf_conntrack_pptp" ];
boot.kernelModules = ["nf_conntrack_proto_gre" "nf_conntrack_pptp"];
}

6
nix/os/profiles/common/configuration.nix
View file

@ -1,7 +1,5 @@
{ ... }:
{
{...}: {
nixpkgs.overlays = builtins.attrValues (import ../../../overlays);
imports = [ ./boot.nix ./pkg.nix ./user.nix ./system.nix ./hw.nix ];
imports = [./boot.nix ./pkg.nix ./user.nix ./system.nix ./hw.nix];
}

7
nix/os/profiles/common/hw.nix
View file

@ -1,8 +1,5 @@
{ ... }:
{
{...}: {
hardware.trackpoint.emulateWheel = true;
boot.initrd.availableKernelModules =
[ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" "cryptd" ];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" "cryptd"];
}

17
nix/os/profiles/common/pkg.nix
View file

@ -1,17 +1,18 @@
{ config, pkgs, ... }:
{
imports = [ "${<home-manager-module>}/nixos" ];
home-manager.users.root =
import ../../../home-manager/configuration/text-minimal.nix {
inherit pkgs;
};
config,
pkgs,
...
}: {
imports = ["${<home-manager-module>}/nixos"];
home-manager.users.root = import ../../../home-manager/configuration/text-minimal.nix {
inherit pkgs;
};
nixpkgs.config = {
allowBroken = false;
allowUnfree = true;
packageOverrides = pkgs: with pkgs; { };
packageOverrides = pkgs: with pkgs; {};
};
environment.systemPackages = with pkgs; [

15
nix/os/profiles/common/system.nix
View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}: {
nix.binaryCachePublicKeys = [
# "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs="
];
@ -25,14 +28,14 @@
}
'';
environment.variables = { NIX_PATH = lib.mkForce pkgs.nixPath; };
environment.variables = {NIX_PATH = lib.mkForce pkgs.nixPath;};
# Fonts, I18N, Date ...
fonts.fonts = [ pkgs.corefonts ];
fonts.fonts = [pkgs.corefonts];
console.font = "lat9w-16";
i18n = { defaultLocale = "en_US.UTF-8"; };
i18n = {defaultLocale = "en_US.UTF-8";};
time.timeZone = "Etc/UTC";
services.gpm.enable = true;
@ -65,6 +68,6 @@
programs.zsh.enable = true;
users.defaultUserShell = pkgs.zsh;
environment.pathsToLink = [ "/share/zsh" ];
environment.pathsToLink = ["/share/zsh"];
programs.fuse.userAllowOther = true;
}

14
nix/os/profiles/common/user.nix
View file

@ -1,13 +1,15 @@
{ config, pkgs, ... }:
let
{
config,
pkgs,
...
}: let
passwords = import ../../../variables/passwords.crypt.nix;
inherit (import ../../lib/default.nix { }) mkUser mkRoot;
inherit (import ../../lib/default.nix {}) mkUser mkRoot;
in {
users.mutableUsers = false;
users.extraUsers.root = mkRoot { };
users.extraUsers.steveej = mkUser { uid = 1000; };
users.extraUsers.root = mkRoot {};
users.extraUsers.steveej = mkUser {uid = 1000;};
security.pam.u2f.enable = true;
security.pam.services.steveej.u2fAuth = true;