diff --git a/hosts/mabon/nixos/default.nix b/hosts/mabon/nixos/default.nix index 70d84f03..257d0735 100644 --- a/hosts/mabon/nixos/default.nix +++ b/hosts/mabon/nixos/default.nix @@ -1,14 +1,8 @@ - { config, pkgs, profiles, ... }: { - imports = [ - ./hw.nix - profiles.gui - profiles.sway - profiles.kat - profiles.laptop - ]; + imports = + [ ./hw.nix profiles.gui profiles.sway profiles.kat profiles.laptop ]; deploy.target = "mbp"; diff --git a/hosts/mabon/nixos/hw.nix b/hosts/mabon/nixos/hw.nix index 72f7f165..f9efa0fe 100644 --- a/hosts/mabon/nixos/hw.nix +++ b/hosts/mabon/nixos/hw.nix @@ -1,30 +1,38 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "firewire_ohci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci" ]; + boot.initrd.availableKernelModules = [ + "uhci_hcd" + "ehci_pci" + "ahci" + "firewire_ohci" + "usbhid" + "usb_storage" + "sd_mod" + "sr_mod" + "sdhci_pci" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" "wl" ]; boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/236f9363-19ee-46e3-8db4-5dd1e28b742d"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/236f9363-19ee-46e3-8db4-5dd1e28b742d"; + fsType = "ext4"; + }; - boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/b0435b6c-fd76-44d0-8b63-2c2c059df814"; + boot.initrd.luks.devices."cryptroot".device = + "/dev/disk/by-uuid/b0435b6c-fd76-44d0-8b63-2c2c059df814"; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/84FB-4F88"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/84FB-4F88"; + fsType = "vfat"; + }; swapDevices = - [ { device = "/dev/disk/by-uuid/926c41d6-c06a-4dcc-b55d-f4cfaafe4bac"; } - ]; + [{ device = "/dev/disk/by-uuid/926c41d6-c06a-4dcc-b55d-f4cfaafe4bac"; }]; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; } diff --git a/hosts/ostara/nixos/default.nix b/hosts/ostara/nixos/default.nix index a6140aae..2de2ed13 100644 --- a/hosts/ostara/nixos/default.nix +++ b/hosts/ostara/nixos/default.nix @@ -1,14 +1,8 @@ - { config, pkgs, profiles, ... }: { - imports = [ - ./hw.nix - profiles.gui - profiles.sway - profiles.kat - profiles.laptop - ]; + imports = + [ ./hw.nix profiles.gui profiles.sway profiles.kat profiles.laptop ]; deploy.target = "slow"; diff --git a/hosts/ostara/nixos/hw.nix b/hosts/ostara/nixos/hw.nix index 0350a1be..0d1f7e61 100644 --- a/hosts/ostara/nixos/hw.nix +++ b/hosts/ostara/nixos/hw.nix @@ -1,22 +1,20 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = + [ "uhci_hcd" "ehci_pci" "ahci" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/469a684b-eb8f-48a8-8f98-be58528312c4"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/469a684b-eb8f-48a8-8f98-be58528312c4"; + fsType = "ext4"; + }; swapDevices = - [ { device = "/dev/disk/by-uuid/2223e305-79c9-45b3-90d7-560dcc45775a"; } - ]; + [{ device = "/dev/disk/by-uuid/2223e305-79c9-45b3-90d7-560dcc45775a"; }]; } diff --git a/pkgs/kat-tw-export/default.nix b/pkgs/kat-tw-export/default.nix index 85eef4e9..e7375cb9 100644 --- a/pkgs/kat-tw-export/default.nix +++ b/pkgs/kat-tw-export/default.nix @@ -1,14 +1,14 @@ { stdenv, makeWrapper, perl, perlPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "kat-tw-export"; version = "0.0.1"; - src = ./tw.pl; + src = ./tw.pl; buildInputs = [ perl perlPackages.JSON ]; nativeBuildInputs = [ makeWrapper ]; unpackPhase = "true"; installPhase = '' install -Dm0755 $src $out/bin/kat-tw-export wrapProgram $out/bin/kat-tw-export --set PERL5LIB $PERL5LIB - ''; + ''; } diff --git a/profiles/sway/home/sway.nix b/profiles/sway/home/sway.nix index eca6fe87..81b254fa 100644 --- a/profiles/sway/home/sway.nix +++ b/profiles/sway/home/sway.nix @@ -67,11 +67,13 @@ config = let dmenu = "${pkgs.bemenu}/bin/bemenu --fn '${witch.style.font.name} ${witch.style.font.size}' --nb '${witch.style.base16.color0}' --nf '${witch.style.base16.color7}' --sb '${witch.style.base16.color1}' --sf '${witch.style.base16.color7}' -l 5 -m -1 -i"; - lockCommand = "swaylock -i LVDS-1:${../../../private/files/wallpapers/main.png}-i eDP-1:${ + lockCommand = "swaylock -i LVDS-1:${ ../../../private/files/wallpapers/main.png - } -i HDMI-A-1:${../../../private/files/wallpapers/main.png} -i DP-1:${ - ../../../private/files/wallpapers/left.jpg - } -i DVI-D-1:${../../../private/files/wallpapers/right.jpg} -s fill"; + }-i eDP-1:${../../../private/files/wallpapers/main.png} -i HDMI-A-1:${ + ../../../private/files/wallpapers/main.png + } -i DP-1:${../../../private/files/wallpapers/left.jpg} -i DVI-D-1:${ + ../../../private/files/wallpapers/right.jpg + } -s fill"; in { bars = [{ command = "${pkgs.waybar}/bin/waybar"; }]; diff --git a/services/syncplay.nix b/services/syncplay.nix index 02f927ef..1880eb0b 100644 --- a/services/syncplay.nix +++ b/services/syncplay.nix @@ -33,6 +33,7 @@ Group = "sync-cert"; }; }; + security.acme.certs."sync.kittywit.ch".postRun = '' cp key.pem privkey.pem chown acme:voice-cert privkey.pem'';