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;

8
nix/os/profiles/containers/configuration.nix
View file

@ -1,10 +1,8 @@
{ ... }:
{
{...}: {
nixpkgs.overlays = builtins.attrValues (import ../../../overlays);
networking.useHostResolvConf = false;
services.resolved = { enable = true; };
services.resolved = {enable = true;};
imports = [ ../../modules/ddclient-ovh.nix ];
imports = [../../modules/ddclient-ovh.nix];
}

4
nix/os/profiles/graphical/boot.nix
View file

@ -1,3 +1 @@
{ lib, ... }:
{ }
{lib, ...}: {}

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

@ -1,5 +1,3 @@
{ pkgs, ... }:
{
imports = [ ./boot.nix ./system.nix ./hw.nix ];
{pkgs, ...}: {
imports = [./boot.nix ./system.nix ./hw.nix];
}

4
nix/os/profiles/graphical/hw.nix
View file

@ -1,5 +1,3 @@
{ ... }:
{
{...}: {
hardware.enableAllFirmware = true;
}

12
nix/os/profiles/graphical/system.nix
View file

@ -1,6 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
networking.networkmanager = {
enable = true;
dns = "systemd-resolved";
@ -28,7 +26,7 @@
};
};
# required for running blueman-applet in user sessions
services.dbus.packages = with pkgs; [ blueman ];
services.dbus.packages = with pkgs; [blueman];
services.blueman.enable = true;
services.xserver = {
@ -68,8 +66,7 @@
lightdm = {
enable = true;
background =
"${pkgs.nixos-artwork.wallpapers.simple-blue}/share/artwork/gnome/nix-wallpaper-simple-blue.png";
background = "${pkgs.nixos-artwork.wallpapers.simple-blue}/share/artwork/gnome/nix-wallpaper-simple-blue.png";
};
sessionCommands = "";
@ -102,8 +99,7 @@
};
# More Services
services.udev.packages =
[ pkgs.libu2f-host pkgs.yubikey-personalization pkgs.android-udev-rules ];
services.udev.packages = [pkgs.libu2f-host pkgs.yubikey-personalization pkgs.android-udev-rules];
services.udev.extraRules = ''
# OnePlusOne
ATTR{idVendor}=="05c6", ATTR{idProduct}=="6764", SYMLINK+="libmtp-%k", MODE="660", GROUP="audio", ENV{ID_MTP_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1", TAG+="uaccess"

55
nix/os/profiles/install-medium/iso/iso.nix
View file

@ -1,26 +1,29 @@
# This module defines a small NixOS installation CD. It does not
# contain any graphical stuff.
{ config, pkgs, lib, ... }:
let
{
config,
pkgs,
lib,
...
}: let
nixos-init-script = ''
#!${pkgs.stdenv.shell}
export HOME=/root
export PATH=${
pkgs.lib.makeBinPath [
config.nix.package
pkgs.systemd
pkgs.gnugrep
pkgs.gnused
config.system.build.nixos-rebuild
config.system.build.nixos-install
pkgs.utillinux
pkgs.e2fsprogs
pkgs.coreutils
pkgs.hdparm
]
}:$PATH
pkgs.lib.makeBinPath [
config.nix.package
pkgs.systemd
pkgs.gnugrep
pkgs.gnused
config.system.build.nixos-rebuild
config.system.build.nixos-install
pkgs.utillinux
pkgs.e2fsprogs
pkgs.coreutils
pkgs.hdparm
]
}:$PATH
export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
set -xe
@ -57,7 +60,7 @@ let
nix-channel --update
nixos-install
reboot
'';
'';
in {
imports = [
<nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix>
@ -67,12 +70,13 @@ in {
# <nixpkgs/nixos/modules/installer/cd-dvd/channel.nix>
];
isoImage.isoName = lib.mkForce
isoImage.isoName =
lib.mkForce
"${config.isoImage.isoBaseName}-${pkgs.stdenv.hostPlatform.system}.iso";
boot.loader.timeout = lib.mkForce 0;
boot.postBootCommands = "";
environment.systemPackages = [ ];
environment.systemPackages = [];
users.users.root = {
openssh.authorizedKeys.keys = [
@ -81,19 +85,18 @@ in {
};
services.gpm.enable = true;
systemd.services.sshd.wantedBy = lib.mkForce [ "multi-user.target" ];
systemd.services.sshd.wantedBy = lib.mkForce ["multi-user.target"];
systemd.services.nixos-init = {
script = nixos-init-script;
path = with pkgs; [ ];
path = with pkgs; [];
description =
"Initialize /dev/vda from configuration.nix found at /dev/vdb";
description = "Initialize /dev/vda from configuration.nix found at /dev/vdb";
enable = true;
wantedBy = [ "multi-user.target" ];
after = [ "multi-user.target" ];
requires = [ "network-online.target" ];
wantedBy = ["multi-user.target"];
after = ["multi-user.target"];
requires = ["network-online.target"];
restartIfChanged = false;
unitConfig.X-StopOnRemoval = false;

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

@ -1,6 +1,8 @@
{ config, pkgs, ... }:
{
config,
pkgs,
...
}: {
environment.systemPackages = with pkgs; [
podman
runc

6
nix/os/profiles/removable-medium/boot.nix
View file

@ -1,7 +1,5 @@
{ lib, ... }:
{
{lib, ...}: {
boot.loader.grub.efiInstallAsRemovable = lib.mkForce true;
boot.loader.efi.canTouchEfiVariables = lib.mkForce false;
boot.extraModulePackages = [ ];
boot.extraModulePackages = [];
}

4
nix/os/profiles/removable-medium/configuration.nix
View file

@ -1,6 +1,4 @@
{ ... }:
{
{...}: {
imports = [
../../modules/opinionatedDisk.nix

4
nix/os/profiles/removable-medium/hw.nix
View file

@ -1,6 +1,4 @@
{ ... }:
{
{...}: {
hardware.opinionatedDisk.enable = true;
hardware.enableAllFirmware = true;
}

11
nix/os/profiles/removable-medium/pkg.nix
View file

@ -1,8 +1,5 @@
{ pkgs, ... }:
{
home-manager.users.steveej =
import ../../../home-manager/configuration/graphical-removable.nix {
inherit pkgs;
};
{pkgs, ...}: {
home-manager.users.steveej = import ../../../home-manager/configuration/graphical-removable.nix {
inherit pkgs;
};
}

12
nix/os/profiles/removable-medium/system.nix
View file

@ -1,9 +1,11 @@
{ config, lib, pkgs, ... }:
let
{
config,
lib,
pkgs,
...
}: let
in {
services.printing = { enable = false; };
services.printing = {enable = false;};
services.spice-vdagentd.enable = true;
services.qemuGuest.enable = true;