4 files changed, 54 insertions, 30 deletions
diff --git a/hosts/sofue/configuration.nix b/hosts/sofue/configuration.nix
index ab4e6ef..02c0ce7 100644
--- a/hosts/sofue/configuration.nix
+++ b/hosts/sofue/configuration.nix
@@ -43,18 +43,19 @@ in rec {
       size = ui-font.size;
       baseline = 0;
     };
-    scheme = import ../../themes/miia_new_years_2025/miia.nix;
+    scheme = import ../../themes/spring_2025/spring_2025.nix;
     starter = {
-      picture = ../../themes/miia_new_years_2025/splash.png;
-      width = 53;
+      top_padding = 2;
+      picture = ../../themes/spring_2025/splash2.png;
+      width = 49;
       padding = {
-        top = -6;
-        left = -11;
+        top = -2;
+        left = -8;
         text = 0;
       };
       position = "left";
       footer = "";
-      footer_offset = 0;
+      footer-offset = 0;
     };
     monitors = {
       monitor1 = "DP-1";
@@ -68,6 +69,16 @@ in rec {
 
   boot.isContainer = true;
 
+  users.groups.audio.gid = lib.mkForce 18;
+  users.groups.cdrom.gid = lib.mkForce 19;
+  users.groups.dialout.gid = lib.mkForce 20;
+  users.groups.floppy.gid = lib.mkForce 11;
+  users.groups.input.gid = lib.mkForce 97;
+  users.groups.lp.gid = lib.mkForce 7;
+  users.groups.render.gid = lib.mkForce 28;
+  users.groups.uucp.gid = lib.mkForce 14;
+  users.groups.video.gid = lib.mkForce 27;
+
   nix.settings.system-features = [ "gccarch-znver2" ];
   nixpkgs.hostPlatform = {
     #gcc.arch = "znver2";
@@ -123,6 +134,8 @@ in rec {
       export TTY=/dev/tty3
       export XDG_VTNR=3
       export WLR_RENDERER=vulkan
+      export PULSE_SERVER=unix:/home/andrew/.pulsewire-native-socket
+      export PIPEWIRE_REMOTE=/tmp/pipewire-0-manager
       cd $HOME
       exec ${pkgs.kbd}/bin/openvt --switch --login --console 3 -f -- ${pkgs.sway}/bin/sway
     '')
@@ -160,7 +173,7 @@ in rec {
             max_render_time = "off";
             adaptive_sync = "on";
             render_bit_depth = "10";
-            bg = "#${s.scheme.background-alt} solid_color";
+            bg = "${../../themes/spring_2025/wallpaper1.png} fit";
           };
           "${s.monitors.monitor2}" = {
             mode = "1920x1080@60.000Hz";
@@ -216,7 +229,7 @@ in rec {
           "${mod4}+r" = "exec swaymsg -- output ${s.monitors.monitor1} transform 90";
           "${mod4}+Shift+r" = "exec swaymsg -- output ${s.monitors.monitor1} transform 0";
           "${mod4}+F1" = "exec swaymsg -- output ${s.monitors.monitor1} bg \\#${s.scheme.background-alt} solid_color";
-          "${mod4}+F2" = "exec swaymsg -- output ${s.monitors.monitor1} bg ${../../themes/miia_new_years_2025/wallpaper.png} fill";
+          "${mod4}+F2" = "exec swaymsg -- output ${s.monitors.monitor1} bg ${../../themes/spring_2025/wallpaper1.png} fit";
           #"${mod4}+F1" = "exec printf '||' > $HOME/.config/taro/${s.monitors.monitor1}/selection";
           #"${mod4}+F2" = "exec printf '||' > $HOME/.config/taro/${s.monitors.monitor1}/selection";
           "Pause" = "exec $HOME/c/camu/scripts/cmv_add.sh PAUSE";
diff --git a/hosts/sofue/programs.nix b/hosts/sofue/programs.nix
index e9ee186..72bb4e8 100644
--- a/hosts/sofue/programs.nix
+++ b/hosts/sofue/programs.nix
@@ -1,27 +1,30 @@
 { pkgs, ... }: {
   environment.systemPackages = with pkgs; [
     #gftp
-    dia
+    #dia
     cdrtools
     #ardour
-    audacity
+    #audacity
     krita
-    olive-editor
+    #olive-editor
     yt-dlp
     #chatterino2
     streamlink
     megatools
-    wineWowPackages.staging
-    winetricks
-    cabextract
-    looking-glass-client
-    qbittorrent
-    ungoogled-chromium
+    #wineWowPackages.staging
+    #winetricks
+    #cabextract
+    #looking-glass-client
+    #qbittorrent
+    #ungoogled-chromium
     (pkgs.discord.override { withOpenASAR = true; })
-    imv
-    mpv
-    vlc
+    #imv
+    #mpv
+    #vlc
     camu
     mauri
   ];
+  local.scripts.imports = [
+    "discord-wayland"
+  ];
 }
diff --git a/hosts/yashinoki/configuration.nix b/hosts/yashinoki/configuration.nix
index 09656b2..2917994 100644
--- a/hosts/yashinoki/configuration.nix
+++ b/hosts/yashinoki/configuration.nix
@@ -47,7 +47,7 @@ in {
       padding = { top = -2; left = -6; text = 0; };
       position = "left";
       footer = "";
-      footer_offset = 0;
+      footer-offset = 0;
     };
     monitors = {
       monitor1 = "eDP-1";
@@ -63,16 +63,19 @@ in {
   boot.binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.supportedFilesystems = [ ];
   boot.loader.systemd-boot.enable = true;
-  boot.kernelParams = [ "mitigations=off" "file_caps=1" ];
-  #boot.extraModulePackages = [
-  #  config.boot.kernelPackages.v4l2loopback.out
-  #];
-  #boot.kernelModules = [ "v4l2loopback" ];
-  boot.initrd.kernelModules = [ ];
+  boot.kernelParams = [ "mitigations=off" "file_caps=1" "i915.enable_guc=2" ];
   services.fwupd.enable = true;
 
+  virtualisation.kvmgt = {
+    enable = true;
+    vgpus = {
+      "i915-GVTg_V5_4" = {
+        uuid = [ "2efaf13a-e65a-11ef-84b4-235363f4a8d4" ];
+      };
+    };
+  };
+
   security.wrappers = {
     "mount.nfs" = {
       owner = "root";
@@ -142,7 +145,7 @@ in {
     linuxPackages_latest.perf
     linuxPackages_latest.cpupower
     (pkgs.writeShellScriptBin "run-sway" ''
-      export WLR_RENDERER=vulkan
+      export WLR_RENDERER=gles2
       export WLR_DRM_DEVICES=/dev/dri/card1
       cd $HOME
       exec ${pkgs.sway}/bin/sway
@@ -165,7 +168,8 @@ in {
           "${s.monitors.monitor1}" = {
             mode = "3000x2000@59.999Hz";
             render_bit_depth = "10";
-            adaptive_sync = "on";
+            max_render_time = "off";
+            allow_tearing = "yes";
             scale = "2";
             bg = "${../../themes/year_of_snake/wallpaper.png} fit";
           };
diff --git a/hosts/yashinoki/programs.nix b/hosts/yashinoki/programs.nix
index 30136ef..19742cd 100644
--- a/hosts/yashinoki/programs.nix
+++ b/hosts/yashinoki/programs.nix
@@ -9,4 +9,8 @@
     mpv
     camu
   ];
+  local.scripts.imports = [
+    "battery"
+    "discord-wayland"
+  ];
 }