From 728770140540443291cf6c3b4e2b1aeafb707bd2 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Fri, 19 Nov 2021 21:42:49 +0000
Subject: [PATCH] Waybar changes, koishi monitoring, emulators, ...

---
 config/hosts/koishi.nix                  |  3 ++-
 config/tf                                |  2 +-
 config/users/kat/media/packages.nix      | 12 ++++++++++++
 config/users/kat/sway/waybar/default.nix |  2 +-
 config/users/kat/sway/waybar/waybar.sass |  8 ++++----
 overlays/default.nix                     |  1 +
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/config/hosts/koishi.nix b/config/hosts/koishi.nix
index 6e21e323..0b7f5452 100644
--- a/config/hosts/koishi.nix
+++ b/config/hosts/koishi.nix
@@ -5,6 +5,7 @@
     profiles.light
     profiles.network
     users.kat.guiFull
+    services.nginx
     services.dnscrypt-proxy
   ];
 
@@ -37,7 +38,7 @@
 
     powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
     boot = {
-      supportedFilesystems = singleton "xfs";
+      supportedFilesystems = [ "xfs" "zfs" ];
       initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/8dd300d3-c432-47b6-8466-55682cd1c1a1";
       loader = {
         systemd-boot.enable = true;
diff --git a/config/tf b/config/tf
index 42109564..9bb76e3a 160000
--- a/config/tf
+++ b/config/tf
@@ -1 +1 @@
-Subproject commit 42109564c606b20be3b99d5c6e4172bf20118a65
+Subproject commit 9bb76e3a1d33679e7a0a8aac4069c3c0deeef4e0
diff --git a/config/users/kat/media/packages.nix b/config/users/kat/media/packages.nix
index ac671f01..d5f0222d 100644
--- a/config/users/kat/media/packages.nix
+++ b/config/users/kat/media/packages.nix
@@ -15,5 +15,17 @@
     v4l-utils
     gimp-with-plugins
     wf-recorder
+    dolphinEmuMaster
+    pcsxr
+    pcsx2
+    mgba
+    nestopia
+    snes9x-gtk
+    citra
+    melonDS
+    mupen64plus
+    retroarch
+    sixpair
+    xboxdrv
   ];
 }
diff --git a/config/users/kat/sway/waybar/default.nix b/config/users/kat/sway/waybar/default.nix
index ee7e8715..ac927cf9 100644
--- a/config/users/kat/sway/waybar/default.nix
+++ b/config/users/kat/sway/waybar/default.nix
@@ -12,7 +12,6 @@
       modules-center = [ "clock#s" "clock#arc" "clock#hex" "clock#miku" "clock" ];
       modules-left = [ "sway/workspaces" "sway/mode" "sway/window" ];
       modules-right = [
-        "tray"
         "pulseaudio"
         "custom/mail"
         "cpu"
@@ -24,6 +23,7 @@
         "idle_inhibitor"
         "custom/konawall"
         "custom/gpg-status"
+        "tray"
       ];
 
       modules = {
diff --git a/config/users/kat/sway/waybar/waybar.sass b/config/users/kat/sway/waybar/waybar.sass
index 2662fe89..2c7de0a6 100644
--- a/config/users/kat/sway/waybar/waybar.sass
+++ b/config/users/kat/sway/waybar/waybar.sass
@@ -103,8 +103,8 @@ tooltip
 #tray
   @extend %extend_1
   background: $base00t
-  border-top-left-radius: 1em
-  border-bottom-left-radius: 1em
+  border-top-right-radius: 1em
+  border-bottom-right-radius: 1em
   padding: 0 10px 0 8px
   menu
     background: $base00t
@@ -112,7 +112,7 @@ tooltip
     color: $base07
 
 
-.modules-center
+.modules-left
   margin: 2px 4px
   border-radius: 1em
   widget
@@ -126,7 +126,7 @@ tooltip
     &:last-child
       margin-right: 0
 
-.modules-left
+.modules-center
   margin: 2px 4px
   border-radius: 1em
   widget
diff --git a/overlays/default.nix b/overlays/default.nix
index e05e366a..933e4a1a 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -16,6 +16,7 @@ let
       allowUnfree = true;
       permittedInsecurePackages = [
         "ffmpeg-3.4.8"
+        "ffmpeg-2.8.17"
       ];
     };
   };