rouven.seifert/nixos-config
1
1
Fork 0
mirror of https://git.sr.ht/~rouven/nixos-config synced 2025-04-25 08:06:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

cleanup

Browse source
This commit is contained in:
Rouven Seifert 2023-10-28 15:51:25 +02:00
parent 45628bdbc3
commit 78b1a5761c
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
13 changed files with 52 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

1
hosts/falkenstein-1/default.nix
View file

@ -1,6 +1,5 @@
{ config, pkgs, ... }:
{
nix.settings.experimental-features = [ "nix-command" "flakes" ];
imports =
[
# Include the results of the hardware scan.

16
hosts/falkenstein-1/modules/backup/default.nix
View file

@ -17,16 +17,12 @@
label = "nuc";
}
];
storage = {
encryption_passcommand = "${pkgs.coreutils}/bin/cat ${config.sops.secrets."borg/passphrase".path}";
compression = "lz4";
};
retention = {
keep_daily = 7;
keep_weekly = 4;
keep_monthly = 12;
keep_yearly = 3;
};
encryption_passcommand = "${pkgs.coreutils}/bin/cat ${config.sops.secrets."borg/passphrase".path}";
compression = "lz4";
keep_daily = 7;
keep_weekly = 4;
keep_monthly = 12;
keep_yearly = 3;
};
};
}

6
hosts/nuc/default.nix
View file

@ -1,13 +1,12 @@
{ config, pkgs, lib, ... }:
{
nix.settings.experimental-features = [ "nix-command" "flakes" ];
imports =
[
# Include the results of the hardware scan.
./hardware-configuration.nix
# ./modules/adguard
./modules/networks
./modules/backup
# ./modules/backup
# ./modules/hydra
./modules/matrix
./modules/nextcloud
@ -23,9 +22,6 @@
tmp.useTmpfs = true;
};
services.btrfs.autoScrub.enable = true;
nix.settings = {
auto-optimise-store = true;
};
sops.secrets."store/secretkey" = { };
nix.extraOptions = ''

8
hosts/nuc/modules/backup/default.nix
View file

@ -12,8 +12,6 @@
services.borgmatic = {
enable = true;
settings = {
# fix failing check
location = null;
source_directories = [
"/var/lib"
"/var/log"
@ -25,10 +23,8 @@
path = "/mnt/backup/nuc";
}
];
storage = {
encryption_passcommand = "${pkgs.coreutils}/bin/cat ${config.sops.secrets."borg/passphrase".path}";
compression = "lz4";
};
encryption_passcommand = "${pkgs.coreutils}/bin/cat ${config.sops.secrets."borg/passphrase".path}";
compression = "lz4";
retention = {
keep_daily = 7;
keep_weekly = 4;

43
hosts/thinkpad/default.nix
View file

@ -4,7 +4,7 @@
imports =
[
./hardware-configuration.nix
./modules/backup
# ./modules/backup
./modules/networks
./modules/greetd
./modules/virtualisation
@ -34,44 +34,6 @@
tmp.useTmpfs = true;
};
nix = {
settings = {
experimental-features = [ "nix-command" "flakes" ];
auto-optimise-store = true;
# substituters = [
# "ssh://nuc.lan"
# ];
# trusted-public-keys = [
# "nuc.lan:a9UkVw3AizAKCER1CfNGhx8UOMF4t4UGE3GJ9dmHwJc="
# ];
};
# distributedBuilds = true;
# extraOptions = ''
# builders-use-substitutes = true
# '';
# buildMachines = [
# {
# hostName = "nuc.lan";
# system = "x86_64-linux";
# protocol = "ssh-ng";
# maxJobs = 2;
# speedFactor = 1;
# supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
# mandatoryFeatures = [ ];
# }
# {
# hostName = "quitte.ifsr.de";
# system = "x86_64-linux";
# protocol = "ssh-ng";
# maxJobs = 12;
# sshUser = "rouven.seifert";
# speedFactor = 10;
# supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
# mandatoryFeatures = [ ];
# }
# ];
};
environment.persistence."/nix/persist/system" = {
directories = [
"/etc/nixos" # bind mounted from /nix/persist/system/etc/nixos to /etc/nixos
@ -93,8 +55,6 @@
i18n.defaultLocale = "en_US.UTF-8";
console = {
keyMap = "dvorak";
# font = "Lat2-Terminus16";
# earlySetup = true;
colors = let colors = config.home-manager.users.rouven.colorScheme.colors; in
[
colors.base00
@ -128,6 +88,7 @@
# Enable sound.
sound.enable = true;
#hardware.pulseaudio.enable = true;
hardware.opengl.enable = true;
hardware.bluetooth.enable = true;
security = {

19
hosts/thinkpad/modules/backup/default.nix
View file

@ -5,8 +5,7 @@
services.borgmatic = {
enable = true;
settings = {
# fix failing check
location = null;
location = { };
source_directories = [
"/var/lib"
"/var/log"
@ -34,16 +33,12 @@
"/home/*/.local/share"
"/home/*/Linux/Isos"
];
storage = {
encryption_passcommand = "${pkgs.coreutils}/bin/cat ${config.sops.secrets."borg/passphrase".path}";
compression = "lz4";
};
retention = {
keep_daily = 7;
keep_weekly = 4;
keep_monthly = 12;
keep_yearly = 3;
};
encryption_passcommand = "${pkgs.coreutils}/bin/cat ${config.sops.secrets."borg/passphrase".path}";
compression = "lz4";
keep_daily = 7;
keep_weekly = 4;
keep_monthly = 12;
keep_yearly = 3;
};
};
}