diff --git a/config/hosts/boline/configuration.nix b/config/hosts/boline/configuration.nix
index 45ab91be..f93aad2d 100644
--- a/config/hosts/boline/configuration.nix
+++ b/config/hosts/boline/configuration.nix
@@ -1,10 +1,7 @@
{ config, pkgs, ... }:
{
- imports = [
- ./hardware.nix
- ../../services/nginx.nix
- ];
+ imports = [ ./hardware.nix ../../services/nginx.nix ];
deploy.profiles = [ "kat" ];
deploy.ssh.host = "boline.kittywit.ch";
diff --git a/config/hosts/samhain/vm/default.nix b/config/hosts/samhain/vm/default.nix
index ce74221d..a4155559 100644
--- a/config/hosts/samhain/vm/default.nix
+++ b/config/hosts/samhain/vm/default.nix
@@ -70,13 +70,15 @@
type = "oneshot";
RemainAfterExit = "yes";
};
- script = let xml = pkgs.writeText "libvirt-guest-win10.xml" (import ./win10.xml.nix {}); in ''
- uuid="$(${pkgs.libvirt}/bin/virsh domuuid 'win10' || true)"
- ${pkgs.libvirt}/bin/virsh define <(sed "s/UUID/$uuid/" '${xml}')
- ${pkgs.libvirt}/bin/virsh start 'win10';
+ script = let
+ xml =
+ pkgs.writeText "libvirt-guest-win10.xml" (import ./win10.xml.nix { });
+ in ''
+ uuid="$(${pkgs.libvirt}/bin/virsh domuuid 'win10' || true)"
+ ${pkgs.libvirt}/bin/virsh define <(sed "s/UUID/$uuid/" '${xml}')
+ ${pkgs.libvirt}/bin/virsh start 'win10';
'';
- preStop =
- ''
+ preStop = ''
${pkgs.libvirt}/bin/virsh shutdown 'win10'
let "timeout = $(date +%s) + 120"
while [ "$(${pkgs.libvirt}/bin/virsh list --name | grep --count '^win10$')" -gt 0 ]; do
diff --git a/config/hosts/samhain/vm/win10.xml.nix b/config/hosts/samhain/vm/win10.xml.nix
index 3cc7d0e7..a931275f 100644
--- a/config/hosts/samhain/vm/win10.xml.nix
+++ b/config/hosts/samhain/vm/win10.xml.nix
@@ -1,260 +1,260 @@
{ ... }:
''
-
- win10
- UUID
-
-
-
-
-
- 12582912
- 12582912
- 6
- 1
-
-
-
-
-
-
-
-
-
-
-
- hvm
- /run/libvirt/nix-ovmf/OVMF_CODE.fd
- /var/lib/libvirt/qemu/nvram/win10_VARS.fd
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- destroy
- restart
- destroy
-
-
-
-
-
- /run/libvirt/nix-emulators/qemu-system-x86_64
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ win10
+ UUID
+
+
+
+
+
+ 12582912
+ 12582912
+ 6
+ 1
+
+
+
+
+
+
+
+
+
+
+
+ hvm
+ /run/libvirt/nix-ovmf/OVMF_CODE.fd
+ /var/lib/libvirt/qemu/nvram/win10_VARS.fd
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ destroy
+ restart
+ destroy
+
+
+
+
+
+ /run/libvirt/nix-emulators/qemu-system-x86_64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
''
diff --git a/config/profiles/kat/home/zsh/default.nix b/config/profiles/kat/home/zsh/default.nix
index b7858b5a..9b757248 100644
--- a/config/profiles/kat/home/zsh/default.nix
+++ b/config/profiles/kat/home/zsh/default.nix
@@ -4,7 +4,7 @@
config = lib.mkIf config.deploy.profile.kat {
programs.zsh = {
enable = true;
- shellAliases = {
+ shellAliases = {
nixdirfmt = "fd --color=never .nix | xargs nixfmt";
exa = "exa --time-style long-iso";
ls = "exa -G";
diff --git a/config/profiles/sway/nixos/sway.nix b/config/profiles/sway/nixos/sway.nix
index 622b82a5..3d7ff252 100644
--- a/config/profiles/sway/nixos/sway.nix
+++ b/config/profiles/sway/nixos/sway.nix
@@ -1,5 +1,10 @@
{ config, pkgs, lib, sources, ... }:
{
- config = lib.mkIf config.deploy.profile.sway { programs.sway.enable = true; };
+ config = lib.mkIf config.deploy.profile.sway {
+ programs.sway = {
+ enable = true;
+ extraPackages = with pkgs; lib.mkForce [ xwayland swaylock swayidle ];
+ };
+ };
}