Import wayland vars to systemd & dbus on hyprland start

home/packages/gui/default.nix

@@ -6,5 +6,6 @@ _: {
     ./qbittorrent.nix
     ./mpv.nix
     ./obs.nix
+    ./qimgv.nix
   ];
 }

home/packages/gui/nomacs.nix

@@ -29,6 +29,7 @@ in {
         hideAllPanels=true
         showMenuBar=false
         showRecentFiles=false
+        useLogFile=true
 
         [Crop]
         AspectRatioHorizontal=0
@@ -62,7 +63,7 @@ in {
         overwriteDialog-answer=16384
         saveEditDialog=false
         saveEditDialog-answer=16384
-        saveTabsDialog=true
+        saveTabsDialog=false
         saveTabsDialog-answer=16384
 
         [DkExplorer]

home/packages/gui/qimgv.nix

@@ -0,0 +1,99 @@
+{
+  lib,
+  pkgs,
+  osConfig,
+  ...
+}: let
+  inherit (lib) mkIf;
+
+  cfg = osConfig.myOptions.home-manager.programs.applications.qimgv;
+in {
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      qimgv
+    ];
+
+    xdg.configFile = {
+      "qimgv/qimgv.conf".text = ''
+        [General]
+        JPEGSaveQuality=95
+        absoluteZoomStep=false
+        autoResizeLimit=90
+        autoResizeWindow=false
+        backgroundOpacity=1
+        blurBackground=false
+        confirmDelete=true
+        confirmTrash=false
+        cursorAutohiding=true
+        defaultCropAction=0
+        defaultFitMode=0
+        defaultViewMode=0
+        drawTransparencyGrid=false
+        enableSmoothScroll=true
+        expandImage=false
+        expandLimit=2
+        firstRun=false
+        focusPointIn1to1Mode=1
+        folderEndAction=0
+        imageScrolling=1
+        infoBarFullscreen=true
+        infoBarWindowed=false
+        jxlAnimation=false
+        keepFitMode=false
+        lastVerMajor=1
+        lastVerMicro=2
+        lastVerMinor=0
+        loopSlideshow=false
+        mpvBinary=/nix/store/sz3h6s8p2r22v76m0yr6fn3m663sms7r-mpv-with-scripts-0.37.0/bin/mpv
+        openInFullscreen=false
+        panelEnabled=true
+        panelFullscreenOnly=true
+        panelPosition=top
+        panelPreviewsSize=140
+        playVideoSounds=false
+        scalingFilter=1
+        showSaveOverlay=true
+        slideshowInterval=3000
+        smoothAnimatedImages=true
+        smoothUpscaling=true
+        sortingMode=0
+        squareThumbnails=false
+        thumbPanelStyle=1
+        thumbnailCache=true
+        thumbnailerThreads=4
+        unloadThumbs=true
+        useOpenGL=false
+        usePreloader=true
+        useSystemColorScheme=false
+        videoPlayback=true
+        windowTitleExtendedInfo=true
+        zoomIndicatorMode=0
+        zoomStep=0.20000000298023224
+
+        [Controls]
+        shortcuts="zoomIn=+", "frameStepBack=,", "zoomOut=-", "frameStep=.", "fitWindow=1", "fitWidth=2", "fitNormal=3", "exit=Alt+X", "folderView=Backspace", "crop=C", "copyFileClipboard=Ctrl+C", "showInDirectory=Ctrl+D", "zoomOut=Ctrl+Down", "rotateLeft=Ctrl+L", "seekVideoBackward=Ctrl+Left", "open=Ctrl+O", "print=Ctrl+P", "exit=Ctrl+Q", "rotateRight=Ctrl+R", "seekVideoForward=Ctrl+Right", "save=Ctrl+S", "copyPathClipboard=Ctrl+Shift+C", "saveAs=Ctrl+Shift+S", "zoomIn=Ctrl+Up", "pasteFile=Ctrl+V", "zoomOutCursor=Ctrl+WheelDown", "zoomInCursor=Ctrl+WheelUp", "discardEdits=Ctrl+Z", "toggleShuffle=Ctrl+`", "s:trash with trash-cli=Del", "scrollDown=Down", "jumpToLast=End", "folderView=Enter", "closeFullScreenOrExit=Esc", "toggleFullscreen=F", "toggleFullscreen=F11", "renameFile=F2", "reloadImage=F5", "flipH=H", "jumpToFirst=Home", "toggleImageInfo=I", "toggleFullscreen=LMB_DoubleClick", "prevImage=Left", "moveFile=M", "contextMenu=Menu", "openSettings=P", "resize=R", "contextMenu=RMB", "nextImage=Right", "removeFile=Shift+Del", "toggleFullscreenInfoBar=Shift+F", "prevDirectory=Shift+Left", "nextDirectory=Shift+Right", "toggleFitMode=Space", "scrollUp=Up", "flipV=V", "nextImage=WheelDown", "prevImage=WheelUp", "prevImage=XButton1", "nextImage=XButton2", "toggleSlideshow=`"
+
+        [Scripts]
+        script\1\name=trash with trash-cli
+        script\1\value=@Variant(\0\0\0\x7f\0\0\0\aScript\0\0\0\0 \0t\0r\0\x61\0s\0h\0-\0p\0u\0t\0 \0%\0\x66\0i\0l\0\x65\0%\x1)
+        script\size=1
+      '';
+
+      "qimgv/theme.conf".text = ''
+        [Colors]
+        accent=#8c9b81
+        background=#1a1a1a
+        background_fullscreen=#1a1a1a
+        folderview=#242424
+        folderview_topbar=#383838
+        icons=#a4a4a4
+        overlay=#1a1a1a
+        overlay_text=#d2d2d2
+        scrollbar=#5a5a5a
+        text=#b6b6b6
+        widget=#252525
+        widget_border=#2c2c2c
+      '';
+    };
+  };
+}

home/programs/graphical/wms/hyprland/config/exec.nix

@@ -1,8 +1,8 @@
-{
+{pkgs, ...}: {
   wayland.windowManager.hyprland.settings = {
     exec-once = [
-      # TODO: Add this (probably only vesktop)
+      "${pkgs.systemd}/bin/systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
+      "${pkgs.systemd}/bin/dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=$XDG_CURRENT_DESKTOP"
     ];
   };
 }
-

home/programs/graphical/wms/hyprland/default.nix

@@ -8,6 +8,10 @@
 
   hyprPkgs = (import ./packages {inherit pkgs;});
 
+  # TODO: Switch to flake
+  hyprlandPkg = pkgs.hyprland;
+  xdgDesktopPortalHyprlandPkg = pkgs.xdg-desktop-portal-hyprland;
+
   cfg = osConfig.myOptions.home-manager.wms.hyprland;
 in {
   imports = [
@@ -30,10 +34,19 @@ in {
     wayland.windowManager.hyprland = {
       enable = true;
       xwayland.enable = true;
+      package = hyprlandPkg;
       systemd = {
         enable = true;
         variables = ["--all"];
       };
     };
+
+    xdg.portal = {
+      enable = true;
+      configPackages = [hyprlandPkg];
+      extraPortals = [
+        xdgDesktopPortalHyprlandPkg
+      ];
+    };
   };
 }

home/programs/graphical/wms/hyprland/packages/quick-record/quick-record.sh

@@ -37,7 +37,9 @@ start_recording() {
 
     # Wee need 'y' stdin to confirm that we want to override the file
     # since mktemp creates a blank file there already
-    echo "y" | wf-recorder -g "$geom" -f "$file"
+    # TODO: The -x 420p is a temporary fix to address the recordings appearing
+    # corrupted in firefox/discord/... See: <https://github.com/ammen99/wf-recorder/issues/218>
+    echo "y" | wf-recorder -g "$geom" -f "$file" -x yuv420p
 
     # If wf-recorder process ends directly, rather than a trap being hit
     # we also want to run the save_file func

home/programs/xdg/mime-apps.nix

@@ -1,5 +1,10 @@
 # Manage $XDG_CONFIG_HOME/mimeapps.list
 {
+  osConfig,
+  ...
+}: let
+  cfg = osConfig.myOptions.home-manager.programs;
+in {
   xdg.mimeApps = let 
       browser = "firefox.desktop";
       textEditor = browser; # nvim doesn't work properly with xdg-open, just use the browser
@@ -7,7 +12,12 @@
       pdfViewer = browser; # TODO: consider zathura (org.pwmt.zathura.desktop.desktop)
       fileManager = "pcmanfm-qt.desktop"; # TODO: change
       archiveManager = "org.kde.ark.desktop";
-      imageViewer = "org.nomacs.ImageLounge.desktop";
+      imageViewer = 
+        if cfg.applications.qimgv.enable
+        then "qimgv.desktop" 
+        else if cfg.applications.nomacs.enable
+        then "org.nomacs.ImageLounge.desktop"
+        else browser;
       videoPlayer = "mpv.desktop";
       audioPlayer = "mpv.desktop";
 
@@ -60,5 +70,6 @@
   home.sessionVariables = {
     BROWSER = "firefox";
     DEFAULT_BROWSER = "firefox";
+    TERMINAL = "kitty";
   };
 }

hosts/voyager/default.nix

@@ -174,7 +174,8 @@
             autoStart = true;
           };
           mpv.enable = true;
-          nomacs.enable = true;
+          nomacs.enable = true;  # TODO: probably disable
+          qimgv.enable = true;
           qbittorrent.enable = true;
           obs.enable = true;
         };

hosts/voyager/hardware-configuration.nix

@@ -46,6 +46,12 @@
       options = [ "fmask=0022" "dmask=0022" ];
     };
 
+  fileSystems."/.btrfs" =
+    { device = "/dev/disk/by-label/NIXOS-FS";
+      fsType = "btrfs";
+      options = [ "noatime" "compress=zstd:3" ];
+    };
+
   swapDevices =
     [ { device = "/dev/disk/by-label/SWAP"; }
     ];

options/home/programs/default.nix

@@ -34,6 +34,7 @@ in
         autoStart = mkEnableOption "Auto-Start for Vesktop";
       };
       nomacs.enable = mkEnableOption "Nomacs (Qt-based image viewer)";
+      qimgv.enable = mkEnableOption "QImgV (Qt-based image viewer with video support)";
       qbittorrent.enable = mkEnableOption "Qbittorrent (Free software BitTorrent client)";
       obs.enable = mkEnableOption "OBS (Free and oepn source software for video recording and live streaming)";
       mpv.enable = mkEnableOption "MPV (General-purpose media player)";

system/roles/workstation/default.nix

@@ -4,5 +4,6 @@
     ./programs
     ./fonts.nix
     ./runners.nix
+    ./display
   ];
 }

system/roles/workstation/display/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./wayland
+  ];
+}

system/roles/workstation/display/wayland/default.nix

@@ -0,0 +1,8 @@
+{
+  imports = [
+    ./wms
+    ./xdg-portals.nix
+    ./xwayland.nix
+    ./services.nix
+  ];
+}

system/roles/workstation/display/wayland/services.nix

@@ -0,0 +1,29 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf getExe;
+
+  cfgEnabled = config.myOptions.home-manager.wms.isWayland;
+in {
+  config = mkIf cfgEnabled {
+    systemd.services = {
+      # Seat management daemon
+      # (Takes care of mediating access to shared devices (graphics, input), without requiring 
+      # applications like Wayland compositors being granted root privileges)
+      seatd = {
+        enable = true;
+        description = "Seat management daemon";
+        script = "${getExe pkgs.seatd} -g wheel";
+        serviceConfig = {
+          Type = "simple";
+          Restart = "always";
+          RestartSec = "1";
+        };
+        wantedBy = ["multi-user.target"];
+      };
+    };
+  };
+}

system/roles/workstation/display/wayland/wms/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./hyprland
+  ];
+}

system/roles/workstation/display/wayland/wms/hyprland/default.nix

@@ -0,0 +1,30 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf;
+
+  cfgEnabled = config.myOptions.home-manager.wms.hyprland.enable;
+
+  # TODO: Switch to flake
+  hyprlandPkg = pkgs.hyprland;
+  xdgDesktopPortalHyprlandPkg = pkgs.xdg-desktop-portal-hyprland;
+in {
+  config = mkIf cfgEnabled {
+    services.displayManager.sessionPackages = [hyprlandPkg];
+
+    xdg.portal = {
+      enable = true;
+      configPackages = [hyprlandPkg];
+      extraPortals = [xdgDesktopPortalHyprlandPkg];
+    };
+
+    programs.hyprland = {
+      enable = true;
+      package = hyprlandPkg;
+      portalPackage = xdgDesktopPortalHyprlandPkg;
+    };
+  };
+}

system/roles/workstation/display/wayland/xdg-portals.nix

@@ -0,0 +1,37 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkIf;
+
+  cfgEnabled = config.myOptions.home-manager.wms.isWayland;
+  cfgHyprlandEnabled = config.myOptions.home-manager.wms.hyprland.enable;
+in {
+  config = mkIf cfgEnabled {
+    xdg.portal = {
+      enable = true;
+
+      extraPortals = with pkgs; [
+        xdg-desktop-portal-gtk
+      ];
+
+      # Specify which portals should be used by the individual interfaces
+      # see: <https://github.com/flatpak/xdg-desktop-portal/blob/1.18.1/doc/portals.conf.rst.in>
+      config.common = let 
+        # Note: this assumes a wlroots based compositor if it's not hyprland
+        # which may not always actually be the case, however, I can't be bothered to handle
+        # everything here and I don't plan on moving WMs any time soon.
+        portal = if cfgHyprlandEnabled then "hyprland" else "wlr";
+      in {
+        # Use this portal for every interface, unless a specific override is present
+        default = ["gtk"];
+
+        # Fix flameshot on hyprland / wlroots compositors
+        "org.freedesktop.impl.portal.Screencast" = [portal];
+        "org.freedesktop.impl.portal.Screenshot" = [portal];
+      };
+    };
+  };
+}

system/roles/workstation/display/wayland/xwayland.nix

@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf;
+
+  cfgEnabled = config.myOptions.home-manager.wms.isWayland;
+in {
+  config = mkIf cfgEnabled {
+    programs.xwayland.enable = true;
+  };
+}