summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2022-09-26 15:36:25 +0200
committerlassulus <lassulus@lassul.us>2022-09-26 15:36:25 +0200
commit059a5b48af9f6c21c3c442bb0fc35d2105d3b682 (patch)
tree15de5c35d213d677bc2b294fc411d0f43dc536b2 /makefu/1systems
parent4d7aacdd1c2a8cc9f6d826cb7e3bb2bc10e36a5e (diff)
parent5b9d7e47c3f1877bcffdf2aafac712451db43d61 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems')
-rw-r--r--makefu/1systems/cake/config.nix9
-rw-r--r--makefu/1systems/cake/hardware-config.nix38
-rw-r--r--makefu/1systems/cake/source.nix2
-rw-r--r--makefu/1systems/latte/config.nix7
-rw-r--r--makefu/1systems/omo/config.nix1
-rw-r--r--makefu/1systems/omo/source.nix2
-rw-r--r--makefu/1systems/x/config.nix1
7 files changed, 20 insertions, 40 deletions
diff --git a/makefu/1systems/cake/config.nix b/makefu/1systems/cake/config.nix
index 3befa201d..8b9812cf4 100644
--- a/makefu/1systems/cake/config.nix
+++ b/makefu/1systems/cake/config.nix
@@ -5,11 +5,14 @@ in {
imports = [
<stockholm/makefu>
./hardware-config.nix
+ <stockholm/makefu/2configs/home-manager>
+ <stockholm/makefu/2configs/home/3dprint.nix>
+ #./hardware-config.nix
{ environment.systemPackages = with pkgs;[ rsync screen curl git tmux picocom mosh ];}
# <stockholm/makefu/2configs/tools/core.nix>
<stockholm/makefu/2configs/binary-cache/nixos.nix>
#<stockholm/makefu/2configs/support-nixos.nix>
- <stockholm/makefu/2configs/homeautomation/default.nix>
+ # <stockholm/makefu/2configs/homeautomation/default.nix>
# <stockholm/makefu/2configs/homeautomation/google-muell.nix>
# configure your hw:
# <stockholm/makefu/2configs/save-diskspace.nix>
@@ -19,9 +22,11 @@ in {
tinc.retiolum.enable = true;
build.host = config.krebs.hosts.cake;
};
+ # ensure disk usage is limited
+ services.journald.extraConfig = "Storage=volatile";
networking.firewall.trustedInterfaces = [ primaryInterface ];
documentation.info.enable = false;
documentation.man.enable = false;
- services.nixosManual.enable = false;
+ documentation.nixos.enable = false;
sound.enable = false;
}
diff --git a/makefu/1systems/cake/hardware-config.nix b/makefu/1systems/cake/hardware-config.nix
index d021f9458..a0cd4fac1 100644
--- a/makefu/1systems/cake/hardware-config.nix
+++ b/makefu/1systems/cake/hardware-config.nix
@@ -1,42 +1,14 @@
{ pkgs, lib, ... }:
{
- # raspi3
- boot.kernelParams = ["cma=32M" "console=ttyS0,115200n8" "console=tty0" "console=ttyS1,115200n8" ];
- boot.loader.grub.enable = false;
- boot.loader.raspberryPi.enable = true;
- boot.loader.raspberryPi.version = 3;
- boot.loader.raspberryPi.uboot.enable = true;
- boot.loader.raspberryPi.uboot.configurationLimit = 3;
- boot.loader.raspberryPi.firmwareConfig = ''
- gpu_mem=32
- arm_freq=1350
- core_freq=500
- over_voltage=4
- disable_splash=1
- # bye bye warranty
- force_turbo=1
- '';
- boot.loader.generationsDir.enable = lib.mkDefault false;
-
- boot.tmpOnTmpfs = lib.mkForce false;
- boot.cleanTmpDir = true;
- hardware.enableRedistributableFirmware = true;
-
- ## wifi not working, will be fixed with https://github.com/NixOS/nixpkgs/pull/53747
- # boot.kernelPackages = pkgs.linuxPackages_latest;
- boot.kernelPackages = pkgs.linuxPackages_latest;
- environment.systemPackages = [ pkgs.raspberrypi-tools ];
- networking.wireless.enable = true;
- # File systems configuration for using the installer's partition layout
- swapDevices = [ { device = "/var/swap"; size = 2048; } ];
+ environment.systemPackages = [ pkgs.libraspberrypi ];
+ imports = [ <nixos-hardware/raspberry-pi/4> ];
+ boot.kernelPackages = pkgs.linuxPackages_rpi4;
fileSystems = {
- "/boot" = {
- device = "/dev/disk/by-label/NIXOS_BOOT";
- fsType = "vfat";
- };
"/" = {
device = "/dev/disk/by-label/NIXOS_SD";
fsType = "ext4";
+ options = [ "noatime" ];
};
};
+ #hardware.raspberry-pi."4".fkms-3d.enable = true;
}
diff --git a/makefu/1systems/cake/source.nix b/makefu/1systems/cake/source.nix
index 22c40039e..8fc2fff2d 100644
--- a/makefu/1systems/cake/source.nix
+++ b/makefu/1systems/cake/source.nix
@@ -1,4 +1,6 @@
{
name="cake";
full = true;
+ home-manager = true;
+ hw = true;
}
diff --git a/makefu/1systems/latte/config.nix b/makefu/1systems/latte/config.nix
index 69e401d97..44fa14812 100644
--- a/makefu/1systems/latte/config.nix
+++ b/makefu/1systems/latte/config.nix
@@ -30,7 +30,7 @@ in {
# Storage
<stockholm/makefu/2configs/share>
- <stockholm/makefu/2configs/share/hetzner-client.nix>
+ # <stockholm/makefu/2configs/share/hetzner-client.nix>
# Services:
<stockholm/makefu/2configs/nix-community/mediawiki-matrix-bot.nix>
@@ -42,7 +42,7 @@ in {
# local usage:
<stockholm/makefu/2configs/mosh.nix>
- <stockholm/makefu/2configs/bitlbee.nix>
+
# Supervision
<stockholm/makefu/2configs/nix-community/supervision.nix>
@@ -53,6 +53,9 @@ in {
# backup
<stockholm/makefu/2configs/backup/state.nix>
+ # migrated:
+ # <stockholm/makefu/2configs/bitlbee.nix>
+
];
krebs = {
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix
index ee29c03d2..3ff1d0238 100644
--- a/makefu/1systems/omo/config.nix
+++ b/makefu/1systems/omo/config.nix
@@ -53,7 +53,6 @@ in {
<stockholm/makefu/2configs/share>
<stockholm/makefu/2configs/share/omo.nix>
<stockholm/makefu/2configs/share/gum-client.nix>
- <stockholm/makefu/2configs/share/hetzner-client.nix>
<stockholm/makefu/2configs/sync>
<stockholm/makefu/2configs/dcpp/airdcpp.nix>
{ krebs.airdcpp.dcpp.shares = let
diff --git a/makefu/1systems/omo/source.nix b/makefu/1systems/omo/source.nix
index af508fbd6..b56e855fc 100644
--- a/makefu/1systems/omo/source.nix
+++ b/makefu/1systems/omo/source.nix
@@ -1,6 +1,6 @@
{
name="omo";
torrent = true;
- #unstable = true;
+ unstable = true;
home-manager = true;
}
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index 0377c336f..3f9e071e6 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -137,7 +137,6 @@
# <stockholm/makefu/2configs/share/anon-ftp.nix>
# <stockholm/makefu/2configs/share/anon-sftp.nix>
<stockholm/makefu/2configs/share/gum-client.nix>
- <stockholm/makefu/2configs/share/hetzner-client.nix>
<stockholm/makefu/2configs/share>
# <stockholm/makefu/2configs/share/temp-share-samba.nix>