diff --git a/flake.nix b/flake.nix index 1256397..93bb76a 100644 --- a/flake.nix +++ b/flake.nix @@ -40,6 +40,7 @@ inherit system; modules = [ (import ./hosts/sakura) + # sops-nix.nixosModules.sops ]; specialArgs = { host = "sakura"; @@ -50,6 +51,7 @@ inherit system; modules = [ (import ./hosts/yoshino) + # sops-nix.nixosModules.sops ]; specialArgs = { host = "yoshino"; @@ -60,6 +62,7 @@ inherit system; modules = [ (import ./hosts/ichiyo) + # sops-nix.nixosModules.sops ]; specialArgs = { host = "ichiyo"; @@ -70,6 +73,7 @@ inherit system; modules = [ (import ./hosts/violet) + # sops-nix.nixosModules.sops ]; specialArgs = { host = "violet"; @@ -80,6 +84,7 @@ inherit system; modules = [ (import ./hosts/dandelion) + # sops-nix.nixosModules.sops ]; specialArgs = { host = "dandelion"; @@ -90,6 +95,7 @@ inherit system; modules = [ (import ./hosts/lily) + # sops-nix.nixosModules.sops ]; specialArgs = { host = "lily"; @@ -100,22 +106,13 @@ inherit system; modules = [ (import ./hosts/zinnia) + # sops-nix.nixosModules.sops ]; specialArgs = { host = "zinnia"; inherit self inputs username; }; }; - posy = nixpkgs.lib.nixosSystem { - system = "aarch64-linux"; - modules = [ - (import ./hosts/posy) - ]; - specialArgs = { - host = "posy"; - inherit self inputs username; - }; - }; }; }; } diff --git a/hosts/posy/default.nix b/hosts/posy/default.nix deleted file mode 100644 index e51f387..0000000 --- a/hosts/posy/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ config, pkgs, lib, ... }: -{ - imports = [ - ./../../modules/core/default.server.nix - ./../../modules/services/mpd.nix - ]; - - networking.hostName = "posy"; - - time.timeZone = "Europe/Amsterdam"; - - environment.systemPackages = with pkgs; [ - pkgs.kitty.terminfo - ]; - - boot = { - kernelPackages = pkgs.linuxKernel.packages.linux_rpi4; - initrd.availableKernelModules = [ "xhci_pci" "usbhid" "usb_storage" ]; - loader = { - grub.enable = false; - generic-extlinux-compatible.enable = true; - }; - }; - - services = { - smartd = { - enable = lib.mkForce false; - autodetect = lib.mkForce false; - }; - }; - - fileSystems = { - "/" = { - device = "/dev/disk/by-label/NIXOS_SD"; - fsType = "ext4"; - options = [ "noatime" ]; - }; - }; - - hardware.enableRedistributableFirmware = true; -} diff --git a/hosts/sakura/default.nix b/hosts/sakura/default.nix index 0d48a0b..dff5d04 100644 --- a/hosts/sakura/default.nix +++ b/hosts/sakura/default.nix @@ -75,7 +75,7 @@ systemd.sleep.extraConfig = '' HibernateDelaySec=30m ''; - services.logind.lidSwitch = "suspend"; + services.logind.lidSwitch = "suspend-then-hibernate"; boot = { # plymouth.enable = true; # is a module now kernelParams = [ diff --git a/modules/core/user.nix b/modules/core/user.nix index eef3a74..756878a 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -24,8 +24,6 @@ [ ./../home/default.server.nix ] else if (host == "lily") then [ ./../home/default.server.nix ] - else if (host == "posy") then - [ ./../home/default.server.nix ] # else if (host == "yoshino") then # [ ./../home/default.nix ] else diff --git a/modules/home/scripts/scripts/unfuck.sh b/modules/home/scripts/scripts/unfuck.sh index 480bd72..4e7dbb6 100644 --- a/modules/home/scripts/scripts/unfuck.sh +++ b/modules/home/scripts/scripts/unfuck.sh @@ -62,8 +62,6 @@ unfuck_audio() { devices+=("$device") done systemctl --user restart wireplumber pipewire pipewire-pulse bluetooth - rfkill block bluetooth - rfkill unblock bluetooth bluetoothctl power off bluetoothctl power on for device in ${devices[*]}; do