updates to flake

eww/scripts/appname

@@ -10,8 +10,8 @@ workspaces() {
 
     if [[ ${1:0:12} == "activewindow" ]]; then #set focused workspace
         line=$(hyprctl activewindow | rg Window | cut -f 4- -d ' ' | sed 's/://')
-        class=$(hyprctl activewindow | rg class | awk '{print $2}')
+        class=$(hyprctl activewindow | rg "class:" | awk '{print $2}')
-        export iconpath=$(geticons "$class" -s 16 -c 1 -t "$icontheme" | head -n 1)
+        export iconpath=$(geticons "$class" -s 32 -c 1 -t "$icontheme" | head -n 1)
         export title=$line
     fi
 }

modules/desktop.nix

@@ -63,6 +63,17 @@ with lib;
     enableKwallet = true;
   };
 
+  fonts.fonts = with pkgs; [
+    nerdfonts
+    noto-fonts
+    noto-fonts-cjk
+    noto-fonts-emoji
+    liberation_ttf
+    mplus-outline-fonts.githubRelease
+    dina-font
+    proggyfonts
+  ];
+
   security.pam.services = {
     sddm.enableKwallet = true;
     greetd.enableKwallet = true;
@@ -101,6 +112,8 @@ with lib;
 
   programs.hyprland = {
     enable = true;
+    xwayland.enable = true;
+    xwayland.hidpi = true;
   };
 
   services.avahi = {
@@ -130,6 +143,22 @@ with lib;
       # Thought I needed this but apparently they are working fine without it.
       # QT_XCB_GL_INTEGRATION = "xcb_egl";
       # QT_QPA_PLATFORM_PLUGIN_PATH = "${pkgs.qt5.qtbase.bin}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins/platforms";
+      NIXOS_OZONE_WL = "1";
+      _JAVA_AWT_WM_NONEREPARENTING = "1";
+      # DISABLE_QT5_COMPAT = "0";
+      GDK_BACKEND = "wayland";
+      ANKI_WAYLAND = "1";
+      WLR_DRM_NO_ATOMIC = "1";
+      QT_AUTO_SCREEN_SCALE_FACTOR = "1";
+      QT_QPA_PLATFORM = "wayland";
+      # QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
+      # QT_QPA_PLATFORMTHEME = "qt5ct";
+      MOZ_ENABLE_WAYLAND = "1";
+      WLR_BACKEND = "vulkan";
+      WLR_RENDERER = "vulkan";
+      XDG_SESSION_TYPE = "wayland";
+      SDL_VIDEODRIVER = "wayland";
+      CLUTTER_BACKEND = "wayland";
       WLR_NO_HARDWARE_CURSORS = "1";
   };
 

modules/emacs.nix

@@ -61,6 +61,7 @@ with lib;
         melpaPackages.embark
         melpaPackages.embark-consult
         corfu
+        jinx
         eat
         kind-icon
         melpaPackages.orderless

pkgs/desktop-packages.nix

@@ -63,6 +63,10 @@ with lib;
     vulkan-tools
     wayland-utils
     nextcloud-client
+    qt5.qtbase
+    qt5.qtwayland
+    qt6.qtwayland
+    swww
     # mkchromecast
     plocate
     # librepresenter.libre-presenter
@@ -104,6 +108,7 @@ with lib;
     lxappearance
     spotdl
     kdenlive
+    glaxnimate
     minetest
     pqiv
     plasma5Packages.audiotube
@@ -129,7 +134,7 @@ with lib;
     (callPackage ../ydotool {  })
     (libsForQt5.callPackage /home/chris/dev/LightlyShaders {}) # LightlyShaders
     # (libsForQt5.callPackage /home/chris/.dotfiles/RoundedSBE {}) 
-    (libsForQt5.callPackage /home/chris/dev/church-presenter {}) # librepresenter
+    # (libsForQt5.callPackage /home/chris/dev/church-presenter {}) # librepresenter
     # (libsForQt5.callPackage /home/chris/dev/tyler {}) # librepresenter
     nix-index
     sqlite

scripts/slideshow

@@ -13,7 +13,9 @@ echo $all
 # echo $2
 
 if [ $all ]; then
-    ffmpeg -framerate 1 -pattern_type glob -i '*.jpg' -c:v libx264 -r 30 -pix_fmt yuv420p slideshow.mp4
+    ffmpeg -framerate 1 -pattern_type glob -i '*.jpg' \
+           -vf 'scale=1920:1080:force_original_aspect_ratio=decrease,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,setsar=1' \
+           -c:v libx264 -r 30 -pix_fmt yuv420p slideshow.mp4
 fi
 
 

tridactyl/tridactylrc

@@ -76,6 +76,8 @@ bind gC hint -W org-capture
 bind gw tabwork
 bind m fillcmdline quickmark 
 bind O fillcmdline tabopen
+bind gh hint -h
+bind <C-s> fillcmdline tabgroupswitch
 
 "" buffers show as windows
 bind b fillcmdline taball