Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c2aa932494 | ||
|
|
29ab335879 | ||
|
|
ec5b785a8a | ||
|
|
a7cc61a624 | ||
|
|
281d763c62 | ||
|
|
850d673035 |
45 changed files with 1054 additions and 816 deletions
76
flake.nix
76
flake.nix
|
|
@ -9,7 +9,6 @@
|
|||
};
|
||||
|
||||
#keep-sorted start block=yes
|
||||
|
||||
flake-parts = {
|
||||
url = "github:hercules-ci/flake-parts";
|
||||
#inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -97,28 +96,18 @@
|
|||
inputs@{
|
||||
self,
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
# keep-sorted start
|
||||
lanzaboote,
|
||||
niri,
|
||||
nix-vscode-extensions,
|
||||
nixos-generators,
|
||||
nixos-raspberrypi,
|
||||
nixpkgs-unstable,
|
||||
servicepoint-cli,
|
||||
servicepoint-simulator,
|
||||
servicepoint-tanks,
|
||||
stylix,
|
||||
treefmt-nix,
|
||||
zerforschen-plus,
|
||||
# keep-sorted end
|
||||
...
|
||||
}:
|
||||
let
|
||||
devices = import ./devices.nix { inherit self; };
|
||||
inherit (nixpkgs) lib;
|
||||
forDevice = f: lib.mapAttrs (device: value: f (value // { inherit device; })) devices;
|
||||
supported-systems = lib.attrsets.mapAttrsToList (k: v: v.system) devices;
|
||||
nixosConfigurations = import ./nixosConfigurations.nix { inherit inputs lib; };
|
||||
supported-systems = lib.unique (lib.mapAttrsToList (_: v: v.pkgs.system) nixosConfigurations);
|
||||
treefmt-config = {
|
||||
projectRootFile = "flake.nix";
|
||||
programs = {
|
||||
|
|
@ -147,37 +136,17 @@
|
|||
in
|
||||
{
|
||||
overlays = {
|
||||
unstable-packages = final: prev: {
|
||||
unstable = final: prev: {
|
||||
unstable = import nixpkgs-unstable {
|
||||
localSystem = prev.stdenv.hostPlatform;
|
||||
inherit (prev) config;
|
||||
};
|
||||
};
|
||||
vscodeExtensions = nix-vscode-extensions.overlays.default;
|
||||
niri = niri.overlays.niri;
|
||||
};
|
||||
|
||||
nixosModules = (importModuleDir ./nixosModules) // {
|
||||
niri =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
imports = [ niri.nixosModules.niri ];
|
||||
nixpkgs.overlays = [ niri.overlays.niri ];
|
||||
|
||||
programs.niri = {
|
||||
enable = true;
|
||||
#package = pkgs.niri-stable;
|
||||
};
|
||||
};
|
||||
pkgs-unstable = {
|
||||
nixpkgs.overlays = [ self.overlays.unstable-packages ];
|
||||
};
|
||||
pkgs-vscode-extensions = {
|
||||
nixpkgs.overlays = [ nix-vscode-extensions.overlays.default ];
|
||||
};
|
||||
# required modules to use other modules, should not do anything on their own
|
||||
default = {
|
||||
imports = [ self.nixosModules.allowed-unfree-list ];
|
||||
};
|
||||
};
|
||||
nixosModules = importModuleDir ./nixosModules;
|
||||
|
||||
homeModules = importModuleDir ./homeModules;
|
||||
homeConfigurations = {
|
||||
|
|
@ -185,38 +154,7 @@
|
|||
ronja = ./homeConfigurations/ronja;
|
||||
};
|
||||
|
||||
nixosConfigurations = forDevice (
|
||||
{
|
||||
device,
|
||||
system,
|
||||
home-manager-users ? { },
|
||||
nixosSystem ? nixpkgs.lib.nixosSystem,
|
||||
...
|
||||
}:
|
||||
let
|
||||
specialArgs = inputs // {
|
||||
inherit device home-manager-users devices;
|
||||
};
|
||||
in
|
||||
nixosSystem {
|
||||
inherit specialArgs;
|
||||
modules = [
|
||||
{
|
||||
imports = [
|
||||
./nixosConfigurations/${device}
|
||||
self.nixosModules.global-settings
|
||||
]
|
||||
++ (lib.optionals (home-manager-users != { }) [
|
||||
self.nixosModules.global-settings-desktop
|
||||
]);
|
||||
|
||||
nixpkgs = {
|
||||
hostPlatform = lib.mkDefault system;
|
||||
};
|
||||
}
|
||||
];
|
||||
}
|
||||
);
|
||||
inherit nixosConfigurations;
|
||||
|
||||
formatter = forAllSystems ({ treefmt-eval, ... }: treefmt-eval.config.build.wrapper);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, self, ... }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
# keep-sorted start
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
programs.git = {
|
||||
enable = true;
|
||||
settings.init.defaultBranch = "main";
|
||||
};
|
||||
}
|
||||
127
nixosConfigurations.nix
Normal file
127
nixosConfigurations.nix
Normal file
|
|
@ -0,0 +1,127 @@
|
|||
{
|
||||
inputs,
|
||||
lib,
|
||||
}:
|
||||
let
|
||||
devices = import ./devices.nix { inherit (inputs) self; };
|
||||
inherit (inputs)
|
||||
self
|
||||
home-manager
|
||||
lanzaboote
|
||||
nova-shell
|
||||
servicepoint-cli
|
||||
servicepoint-simulator
|
||||
servicepoint-tanks
|
||||
stylix
|
||||
zerforschen-plus
|
||||
;
|
||||
forDevice = f: lib.mapAttrs (device: value: f (value // { inherit device; })) devices;
|
||||
in
|
||||
forDevice (
|
||||
{
|
||||
device,
|
||||
system,
|
||||
home-manager-users ? { },
|
||||
nixosSystem ? inputs.nixpkgs.lib.nixosSystem,
|
||||
...
|
||||
}:
|
||||
let
|
||||
specialArgs = inputs // {
|
||||
inherit device home-manager-users devices;
|
||||
};
|
||||
in
|
||||
nixosSystem {
|
||||
inherit specialArgs;
|
||||
modules = [
|
||||
./nixosConfigurations/${device}
|
||||
self.nixosModules.default
|
||||
|
||||
# keep-sorted start
|
||||
home-manager.nixosModules.home-manager
|
||||
lanzaboote.nixosModules.lanzaboote
|
||||
nova-shell.nixosModules.default
|
||||
servicepoint-cli.nixosModules.default
|
||||
servicepoint-simulator.nixosModules.default
|
||||
servicepoint-tanks.nixosModules.default
|
||||
stylix.nixosModules.stylix
|
||||
zerforschen-plus.nixosModules.default
|
||||
# keep-sorted end
|
||||
|
||||
# Base config
|
||||
{
|
||||
nixpkgs.hostPlatform = lib.mkDefault system;
|
||||
networking.hostName = device;
|
||||
system = {
|
||||
stateVersion = "22.11";
|
||||
autoUpgrade.flake = "git+https://git.berlin.ccc.de/vinzenz/nixos-configuration.git";
|
||||
};
|
||||
nix.settings.experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
documentation = {
|
||||
info.enable = false;
|
||||
doc.enable = false;
|
||||
};
|
||||
|
||||
my = {
|
||||
# keep-sorted start
|
||||
autoupdate.enable = true;
|
||||
distributedBuilds.enable = true;
|
||||
extraCaches.enable = true;
|
||||
git.enable = true;
|
||||
globalinstalls.enable = true;
|
||||
lixIsNix.enable = true;
|
||||
openssh.enable = true;
|
||||
overlays.unstable.enable = true;
|
||||
overlays.vscodeExtensions.enable = true;
|
||||
# prometheusNode.enable = true;
|
||||
systemdBoot.enable = true;
|
||||
tailscale.enable = true;
|
||||
# keep-sorted end
|
||||
};
|
||||
}
|
||||
]
|
||||
++ lib.optionals (home-manager-users != { }) [
|
||||
# Desktop config
|
||||
{
|
||||
home-manager = {
|
||||
extraSpecialArgs = specialArgs;
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
users = home-manager-users;
|
||||
sharedModules = [
|
||||
{ home.stateVersion = "22.11"; }
|
||||
# keep-sorted start
|
||||
self.homeModules.gnome-extensions
|
||||
self.homeModules.nano
|
||||
self.homeModules.templates
|
||||
self.homeModules.zsh-basics
|
||||
# keep-sorted end
|
||||
];
|
||||
};
|
||||
|
||||
time.timeZone = "Europe/Berlin";
|
||||
|
||||
# on desktops, keep the device useable interactively during expensive builds
|
||||
nix = {
|
||||
daemonCPUSchedPolicy = "idle";
|
||||
daemonIOSchedClass = "idle";
|
||||
};
|
||||
|
||||
my = {
|
||||
# keep-sorted start
|
||||
enDe.enable = true;
|
||||
firmwareUpdates.enable = true;
|
||||
gnome.enable = true;
|
||||
kdeconnect.enable = true;
|
||||
modernDesktop.enable = true;
|
||||
nixLd.enable = true;
|
||||
quietBoot.enable = true;
|
||||
stylix.enable = true;
|
||||
# keep-sorted end
|
||||
};
|
||||
}
|
||||
];
|
||||
}
|
||||
)
|
||||
|
|
@ -10,11 +10,9 @@
|
|||
# No one got time for xz compression.
|
||||
#isoImage.squashfsCompression = "zstd";
|
||||
|
||||
boot.loader = {
|
||||
raspberry-pi.bootloader = "kernel";
|
||||
systemd-boot.enable = lib.mkForce false;
|
||||
#generic-extlinux-compatible.enable = lib.mkForce false;
|
||||
};
|
||||
boot.loader.raspberry-pi.bootloader = "kernel";
|
||||
|
||||
my.systemdBoot.enable = lib.mkForce false;
|
||||
|
||||
/*
|
||||
fileSystems = {
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
{
|
||||
pkgs,
|
||||
self,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
|
||||
nixpkgs.overlays = [ self.overlays.unstable-packages ];
|
||||
my.overlays.unstable.enable = true;
|
||||
allowedUnfreePackages = [ "claude-code" ];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,8 +1,13 @@
|
|||
{ self, ... }:
|
||||
{ modulesPath, ... }:
|
||||
{
|
||||
imports = [ self.nixosModules.pxvirt-guest ];
|
||||
imports = [ (modulesPath + "/virtualisation/proxmox-lxc.nix") ];
|
||||
|
||||
config = {
|
||||
my.pxvirtGuest.enable = true;
|
||||
|
||||
proxmoxLXC = {
|
||||
manageNetwork = false;
|
||||
privileged = false;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
{ self, ... }:
|
||||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
./hardware.nix
|
||||
./forgejo-runner.nix
|
||||
self.nixosModules.podman
|
||||
];
|
||||
|
||||
config = {
|
||||
my.podman.enable = true;
|
||||
|
||||
# uncomment for build check on non arm system (requires --impure)
|
||||
# nixpkgs.buildPlatform = builtins.currentSystem;
|
||||
services.tailscale.useRoutingFeatures = "both";
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
{
|
||||
imports = [
|
||||
./hardware.nix
|
||||
self.nixosModules.user-muede
|
||||
self.nixosModules.gnome
|
||||
self.nixosModules.wine-gaming
|
||||
self.nixosModules.steam
|
||||
self.nixosModules.podman
|
||||
self.nixosModules.muede-desktop-settings
|
||||
self.nixosModules.intel-graphics
|
||||
self.nixosModules.secure-boot
|
||||
];
|
||||
|
||||
config = {
|
||||
my.users.muede.enable = true;
|
||||
my.wineGaming.enable = true;
|
||||
my.steam.enable = true;
|
||||
my.podman.enable = true;
|
||||
my.muedeDesktopSettings.enable = true;
|
||||
my.intelGraphics.enable = true;
|
||||
my.secureBoot.enable = true;
|
||||
|
||||
nix.settings.extra-platforms = [
|
||||
"aarch64-linux"
|
||||
"i686-linux"
|
||||
|
|
|
|||
|
|
@ -1,21 +1,20 @@
|
|||
{ pkgs, self, ... }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
./hardware.nix
|
||||
# ./vscode-server.nix
|
||||
# ./hass.nix
|
||||
|
||||
self.nixosModules.user-muede
|
||||
self.nixosModules.gnome
|
||||
self.nixosModules.wine-gaming
|
||||
self.nixosModules.steam
|
||||
self.nixosModules.podman
|
||||
self.nixosModules.muede-desktop-settings
|
||||
self.nixosModules.amd-graphics
|
||||
self.nixosModules.secure-boot
|
||||
];
|
||||
|
||||
config = {
|
||||
my.users.muede.enable = true;
|
||||
my.wineGaming.enable = true;
|
||||
my.steam.enable = true;
|
||||
my.podman.enable = true;
|
||||
my.muedeDesktopSettings.enable = true;
|
||||
my.amdGraphics.enable = true;
|
||||
my.secureBoot.enable = true;
|
||||
|
||||
nix.settings.extra-platforms = [
|
||||
"aarch64-linux"
|
||||
"i686-linux"
|
||||
|
|
|
|||
|
|
@ -1,20 +1,15 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
self,
|
||||
...
|
||||
}:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
./hardware.nix
|
||||
self.nixosModules.user-ronja
|
||||
self.nixosModules.gnome
|
||||
self.nixosModules.steam
|
||||
self.nixosModules.wine-gaming
|
||||
self.nixosModules.muede-desktop-settings
|
||||
];
|
||||
|
||||
config = {
|
||||
my.users.ronja.enable = true;
|
||||
my.steam.enable = true;
|
||||
my.wineGaming.enable = true;
|
||||
my.muedeDesktopSettings.enable = true;
|
||||
|
||||
# Configure keymap in X11
|
||||
services.xserver.xkb = {
|
||||
layout = "de";
|
||||
|
|
@ -24,8 +19,6 @@
|
|||
# Configure console keymap
|
||||
console.keyMap = "de";
|
||||
|
||||
# List packages installed in system profile. To search, run:
|
||||
# $ nix search wget
|
||||
environment.systemPackages = with pkgs; [
|
||||
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
|
||||
# wget
|
||||
|
|
|
|||
|
|
@ -1,15 +1,24 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
boot.kernelModules = [ "amdgpu" ];
|
||||
services.xserver.videoDrivers = [ "amdgpu" ];
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
options.my.amdGraphics.enable = lib.mkEnableOption "AMD graphics drivers";
|
||||
|
||||
hardware = {
|
||||
graphics.enable = true;
|
||||
amdgpu = {
|
||||
opencl.enable = true;
|
||||
overdrive.enable = true;
|
||||
config = lib.mkIf config.my.amdGraphics.enable {
|
||||
boot.kernelModules = [ "amdgpu" ];
|
||||
services.xserver.videoDrivers = [ "amdgpu" ];
|
||||
|
||||
hardware = {
|
||||
graphics.enable = true;
|
||||
amdgpu = {
|
||||
opencl.enable = true;
|
||||
overdrive.enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [ nvtopPackages.amd ];
|
||||
environment.systemPackages = with pkgs; [ nvtopPackages.amd ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,21 @@
|
|||
{ lib, config, ... }:
|
||||
{
|
||||
nix = {
|
||||
optimise.automatic = true;
|
||||
gc = {
|
||||
automatic = true;
|
||||
options.my.autoupdate.enable = lib.mkEnableOption "automatic Nix GC and system upgrades";
|
||||
|
||||
config = lib.mkIf config.my.autoupdate.enable {
|
||||
nix = {
|
||||
optimise.automatic = true;
|
||||
gc = {
|
||||
automatic = true;
|
||||
dates = "daily";
|
||||
options = "--delete-older-than 7d";
|
||||
};
|
||||
};
|
||||
|
||||
system.autoUpgrade = {
|
||||
enable = true;
|
||||
dates = "daily";
|
||||
options = "--delete-older-than 7d";
|
||||
# do not forget to set `flake` when using this module!
|
||||
};
|
||||
};
|
||||
|
||||
system.autoUpgrade = {
|
||||
enable = true;
|
||||
dates = "daily";
|
||||
# do not forget to set `flake` when using this module!
|
||||
};
|
||||
}
|
||||
|
|
|
|||
39
nixosModules/default.nix
Normal file
39
nixosModules/default.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
# keep-sorted start
|
||||
./allowed-unfree-list.nix
|
||||
./amd-graphics.nix
|
||||
./autoupdate.nix
|
||||
./distributed-builds.nix
|
||||
./en-de.nix
|
||||
./extra-caches.nix
|
||||
./firmware-updates.nix
|
||||
./git.nix
|
||||
./globalinstalls.nix
|
||||
./gnome.nix
|
||||
./intel-graphics.nix
|
||||
./kdeconnect.nix
|
||||
./latex.nix
|
||||
./lix-is-nix.nix
|
||||
./modern-desktop.nix
|
||||
./muede-desktop-settings.nix
|
||||
./nix-ld.nix
|
||||
./nixpkgs-overlays.nix
|
||||
./openssh.nix
|
||||
./podman.nix
|
||||
./printing.nix
|
||||
./prometheus-node.nix
|
||||
./pxvirt-guest.nix
|
||||
./quiet-boot.nix
|
||||
./secure-boot.nix
|
||||
./steam.nix
|
||||
./stylix.nix
|
||||
./systemd-boot.nix
|
||||
./tailscale.nix
|
||||
./user-muede.nix
|
||||
./user-ronja.nix
|
||||
./wine-gaming.nix
|
||||
# keep-sorted end
|
||||
];
|
||||
}
|
||||
|
|
@ -32,62 +32,77 @@ let
|
|||
# distributedBuilds.hostPublicKey = "ssh-ed25519 AAAA..."; # from: ssh-keyscan -t ed25519 <hostname>
|
||||
# All machines automatically discover and use it after the next rebuild.
|
||||
|
||||
buildServerDevices = lib.filterAttrs (_: v: (v.distributedBuilds or { }).isBuilder or false) devices;
|
||||
buildServerDevices = lib.filterAttrs (
|
||||
_: v: (v.distributedBuilds or { }).isBuilder or false
|
||||
) devices;
|
||||
|
||||
knownHosts = lib.pipe buildServerDevices [
|
||||
(lib.filterAttrs (_: v: v.distributedBuilds ? hostPublicKey))
|
||||
(lib.mapAttrs (hostName: v: {
|
||||
publicKey = v.distributedBuilds.hostPublicKey;
|
||||
}))
|
||||
(lib.mapAttrs (
|
||||
_: v: {
|
||||
publicKey = v.distributedBuilds.hostPublicKey;
|
||||
}
|
||||
))
|
||||
];
|
||||
|
||||
buildMachineList = lib.mapAttrsToList (hostName: v: {
|
||||
inherit hostName;
|
||||
systems = [ v.system ];
|
||||
sshUser = buildUser;
|
||||
sshKey = sshKeyPath;
|
||||
protocol = "ssh-ng";
|
||||
} // lib.optionalAttrs (v.distributedBuilds ? speedFactor) {
|
||||
speedFactor = v.distributedBuilds.speedFactor;
|
||||
} // {
|
||||
supportedFeatures = [
|
||||
"nixos-test"
|
||||
"big-parallel"
|
||||
"kvm"
|
||||
"benchmark"
|
||||
];
|
||||
}) buildServerDevices;
|
||||
buildMachineList = lib.mapAttrsToList (
|
||||
hostName: v:
|
||||
{
|
||||
inherit hostName;
|
||||
systems = [ v.system ];
|
||||
sshUser = buildUser;
|
||||
sshKey = sshKeyPath;
|
||||
protocol = "ssh-ng";
|
||||
}
|
||||
// lib.optionalAttrs (v.distributedBuilds ? speedFactor) {
|
||||
speedFactor = v.distributedBuilds.speedFactor;
|
||||
}
|
||||
// {
|
||||
supportedFeatures = [
|
||||
"nixos-test"
|
||||
"big-parallel"
|
||||
"kvm"
|
||||
"benchmark"
|
||||
];
|
||||
}
|
||||
) buildServerDevices;
|
||||
|
||||
remoteMachines = builtins.filter (m: m.hostName != config.networking.hostName) buildMachineList;
|
||||
in
|
||||
{
|
||||
# Dedicated user for receiving distributed build connections
|
||||
programs.ssh.knownHosts = knownHosts;
|
||||
options.my.distributedBuilds.enable = lib.mkEnableOption "distributed Nix builds";
|
||||
|
||||
users.users.${buildUser} = {
|
||||
isSystemUser = true;
|
||||
group = buildUser;
|
||||
useDefaultShell = true;
|
||||
openssh.authorizedKeys.keys = map (k: ''command="nix daemon --stdio",restrict ${k}'') authorizedPublicKeys;
|
||||
};
|
||||
users.groups.${buildUser} = { };
|
||||
config = lib.mkIf config.my.distributedBuilds.enable {
|
||||
programs.ssh.knownHosts = knownHosts;
|
||||
|
||||
nix = {
|
||||
distributedBuilds = remoteMachines != [ ];
|
||||
buildMachines = remoteMachines;
|
||||
settings = {
|
||||
trusted-users = [ buildUser ];
|
||||
builders-use-substitutes = true;
|
||||
max-jobs = (devices.${config.networking.hostName}.distributedBuilds or { }).maxJobs or "auto";
|
||||
cores = 0;
|
||||
min-free = 10 * 1024 * 1024;
|
||||
max-free = 200 * 1024 * 1024;
|
||||
# Dedicated user for receiving distributed build connections
|
||||
users.users.${buildUser} = {
|
||||
isSystemUser = true;
|
||||
group = buildUser;
|
||||
useDefaultShell = true;
|
||||
openssh.authorizedKeys.keys = map (
|
||||
k: ''command="nix daemon --stdio",restrict ${k}''
|
||||
) authorizedPublicKeys;
|
||||
};
|
||||
users.groups.${buildUser} = { };
|
||||
|
||||
nix = {
|
||||
distributedBuilds = remoteMachines != [ ];
|
||||
buildMachines = remoteMachines;
|
||||
settings = {
|
||||
trusted-users = [ buildUser ];
|
||||
builders-use-substitutes = true;
|
||||
max-jobs = (devices.${config.networking.hostName}.distributedBuilds or { }).maxJobs or "auto";
|
||||
cores = 0;
|
||||
min-free = 10 * 1024 * 1024;
|
||||
max-free = 200 * 1024 * 1024;
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.nix-daemon.serviceConfig = {
|
||||
MemoryAccounting = true;
|
||||
MemoryMax = "90%";
|
||||
OOMScoreAdjust = 500;
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.nix-daemon.serviceConfig = {
|
||||
MemoryAccounting = true;
|
||||
MemoryMax = "90%";
|
||||
OOMScoreAdjust = 500;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,31 +1,40 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
i18n = {
|
||||
defaultLocale = "en_US.UTF-8";
|
||||
extraLocales = [
|
||||
"de_DE.UTF-8/UTF-8"
|
||||
];
|
||||
extraLocaleSettings = {
|
||||
LC_ADDRESS = "de_DE.UTF-8";
|
||||
LC_IDENTIFICATION = "de_DE.UTF-8";
|
||||
LC_MEASUREMENT = "de_DE.UTF-8";
|
||||
LC_MONETARY = "de_DE.UTF-8";
|
||||
LC_NAME = "de_DE.UTF-8";
|
||||
LC_NUMERIC = "de_DE.UTF-8";
|
||||
LC_PAPER = "de_DE.UTF-8";
|
||||
LC_TELEPHONE = "de_DE.UTF-8";
|
||||
LC_TIME = "de_DE.UTF-8";
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
options.my.enDe.enable = lib.mkEnableOption "English/German locale and language packs";
|
||||
|
||||
config = lib.mkIf config.my.enDe.enable {
|
||||
i18n = {
|
||||
defaultLocale = "en_US.UTF-8";
|
||||
extraLocales = [
|
||||
"de_DE.UTF-8/UTF-8"
|
||||
];
|
||||
extraLocaleSettings = {
|
||||
LC_ADDRESS = "de_DE.UTF-8";
|
||||
LC_IDENTIFICATION = "de_DE.UTF-8";
|
||||
LC_MEASUREMENT = "de_DE.UTF-8";
|
||||
LC_MONETARY = "de_DE.UTF-8";
|
||||
LC_NAME = "de_DE.UTF-8";
|
||||
LC_NUMERIC = "de_DE.UTF-8";
|
||||
LC_PAPER = "de_DE.UTF-8";
|
||||
LC_TELEPHONE = "de_DE.UTF-8";
|
||||
LC_TIME = "de_DE.UTF-8";
|
||||
};
|
||||
};
|
||||
|
||||
programs.firefox.languagePacks = [
|
||||
"en-US"
|
||||
"de"
|
||||
];
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.hunspell
|
||||
pkgs.hunspellDicts.de-de
|
||||
pkgs.hunspellDicts.en-us
|
||||
];
|
||||
};
|
||||
|
||||
programs.firefox.languagePacks = [
|
||||
"en-US"
|
||||
"de"
|
||||
];
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.hunspell
|
||||
pkgs.hunspellDicts.de-de
|
||||
pkgs.hunspellDicts.en-us
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,22 +1,27 @@
|
|||
{ lib, config, ... }:
|
||||
{
|
||||
nix.settings = {
|
||||
substituters = [
|
||||
# keep-sorted start
|
||||
"https://cache.lix.systems"
|
||||
"https://cache.nixos.org/"
|
||||
"https://niri.cachix.org"
|
||||
"https://nix-community.cachix.org"
|
||||
"https://nixos-raspberrypi.cachix.org"
|
||||
# keep-sorted end
|
||||
];
|
||||
trusted-public-keys = [
|
||||
# keep-sorted start
|
||||
"cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
|
||||
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||
"niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964="
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
"nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI="
|
||||
# keep-sorted end
|
||||
];
|
||||
options.my.extraCaches.enable = lib.mkEnableOption "extra Nix binary caches";
|
||||
|
||||
config = lib.mkIf config.my.extraCaches.enable {
|
||||
nix.settings = {
|
||||
substituters = [
|
||||
# keep-sorted start
|
||||
"https://cache.lix.systems"
|
||||
"https://cache.nixos.org/"
|
||||
"https://niri.cachix.org"
|
||||
"https://nix-community.cachix.org"
|
||||
"https://nixos-raspberrypi.cachix.org"
|
||||
# keep-sorted end
|
||||
];
|
||||
trusted-public-keys = [
|
||||
# keep-sorted start
|
||||
"cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
|
||||
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||
"niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964="
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
"nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI="
|
||||
# keep-sorted end
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,16 @@
|
|||
{ lib, config, ... }:
|
||||
{
|
||||
hardware = {
|
||||
enableRedistributableFirmware = true;
|
||||
cpu = {
|
||||
amd.updateMicrocode = true;
|
||||
intel.updateMicrocode = true;
|
||||
};
|
||||
};
|
||||
options.my.firmwareUpdates.enable = lib.mkEnableOption "firmware updates and microcode";
|
||||
|
||||
services.fwupd.enable = true;
|
||||
config = lib.mkIf config.my.firmwareUpdates.enable {
|
||||
hardware = {
|
||||
enableRedistributableFirmware = true;
|
||||
cpu = {
|
||||
amd.updateMicrocode = true;
|
||||
intel.updateMicrocode = true;
|
||||
};
|
||||
};
|
||||
|
||||
services.fwupd.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
24
nixosModules/git.nix
Normal file
24
nixosModules/git.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
options.my.git.enable = lib.mkEnableOption "git with credential helper";
|
||||
|
||||
config = lib.mkIf config.my.git.enable {
|
||||
environment.systemPackages = [ pkgs.git-credential-oauth ];
|
||||
|
||||
programs.git = {
|
||||
enable = true;
|
||||
config = {
|
||||
init.defaultBranch = "main";
|
||||
credential = {
|
||||
helper = "oauth";
|
||||
credentialStore = "cache";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
{
|
||||
home-manager-users,
|
||||
self,
|
||||
home-manager,
|
||||
servicepoint-cli,
|
||||
servicepoint-simulator,
|
||||
servicepoint-tanks,
|
||||
stylix,
|
||||
specialArgs,
|
||||
nova-shell,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
# keep-sorted start
|
||||
home-manager.nixosModules.home-manager
|
||||
nova-shell.nixosModules.default
|
||||
self.nixosModules.en-de
|
||||
self.nixosModules.firmware-updates
|
||||
self.nixosModules.gnome
|
||||
self.nixosModules.kdeconnect
|
||||
self.nixosModules.modern-desktop
|
||||
self.nixosModules.niri
|
||||
self.nixosModules.nix-ld
|
||||
self.nixosModules.pkgs-vscode-extensions
|
||||
self.nixosModules.quiet-boot
|
||||
self.nixosModules.stylix
|
||||
servicepoint-cli.nixosModules.default
|
||||
servicepoint-simulator.nixosModules.default
|
||||
servicepoint-tanks.nixosModules.default
|
||||
stylix.nixosModules.stylix
|
||||
# keep-sorted end
|
||||
];
|
||||
|
||||
config = {
|
||||
home-manager = {
|
||||
extraSpecialArgs = specialArgs;
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
users = home-manager-users;
|
||||
sharedModules = [
|
||||
{ home.stateVersion = "22.11"; }
|
||||
# keep-sorted start
|
||||
self.homeModules.git
|
||||
self.homeModules.gnome-extensions
|
||||
self.homeModules.nano
|
||||
self.homeModules.templates
|
||||
self.homeModules.zsh-basics
|
||||
# keep-sorted end
|
||||
];
|
||||
};
|
||||
|
||||
time.timeZone = "Europe/Berlin";
|
||||
|
||||
# on desktops, keep the device useable interactively during expensive builds
|
||||
nix = {
|
||||
daemonCPUSchedPolicy = "idle";
|
||||
daemonIOSchedClass = "idle";
|
||||
};
|
||||
};
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue