hd/cfg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

formatting

Browse source
This commit is contained in:
Henri Dohmen 2025-03-22 12:28:50 +01:00
parent e3e370c893
commit 43860609e1
22 changed files with 230 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

19
flake.nix
View file

@ -3,25 +3,28 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
};
outputs = { self, nixpkgs } @ inputs:
let lib = nixpkgs.lib; in
let mod = import ./mod { inherit lib; }; in
let specialArgs = { inherit inputs mod; }; in
outputs =
{ self, nixpkgs }@inputs:
let
lib = nixpkgs.lib;
mod = import ./mod { inherit lib; };
specialArgs = { inherit inputs mod; };
in
{
nixosConfigurations = {
"solo" = nixpkgs.lib.nixosSystem
{
"solo" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
inherit specialArgs;
modules = [ ./host/solo ];
};
"c2" = nixpkgs.lib.nixosSystem
{
"c2" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
inherit specialArgs;
modules = [ ./host/c2 ];
};
};
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
};
}

3
host/c2/default.nix
View file

@ -1,4 +1,5 @@
{ mod, ... }: {
{ mod, ... }:
{
networking.hostName = "c2";
imports = with mod; [

77
host/c2/hardware-configuration.nix
View file

@ -1,41 +1,68 @@
# 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, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.availableKernelModules = [
"xhci_pci"
"nvme"
"usb_storage"
"sd_mod"
"rtsx_pci_sdmmc"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/0aa43f8a-a6e8-47aa-800d-b02d98f2cb8a";
fsType = "btrfs";
options = [ "noatime" "compress=zstd:1" "subvol=@" ];
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/0aa43f8a-a6e8-47aa-800d-b02d98f2cb8a";
fsType = "btrfs";
options = [
"noatime"
"compress=zstd:1"
"subvol=@"
];
};
fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/0aa43f8a-a6e8-47aa-800d-b02d98f2cb8a";
fsType = "btrfs";
options = [ "noatime" "compress=zstd:1" "subvol=@nix" ];
};
fileSystems."/nix" = {
device = "/dev/disk/by-uuid/0aa43f8a-a6e8-47aa-800d-b02d98f2cb8a";
fsType = "btrfs";
options = [
"noatime"
"compress=zstd:1"
"subvol=@nix"
];
};
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/0aa43f8a-a6e8-47aa-800d-b02d98f2cb8a";
fsType = "btrfs";
options = [ "noatime" "compress=zstd:1" "subvol=@home" ];
};
fileSystems."/home" = {
device = "/dev/disk/by-uuid/0aa43f8a-a6e8-47aa-800d-b02d98f2cb8a";
fsType = "btrfs";
options = [
"noatime"
"compress=zstd:1"
"subvol=@home"
];
};
fileSystems."/boot/efi" =
{ device = "/dev/disk/by-uuid/829B-BDFC";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};
fileSystems."/boot/efi" = {
device = "/dev/disk/by-uuid/829B-BDFC";
fsType = "vfat";
options = [
"fmask=0022"
"dmask=0022"
];
};
swapDevices = [ ];

3
host/solo/default.nix
View file

@ -1,4 +1,5 @@
{ mod, ... }: {
{ mod, ... }:
{
networking.hostName = "solo";
services.xserver.enable = true;

49
host/solo/hardware-configuration.nix
View file

@ -1,32 +1,47 @@
# 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, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ];
boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"nvme"
"usbhid"
"sd_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/7554858a-648d-47d9-839a-6b66ef2b99d9";
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/7554858a-648d-47d9-839a-6b66ef2b99d9";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/8040-8FF4";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/9569220a-c151-44ca-a4db-037e63d314be"; }
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/8040-8FF4";
fsType = "vfat";
options = [
"fmask=0077"
"dmask=0077"
];
};
swapDevices = [
{ device = "/dev/disk/by-uuid/9569220a-c151-44ca-a4db-037e63d314be"; }
];
# 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

3
mod/audio.nix
View file

@ -1,4 +1,5 @@
{ pkgs, ... }: {
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
pavucontrol
alsa-utils

3
mod/boot.nix
View file

@ -1,4 +1,5 @@
{ ... }: {
{ ... }:
{
boot.loader = {
efi.canTouchEfiVariables = true;
grub = {

3
mod/collections/pc-common.nix
View file

@ -1,4 +1,5 @@
{ mod, ... }: {
{ mod, ... }:
{
imports = with mod; [
audio
boot

25
mod/default.nix
View file

@ -1,16 +1,21 @@
{ lib, ... }:
let
walk = path:
let dir = builtins.readDir path;
in lib.mapAttrs' (name: value: {
walk =
path:
let
dir = builtins.readDir path;
in
lib.mapAttrs' (name: value: {
name = lib.removeSuffix ".nix" name;
value = if value == "regular" then
import (path + "/${name}")
else if value == "directory" then
walk (path + "/${name}")
else
builtins.throw "Cannot handle item of type ${value}";
value =
if value == "regular" then
import (path + "/${name}")
else if value == "directory" then
walk (path + "/${name}")
else
builtins.throw "Cannot handle item of type ${value}";
}) dir;
in walk ./.
in
walk ./.

3
mod/fonts.nix
View file

@ -1,4 +1,5 @@
{ pkgs, ... }: {
{ pkgs, ... }:
{
fonts.packages = with pkgs; [
noto-fonts
noto-fonts-cjk-sans

3
mod/games.nix
View file

@ -1,4 +1,5 @@
{ pkgs, ... }: {
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
runelite
];

3
mod/keyboard.nix
View file

@ -1,4 +1,5 @@
{ pkgs, ... }: {
{ pkgs, ... }:
{
# hardware.keyboard.qmk.enable = true;
environment.systemPackages = with pkgs; [ vial ];
services.udev.packages = with pkgs; [ vial ];

3
mod/locale.nix
View file

@ -1,4 +1,5 @@
{ ... }: {
{ ... }:
{
time.timeZone = "Europe/Berlin";
i18n.defaultLocale = "en_US.UTF-8";

5
mod/network.nix
View file

@ -1,4 +1,5 @@
{ ... }: {
{ ... }:
{
networking.networkmanager.enable = true;
networking.networkmanager.wifi.macAddress = "random";
@ -10,7 +11,7 @@
useRoutingFeatures = "client";
};
networking.networkmanager.ensureProfiles.profiles = {
networking.networkmanager.ensureProfiles.profiles = {
"tuda-vpn" = {
connection = {
autoconnect = "false";

37
mod/nix.nix
View file

@ -1,24 +1,33 @@
{ lib, ... }: {
{ lib, ... }:
{
nix.settings = {
experimental-features = [ "nix-command" "flakes" ];
trusted-users = [ "root" "@wheel" ];
experimental-features = [
"nix-command"
"flakes"
];
trusted-users = [
"root"
"@wheel"
];
auto-optimise-store = true;
};
programs.nix-ld.enable = true;
nixpkgs.config.allowUnfree = false;
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"nvidia-x11"
"nvidia-settings"
"vscode"
"obsidian"
"steam"
"steam-unwrapped"
"gateway" # jetbrains
"spotify"
"rust-rover"
];
nixpkgs.config.allowUnfreePredicate =
pkg:
builtins.elem (lib.getName pkg) [
"nvidia-x11"
"nvidia-settings"
"vscode"
"obsidian"
"steam"
"steam-unwrapped"
"gateway" # jetbrains
"spotify"
"rust-rover"
];
# TODO this is for zulip 5.11.1
nixpkgs.config.permittedInsecurePackages = [

3
mod/nvidia-gpu.nix
View file

@ -1,4 +1,5 @@
{ config, ... }: {
{ config, ... }:
{
services.xserver.videoDrivers = [ "nvidia" ];
hardware.graphics = {

3
mod/security.nix
View file

@ -1,3 +1,4 @@
{ ... }: {
{ ... }:
{
security.rtkit.enable = true;
}

3
mod/services.nix
View file

@ -1,4 +1,5 @@
{ ... }: {
{ ... }:
{
systemd.services.NetworkManager-wait-online.enable = false;
services.printing.enable = true;
services.avahi = {

3
mod/shell.nix
View file

@ -1,4 +1,5 @@
{ pkgs, ... }: {
{ pkgs, ... }:
{
environment.shells = with pkgs; [
fish
bashInteractive

82
mod/software.nix
View file

@ -1,52 +1,50 @@
{ pkgs, ... }: {
{ pkgs, ... }:
{
environment.systemPackages = let
editors = with pkgs; [
vscode
emacs
jetbrains.gateway
jetbrains.rust-rover
];
environment.systemPackages =
let
editors = with pkgs; [
vscode
emacs
jetbrains.gateway
jetbrains.rust-rover
];
messengers = with pkgs; [
signal-desktop
element-desktop
zulip
vesktop
];
messengers = with pkgs; [
signal-desktop
element-desktop
zulip
vesktop
];
util = with pkgs; [
wireguard-tools
bitwarden
kitty
nixfmt-rfc-style
nil
];
util = with pkgs; [
wireguard-tools
bitwarden
kitty
nixfmt-rfc-style
nil
];
media = with pkgs; [
vlc
spotify
calibre
];
media = with pkgs; [
vlc
spotify
calibre
];
productivity = with pkgs; [
zotero
obsidian
];
productivity = with pkgs; [
zotero
obsidian
];
dev = with pkgs; [
rustup
python313
gcc
binutils
];
dev = with pkgs; [
rustup
python313
gcc
binutils
];
in editors
++ messengers
++ util
++ media
++ productivity
++ dev;
in
editors ++ messengers ++ util ++ media ++ productivity ++ dev;
virtualisation = {
docker.enable = true;

10
mod/users.nix
View file

@ -1,9 +1,13 @@
{ pkgs, ... }: {
{ pkgs, ... }:
{
users.users.hd = {
description = "Henri";
isNormalUser = true;
extraGroups = [ "networkmanager" "wheel" ];
extraGroups = [
"networkmanager"
"wheel"
];
shell = pkgs.fish;
packages = [];
packages = [ ];
};
}

3
mod/window-manager.nix
View file

@ -1,4 +1,5 @@
{ pkgs, ... }: {
{ pkgs, ... }:
{
# Enable the KDE Plasma Desktop Environment.
services.displayManager.sddm = {
enable = true;