From e09a2f8a23161e52859754e5cf874ec4099a2008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Tue, 20 Dec 2022 21:47:46 +0100 Subject: nixos: update some machines configuration --- nixos/machine/albert.nix | 19 ++++++++++++++++++- nixos/machine/spt-mox.nix | 2 +- nixos/machine/spt-mpd.nix | 10 ++-------- 3 files changed, 21 insertions(+), 10 deletions(-) (limited to 'nixos') diff --git a/nixos/machine/albert.nix b/nixos/machine/albert.nix index 0adad68..bc35f96 100644 --- a/nixos/machine/albert.nix +++ b/nixos/machine/albert.nix @@ -5,23 +5,40 @@ with lib; { config = { - cynerd.desktop.enable = true; + cynerd = { + desktop = { + enable = true; + laptop = true; + }; + wifiClient = true; + openvpn = { + oldpersonal = true; + }; + }; + + boot.initrd.availableKernelModules = ["xhci_pci" "usb_storage" "sd_mod"]; + + hardware.cpu.intel.updateMicrocode = true; fileSystems = { "/" = { device = "/dev/disk/by-uuid/1c9bafac-fcf8-41c4-b394-bca5917ca82d"; + fsType = "btrfs"; options = ["compress=lzo" "subvol=@nix"]; }; "/home" = { device = "/dev/disk/by-uuid/1c9bafac-fcf8-41c4-b394-bca5917ca82d"; + fsType = "btrfs"; options = ["compress=lzo" "subvol=@home"]; }; "/boot" = { device = "/dev/disk/by-uuid/E403-124B"; + fsType = "vfat"; }; "/home2" = { device = "/dev/disk/by-uuid/55e177a1-215e-475b-ba9c-771b5fa3f8f0"; + fsType = "btrfs"; options = ["compress=lzo" "subvol=@home"]; }; }; diff --git a/nixos/machine/spt-mox.nix b/nixos/machine/spt-mox.nix index acca74c..87d720f 100644 --- a/nixos/machine/spt-mox.nix +++ b/nixos/machine/spt-mox.nix @@ -173,7 +173,7 @@ with lib; systemd.services.bigclown-leds = { description = "Bigclown LEDs control"; wantedBy = ["multi-user.target"]; - after = ["mosquitto.service"]; + wants = ["mosquitto.service"]; serviceConfig.ExecStart = "${pkgs.bigclown-leds}/bin/bigclown-leds /run/secrets/bigclown-leds.ini"; }; diff --git a/nixos/machine/spt-mpd.nix b/nixos/machine/spt-mpd.nix index 3e103e1..f32c1db 100644 --- a/nixos/machine/spt-mpd.nix +++ b/nixos/machine/spt-mpd.nix @@ -7,15 +7,9 @@ with lib; config = { fileSystems = { "/" = { - device = "/dev/mmcblk0p2"; - options = ["compress=lzo" "subvol=@nix"]; - }; - "/home" = { - device = "/dev/mmcblk0p2"; - options = ["compress=lzo" "subvol=@home"]; - }; - "/boot" = { device = "/dev/mmcblk0p1"; + fsType = "btrfs"; + options = ["compress=lzo"]; }; }; }; -- cgit v1.2.3