Compare commits

...
Author SHA1 Message Date
müde
c2aa932494 move git to own mod 2026-05-01 23:43:24 +02:00
müde
29ab335879 deadnix fixes 2026-05-01 23:38:08 +02:00
müde
ec5b785a8a refactor: move out nixosConfigurations 2026-05-01 23:20:46 +02:00
müde
a7cc61a624 refactor: move niri enable to desktop settings 2026-05-01 23:15:02 +02:00
müde
281d763c62 refactor: automatic options for overlays, fix build 2026-05-01 23:07:26 +02:00
müde
850d673035 refactor: import nixosModules unconditionally, add enable options 2026-05-01 22:39:21 +02:00
45 changed files with 1054 additions and 816 deletions

View file

@ -9,7 +9,6 @@
}; };
#keep-sorted start block=yes #keep-sorted start block=yes
flake-parts = { flake-parts = {
url = "github:hercules-ci/flake-parts"; url = "github:hercules-ci/flake-parts";
#inputs.nixpkgs.follows = "nixpkgs"; #inputs.nixpkgs.follows = "nixpkgs";
@ -97,28 +96,18 @@
inputs@{ inputs@{
self, self,
nixpkgs, nixpkgs,
home-manager,
# keep-sorted start # keep-sorted start
lanzaboote,
niri, niri,
nix-vscode-extensions, nix-vscode-extensions,
nixos-generators,
nixos-raspberrypi,
nixpkgs-unstable, nixpkgs-unstable,
servicepoint-cli,
servicepoint-simulator,
servicepoint-tanks,
stylix,
treefmt-nix, treefmt-nix,
zerforschen-plus,
# keep-sorted end # keep-sorted end
... ...
}: }:
let let
devices = import ./devices.nix { inherit self; };
inherit (nixpkgs) lib; inherit (nixpkgs) lib;
forDevice = f: lib.mapAttrs (device: value: f (value // { inherit device; })) devices; nixosConfigurations = import ./nixosConfigurations.nix { inherit inputs lib; };
supported-systems = lib.attrsets.mapAttrsToList (k: v: v.system) devices; supported-systems = lib.unique (lib.mapAttrsToList (_: v: v.pkgs.system) nixosConfigurations);
treefmt-config = { treefmt-config = {
projectRootFile = "flake.nix"; projectRootFile = "flake.nix";
programs = { programs = {
@ -147,37 +136,17 @@
in in
{ {
overlays = { overlays = {
unstable-packages = final: prev: { unstable = final: prev: {
unstable = import nixpkgs-unstable { unstable = import nixpkgs-unstable {
localSystem = prev.stdenv.hostPlatform; localSystem = prev.stdenv.hostPlatform;
inherit (prev) config; inherit (prev) config;
}; };
}; };
vscodeExtensions = nix-vscode-extensions.overlays.default;
niri = niri.overlays.niri;
}; };
nixosModules = (importModuleDir ./nixosModules) // { 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 ];
};
};
homeModules = importModuleDir ./homeModules; homeModules = importModuleDir ./homeModules;
homeConfigurations = { homeConfigurations = {
@ -185,38 +154,7 @@
ronja = ./homeConfigurations/ronja; ronja = ./homeConfigurations/ronja;
}; };
nixosConfigurations = forDevice ( inherit nixosConfigurations;
{
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;
};
}
];
}
);
formatter = forAllSystems ({ treefmt-eval, ... }: treefmt-eval.config.build.wrapper); formatter = forAllSystems ({ treefmt-eval, ... }: treefmt-eval.config.build.wrapper);

View file

@ -1,4 +1,4 @@
{ pkgs, self, ... }: { pkgs, ... }:
{ {
imports = [ imports = [
# keep-sorted start # keep-sorted start

View file

@ -1,6 +0,0 @@
{
programs.git = {
enable = true;
settings.init.defaultBranch = "main";
};
}

127
nixosConfigurations.nix Normal file
View 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
};
}
];
}
)

View file

@ -10,11 +10,9 @@
# No one got time for xz compression. # No one got time for xz compression.
#isoImage.squashfsCompression = "zstd"; #isoImage.squashfsCompression = "zstd";
boot.loader = { boot.loader.raspberry-pi.bootloader = "kernel";
raspberry-pi.bootloader = "kernel";
systemd-boot.enable = lib.mkForce false; my.systemdBoot.enable = lib.mkForce false;
#generic-extlinux-compatible.enable = lib.mkForce false;
};
/* /*
fileSystems = { fileSystems = {

View file

@ -1,12 +1,11 @@
{ {
pkgs, pkgs,
self,
lib, lib,
... ...
}: }:
{ {
nixpkgs.overlays = [ self.overlays.unstable-packages ]; my.overlays.unstable.enable = true;
allowedUnfreePackages = [ "claude-code" ]; allowedUnfreePackages = [ "claude-code" ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

View file

@ -1,8 +1,13 @@
{ self, ... }: { modulesPath, ... }:
{ {
imports = [ self.nixosModules.pxvirt-guest ]; imports = [ (modulesPath + "/virtualisation/proxmox-lxc.nix") ];
config = { config = {
my.pxvirtGuest.enable = true;
proxmoxLXC = {
manageNetwork = false;
privileged = false;
};
}; };
} }

View file

@ -1,12 +1,13 @@
{ self, ... }: { ... }:
{ {
imports = [ imports = [
./hardware.nix ./hardware.nix
./forgejo-runner.nix ./forgejo-runner.nix
self.nixosModules.podman
]; ];
config = { config = {
my.podman.enable = true;
# uncomment for build check on non arm system (requires --impure) # uncomment for build check on non arm system (requires --impure)
# nixpkgs.buildPlatform = builtins.currentSystem; # nixpkgs.buildPlatform = builtins.currentSystem;
services.tailscale.useRoutingFeatures = "both"; services.tailscale.useRoutingFeatures = "both";

View file

@ -2,17 +2,17 @@
{ {
imports = [ imports = [
./hardware.nix ./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 = { 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 = [ nix.settings.extra-platforms = [
"aarch64-linux" "aarch64-linux"
"i686-linux" "i686-linux"

View file

@ -1,21 +1,20 @@
{ pkgs, self, ... }: { pkgs, ... }:
{ {
imports = [ imports = [
./hardware.nix ./hardware.nix
# ./vscode-server.nix # ./vscode-server.nix
# ./hass.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 = { 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 = [ nix.settings.extra-platforms = [
"aarch64-linux" "aarch64-linux"
"i686-linux" "i686-linux"

View file

@ -1,20 +1,15 @@
{ { pkgs, ... }:
config,
pkgs,
self,
...
}:
{ {
imports = [ imports = [
./hardware.nix ./hardware.nix
self.nixosModules.user-ronja
self.nixosModules.gnome
self.nixosModules.steam
self.nixosModules.wine-gaming
self.nixosModules.muede-desktop-settings
]; ];
config = { config = {
my.users.ronja.enable = true;
my.steam.enable = true;
my.wineGaming.enable = true;
my.muedeDesktopSettings.enable = true;
# Configure keymap in X11 # Configure keymap in X11
services.xserver.xkb = { services.xserver.xkb = {
layout = "de"; layout = "de";
@ -24,8 +19,6 @@
# Configure console keymap # Configure console keymap
console.keyMap = "de"; console.keyMap = "de";
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
# wget # wget

View file

@ -1,15 +1,24 @@
{ pkgs, ... }:
{ {
boot.kernelModules = [ "amdgpu" ]; lib,
services.xserver.videoDrivers = [ "amdgpu" ]; config,
pkgs,
...
}:
{
options.my.amdGraphics.enable = lib.mkEnableOption "AMD graphics drivers";
hardware = { config = lib.mkIf config.my.amdGraphics.enable {
graphics.enable = true; boot.kernelModules = [ "amdgpu" ];
amdgpu = { services.xserver.videoDrivers = [ "amdgpu" ];
opencl.enable = true;
overdrive.enable = true; hardware = {
graphics.enable = true;
amdgpu = {
opencl.enable = true;
overdrive.enable = true;
};
}; };
};
environment.systemPackages = with pkgs; [ nvtopPackages.amd ]; environment.systemPackages = with pkgs; [ nvtopPackages.amd ];
};
} }

View file

@ -1,16 +1,21 @@
{ lib, config, ... }:
{ {
nix = { options.my.autoupdate.enable = lib.mkEnableOption "automatic Nix GC and system upgrades";
optimise.automatic = true;
gc = { config = lib.mkIf config.my.autoupdate.enable {
automatic = true; nix = {
optimise.automatic = true;
gc = {
automatic = true;
dates = "daily";
options = "--delete-older-than 7d";
};
};
system.autoUpgrade = {
enable = true;
dates = "daily"; 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
View 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
];
}

View file

@ -32,62 +32,77 @@ let
# distributedBuilds.hostPublicKey = "ssh-ed25519 AAAA..."; # from: ssh-keyscan -t ed25519 <hostname> # distributedBuilds.hostPublicKey = "ssh-ed25519 AAAA..."; # from: ssh-keyscan -t ed25519 <hostname>
# All machines automatically discover and use it after the next rebuild. # 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 [ knownHosts = lib.pipe buildServerDevices [
(lib.filterAttrs (_: v: v.distributedBuilds ? hostPublicKey)) (lib.filterAttrs (_: v: v.distributedBuilds ? hostPublicKey))
(lib.mapAttrs (hostName: v: { (lib.mapAttrs (
publicKey = v.distributedBuilds.hostPublicKey; _: v: {
})) publicKey = v.distributedBuilds.hostPublicKey;
}
))
]; ];
buildMachineList = lib.mapAttrsToList (hostName: v: { buildMachineList = lib.mapAttrsToList (
inherit hostName; hostName: v:
systems = [ v.system ]; {
sshUser = buildUser; inherit hostName;
sshKey = sshKeyPath; systems = [ v.system ];
protocol = "ssh-ng"; sshUser = buildUser;
} // lib.optionalAttrs (v.distributedBuilds ? speedFactor) { sshKey = sshKeyPath;
speedFactor = v.distributedBuilds.speedFactor; protocol = "ssh-ng";
} // { }
supportedFeatures = [ // lib.optionalAttrs (v.distributedBuilds ? speedFactor) {
"nixos-test" speedFactor = v.distributedBuilds.speedFactor;
"big-parallel" }
"kvm" // {
"benchmark" supportedFeatures = [
]; "nixos-test"
}) buildServerDevices; "big-parallel"
"kvm"
"benchmark"
];
}
) buildServerDevices;
remoteMachines = builtins.filter (m: m.hostName != config.networking.hostName) buildMachineList; remoteMachines = builtins.filter (m: m.hostName != config.networking.hostName) buildMachineList;
in in
{ {
# Dedicated user for receiving distributed build connections options.my.distributedBuilds.enable = lib.mkEnableOption "distributed Nix builds";
programs.ssh.knownHosts = knownHosts;
users.users.${buildUser} = { config = lib.mkIf config.my.distributedBuilds.enable {
isSystemUser = true; programs.ssh.knownHosts = knownHosts;
group = buildUser;
useDefaultShell = true;
openssh.authorizedKeys.keys = map (k: ''command="nix daemon --stdio",restrict ${k}'') authorizedPublicKeys;
};
users.groups.${buildUser} = { };
nix = { # Dedicated user for receiving distributed build connections
distributedBuilds = remoteMachines != [ ]; users.users.${buildUser} = {
buildMachines = remoteMachines; isSystemUser = true;
settings = { group = buildUser;
trusted-users = [ buildUser ]; useDefaultShell = true;
builders-use-substitutes = true; openssh.authorizedKeys.keys = map (
max-jobs = (devices.${config.networking.hostName}.distributedBuilds or { }).maxJobs or "auto"; k: ''command="nix daemon --stdio",restrict ${k}''
cores = 0; ) authorizedPublicKeys;
min-free = 10 * 1024 * 1024; };
max-free = 200 * 1024 * 1024; 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;
};
} }

View file

@ -1,31 +1,40 @@
{ pkgs, ... }:
{ {
i18n = { lib,
defaultLocale = "en_US.UTF-8"; config,
extraLocales = [ pkgs,
"de_DE.UTF-8/UTF-8" ...
]; }:
extraLocaleSettings = { {
LC_ADDRESS = "de_DE.UTF-8"; options.my.enDe.enable = lib.mkEnableOption "English/German locale and language packs";
LC_IDENTIFICATION = "de_DE.UTF-8";
LC_MEASUREMENT = "de_DE.UTF-8"; config = lib.mkIf config.my.enDe.enable {
LC_MONETARY = "de_DE.UTF-8"; i18n = {
LC_NAME = "de_DE.UTF-8"; defaultLocale = "en_US.UTF-8";
LC_NUMERIC = "de_DE.UTF-8"; extraLocales = [
LC_PAPER = "de_DE.UTF-8"; "de_DE.UTF-8/UTF-8"
LC_TELEPHONE = "de_DE.UTF-8"; ];
LC_TIME = "de_DE.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
];
} }

View file

@ -1,22 +1,27 @@
{ lib, config, ... }:
{ {
nix.settings = { options.my.extraCaches.enable = lib.mkEnableOption "extra Nix binary caches";
substituters = [
# keep-sorted start config = lib.mkIf config.my.extraCaches.enable {
"https://cache.lix.systems" nix.settings = {
"https://cache.nixos.org/" substituters = [
"https://niri.cachix.org" # keep-sorted start
"https://nix-community.cachix.org" "https://cache.lix.systems"
"https://nixos-raspberrypi.cachix.org" "https://cache.nixos.org/"
# keep-sorted end "https://niri.cachix.org"
]; "https://nix-community.cachix.org"
trusted-public-keys = [ "https://nixos-raspberrypi.cachix.org"
# keep-sorted start # keep-sorted end
"cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" ];
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" trusted-public-keys = [
"niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964=" # keep-sorted start
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
"nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
# keep-sorted end "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964="
]; "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI="
# keep-sorted end
];
};
}; };
} }

View file

@ -1,11 +1,16 @@
{ lib, config, ... }:
{ {
hardware = { options.my.firmwareUpdates.enable = lib.mkEnableOption "firmware updates and microcode";
enableRedistributableFirmware = true;
cpu = {
amd.updateMicrocode = true;
intel.updateMicrocode = true;
};
};
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
View 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";
};
};
};
};
}

View file

@ -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