refactor: import nixosModules unconditionally, add enable options
This commit is contained in:
müde
parent
c2d4ce78de
commit
850d673035
38 changed files with 945 additions and 747 deletions
110
flake.nix
110
flake.nix
|
|
@ -9,7 +9,6 @@
|
|||
};
|
||||
|
||||
#keep-sorted start block=yes
|
||||
|
||||
flake-parts = {
|
||||
url = "github:hercules-ci/flake-parts";
|
||||
#inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -103,8 +102,8 @@
|
|||
niri,
|
||||
nix-vscode-extensions,
|
||||
nixos-generators,
|
||||
nixos-raspberrypi,
|
||||
nixpkgs-unstable,
|
||||
nova-shell,
|
||||
servicepoint-cli,
|
||||
servicepoint-simulator,
|
||||
servicepoint-tanks,
|
||||
|
|
@ -157,14 +156,18 @@
|
|||
|
||||
nixosModules = (importModuleDir ./nixosModules) // {
|
||||
niri =
|
||||
{ pkgs, ... }:
|
||||
{ lib, config, ... }:
|
||||
{
|
||||
imports = [ niri.nixosModules.niri ];
|
||||
nixpkgs.overlays = [ niri.overlays.niri ];
|
||||
|
||||
programs.niri = {
|
||||
enable = true;
|
||||
#package = pkgs.niri-stable;
|
||||
options.my.niri.enable = lib.mkEnableOption "niri wayland compositor";
|
||||
|
||||
config = lib.mkIf config.my.niri.enable {
|
||||
nixpkgs.overlays = [ niri.overlays.niri ];
|
||||
programs.niri = {
|
||||
enable = true;
|
||||
#package = pkgs.niri-stable;
|
||||
};
|
||||
};
|
||||
};
|
||||
pkgs-unstable = {
|
||||
|
|
@ -173,10 +176,6 @@
|
|||
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;
|
||||
|
|
@ -201,18 +200,87 @@
|
|||
nixosSystem {
|
||||
inherit specialArgs;
|
||||
modules = [
|
||||
{
|
||||
imports = [
|
||||
./nixosConfigurations/${device}
|
||||
self.nixosModules.global-settings
|
||||
]
|
||||
++ (lib.optionals (home-manager-users != { }) [
|
||||
self.nixosModules.global-settings-desktop
|
||||
]);
|
||||
./nixosConfigurations/${device}
|
||||
self.nixosModules.default
|
||||
|
||||
nixpkgs = {
|
||||
hostPlatform = lib.mkDefault system;
|
||||
# keep-sorted start
|
||||
home-manager.nixosModules.home-manager
|
||||
lanzaboote.nixosModules.lanzaboote
|
||||
nova-shell.nixosModules.default
|
||||
self.nixosModules.niri
|
||||
self.nixosModules.pkgs-vscode-extensions
|
||||
servicepoint-cli.nixosModules.default
|
||||
servicepoint-simulator.nixosModules.default
|
||||
servicepoint-tanks.nixosModules.default
|
||||
stylix.nixosModules.stylix
|
||||
zerforschen-plus.nixosModules.default
|
||||
# keep-sorted end
|
||||
|
||||
# Base config (replaces global-settings.nix)
|
||||
{
|
||||
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.autoupdate.enable = true;
|
||||
my.distributedBuilds.enable = true;
|
||||
my.extraCaches.enable = true;
|
||||
my.globalinstalls.enable = true;
|
||||
my.lixIsNix.enable = true;
|
||||
my.openssh.enable = true;
|
||||
my.prometheusNode.enable = true;
|
||||
my.systemdBoot.enable = true;
|
||||
my.tailscale.enable = true;
|
||||
}
|
||||
]
|
||||
++ lib.optionals (home-manager-users != { }) [
|
||||
# Desktop config (replaces global-settings-desktop.nix)
|
||||
{
|
||||
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";
|
||||
};
|
||||
|
||||
my.enDe.enable = true;
|
||||
my.firmwareUpdates.enable = true;
|
||||
my.gnome.enable = true;
|
||||
my.kdeconnect.enable = true;
|
||||
my.modernDesktop.enable = true;
|
||||
my.niri.enable = true;
|
||||
my.nixLd.enable = true;
|
||||
my.quietBoot.enable = true;
|
||||
my.stylix.enable = true;
|
||||
}
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
{ self, ... }:
|
||||
{ ... }:
|
||||
{
|
||||
imports = [ self.nixosModules.pxvirt-guest ];
|
||||
|
||||
config = {
|
||||
|
||||
my.pxvirtGuest.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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!
|
||||
};
|
||||
}
|
||||
|
|
|
|||
37
nixosModules/default.nix
Normal file
37
nixosModules/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ ... }:
|
||||
{
|
||||
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
|
||||
./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
|
||||
./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;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
{
|
||||
device,
|
||||
self,
|
||||
lanzaboote,
|
||||
zerforschen-plus,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
# keep-sorted start
|
||||
lanzaboote.nixosModules.lanzaboote
|
||||
self.nixosModules.allowed-unfree-list
|
||||
self.nixosModules.autoupdate
|
||||
self.nixosModules.default
|
||||
self.nixosModules.distributed-builds
|
||||
self.nixosModules.extra-caches
|
||||
self.nixosModules.globalinstalls
|
||||
self.nixosModules.lix-is-nix
|
||||
self.nixosModules.openssh
|
||||
self.nixosModules.prometheus-node
|
||||
self.nixosModules.systemd-boot
|
||||
self.nixosModules.tailscale
|
||||
zerforschen-plus.nixosModules.default
|
||||
# keep-sorted end
|
||||
];
|
||||
|
||||
config = {
|
||||
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; # info pages and the info command
|
||||
doc.enable = false; # documentation distributed in packages' /share/doc
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,30 +1,39 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
ncdu
|
||||
glances
|
||||
lsof
|
||||
dig
|
||||
screen
|
||||
tldr
|
||||
nix-output-monitor
|
||||
git-credential-oauth
|
||||
];
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
options.my.globalinstalls.enable = lib.mkEnableOption "global system packages and tools";
|
||||
|
||||
programs = {
|
||||
zsh.enable = true;
|
||||
htop.enable = true;
|
||||
iotop.enable = true;
|
||||
git.enable = true;
|
||||
nano = {
|
||||
enable = true;
|
||||
syntaxHighlight = true;
|
||||
config = lib.mkIf config.my.globalinstalls.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
ncdu
|
||||
glances
|
||||
lsof
|
||||
dig
|
||||
screen
|
||||
tldr
|
||||
nix-output-monitor
|
||||
git-credential-oauth
|
||||
];
|
||||
|
||||
programs = {
|
||||
zsh.enable = true;
|
||||
htop.enable = true;
|
||||
iotop.enable = true;
|
||||
git.enable = true;
|
||||
nano = {
|
||||
enable = true;
|
||||
syntaxHighlight = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
environment.etc."gitconfig".text = ''
|
||||
[credential]
|
||||
helper = oauth
|
||||
credentialStore = cache
|
||||
'';
|
||||
environment.etc."gitconfig".text = ''
|
||||
[credential]
|
||||
helper = oauth
|
||||
credentialStore = cache
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,62 +1,65 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
options.muede = {
|
||||
keep-gnome-default-apps = lib.mkEnableOption "keep gnome default apps";
|
||||
options = {
|
||||
my.gnome.enable = lib.mkEnableOption "GNOME desktop environment";
|
||||
muede.keep-gnome-default-apps = lib.mkEnableOption "keep gnome default apps";
|
||||
};
|
||||
|
||||
config = lib.mkMerge [
|
||||
{
|
||||
services = {
|
||||
xserver.excludePackages = [ pkgs.xterm ];
|
||||
config = lib.mkIf config.my.gnome.enable (
|
||||
lib.mkMerge [
|
||||
{
|
||||
services = {
|
||||
xserver.excludePackages = [ pkgs.xterm ];
|
||||
|
||||
# Enable the GNOME Desktop Environment.
|
||||
displayManager.gdm.enable = true;
|
||||
desktopManager.gnome = {
|
||||
enable = true;
|
||||
extraGSettingsOverridePackages = [ pkgs.mutter ];
|
||||
extraGSettingsOverrides = ''
|
||||
[org.gnome.mutter]
|
||||
experimental-features=['scale-monitor-framebuffer']
|
||||
'';
|
||||
# Enable the GNOME Desktop Environment.
|
||||
displayManager.gdm.enable = true;
|
||||
desktopManager.gnome = {
|
||||
enable = true;
|
||||
extraGSettingsOverridePackages = [ pkgs.mutter ];
|
||||
extraGSettingsOverrides = ''
|
||||
[org.gnome.mutter]
|
||||
experimental-features=['scale-monitor-framebuffer']
|
||||
'';
|
||||
};
|
||||
|
||||
gnome = {
|
||||
tinysparql.enable = false;
|
||||
localsearch.enable = false;
|
||||
sushi.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
gnome = {
|
||||
tinysparql.enable = false;
|
||||
localsearch.enable = false;
|
||||
sushi.enable = true;
|
||||
programs = {
|
||||
dconf.enable = true;
|
||||
gpaste.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
programs = {
|
||||
dconf.enable = true;
|
||||
gpaste.enable = true;
|
||||
};
|
||||
}
|
||||
(lib.mkIf (!config.muede.keep-gnome-default-apps) {
|
||||
environment.gnome.excludePackages = with pkgs; [
|
||||
cheese # photo booth
|
||||
epiphany # web browser
|
||||
evince # document viewer
|
||||
geary # email client
|
||||
gnome-maps
|
||||
gnome-weather
|
||||
gnome-tour
|
||||
sysprof
|
||||
orca # screen reader
|
||||
gnome-weather
|
||||
gnome-backgrounds
|
||||
gnome-user-docs
|
||||
yelp # help app
|
||||
gnome-music
|
||||
totem # video player
|
||||
snapshot # camera
|
||||
baobab # disk usage
|
||||
];
|
||||
})
|
||||
];
|
||||
}
|
||||
(lib.mkIf (!config.muede.keep-gnome-default-apps) {
|
||||
environment.gnome.excludePackages = with pkgs; [
|
||||
cheese # photo booth
|
||||
epiphany # web browser
|
||||
evince # document viewer
|
||||
geary # email client
|
||||
gnome-maps
|
||||
gnome-weather
|
||||
gnome-tour
|
||||
sysprof
|
||||
orca # screen reader
|
||||
gnome-weather
|
||||
gnome-backgrounds
|
||||
gnome-user-docs
|
||||
yelp # help app
|
||||
gnome-music
|
||||
totem # video player
|
||||
snapshot # camera
|
||||
baobab # disk usage
|
||||
];
|
||||
})
|
||||
]
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,13 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
config = {
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
options.my.intelGraphics.enable = lib.mkEnableOption "Intel graphics drivers";
|
||||
|
||||
config = lib.mkIf config.my.intelGraphics.enable {
|
||||
hardware.graphics = {
|
||||
extraPackages = with pkgs; [
|
||||
intel-media-driver
|
||||
|
|
|
|||
|
|
@ -5,49 +5,53 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
config = lib.mkMerge [
|
||||
{
|
||||
networking.firewall =
|
||||
let
|
||||
kdeconnect-range = {
|
||||
from = 1714;
|
||||
to = 1764;
|
||||
};
|
||||
in
|
||||
{
|
||||
allowedTCPPortRanges = [ kdeconnect-range ];
|
||||
allowedUDPPortRanges = [ kdeconnect-range ];
|
||||
};
|
||||
options.my.kdeconnect.enable = lib.mkEnableOption "KDE Connect / GSConnect";
|
||||
|
||||
programs.kdeconnect.enable = true;
|
||||
home-manager.sharedModules = [
|
||||
{
|
||||
services.kdeconnect = {
|
||||
enable = true;
|
||||
# this still shows up in gnome session starting with 25.05
|
||||
# indicator = true;
|
||||
};
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
(lib.mkIf config.services.desktopManager.gnome.enable {
|
||||
# replace kdeconnect with gsconnect
|
||||
programs.kdeconnect.package = pkgs.gnomeExtensions.gsconnect;
|
||||
|
||||
home-manager.sharedModules = [
|
||||
(
|
||||
{ pkgs, ... }:
|
||||
config = lib.mkIf config.my.kdeconnect.enable (
|
||||
lib.mkMerge [
|
||||
{
|
||||
networking.firewall =
|
||||
let
|
||||
kdeconnect-range = {
|
||||
from = 1714;
|
||||
to = 1764;
|
||||
};
|
||||
in
|
||||
{
|
||||
home.packages = [ pkgs.gnomeExtensions.gsconnect ];
|
||||
# enable gsconnect extension
|
||||
dconf.settings = {
|
||||
"org/gnome/shell".enabled-extensions = [ "gsconnect@andyholmes.github.io" ];
|
||||
"org/gnome/shell/extensions/gsconnect".enabled = true;
|
||||
allowedTCPPortRanges = [ kdeconnect-range ];
|
||||
allowedUDPPortRanges = [ kdeconnect-range ];
|
||||
};
|
||||
|
||||
programs.kdeconnect.enable = true;
|
||||
home-manager.sharedModules = [
|
||||
{
|
||||
services.kdeconnect = {
|
||||
enable = true;
|
||||
# this still shows up in gnome session starting with 25.05
|
||||
# indicator = true;
|
||||
};
|
||||
}
|
||||
)
|
||||
];
|
||||
})
|
||||
];
|
||||
];
|
||||
}
|
||||
|
||||
(lib.mkIf config.services.desktopManager.gnome.enable {
|
||||
# replace kdeconnect with gsconnect
|
||||
programs.kdeconnect.package = pkgs.gnomeExtensions.gsconnect;
|
||||
|
||||
home-manager.sharedModules = [
|
||||
(
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
home.packages = [ pkgs.gnomeExtensions.gsconnect ];
|
||||
# enable gsconnect extension
|
||||
dconf.settings = {
|
||||
"org/gnome/shell".enabled-extensions = [ "gsconnect@andyholmes.github.io" ];
|
||||
"org/gnome/shell/extensions/gsconnect".enabled = true;
|
||||
};
|
||||
}
|
||||
)
|
||||
];
|
||||
})
|
||||
]
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,13 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
config = {
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
options.my.latex.enable = lib.mkEnableOption "LaTeX (texliveFull + TeXstudio)";
|
||||
|
||||
config = lib.mkIf config.my.latex.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
fontconfig
|
||||
texliveFull
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue