misc

modules/home/desktop.nix

@@ -1,4 +1,4 @@
-{ pkgs, nix-config, lib, ... }:
+{ pkgs, nix-config, inputs, lib, ... }:
 
 {
 
@@ -12,147 +12,149 @@
     sway-launcher-desktop
   ];
 
-  home.packages = lib.mkMerge [
-    (with nix-config.packages.x86_64-linux; [
-      filen-desktop
-    ])
+  home.packages = with pkgs; [
 
-    (with pkgs; [
-      appimage-run
-      libappimage
-      transmission_4-gtk
-      wl-clipboard
-      clipse
-      wayland-utils
-      libheif.out
-      rpi-imager
-      freecad
-      flatpak
-      prusa-slicer
-      via
-      vial
-      pdfarranger
-      tdf
-      pdfchain
-      pdftk
-      zathura
-      gpu-viewer
-      foliate
-      wl-mirror
-      soundconverter
-      wmctrl
+    filen-desktop
+    filen-cli
 
-      scribus
-      gimp3
+    szyszka
 
-      # godot_4
-      # gdtoolkit_4
+    appimage-run
+    libappimage
+    transmission_4-gtk
+    wl-clipboard
+    clipse
+    wayland-utils
+    libheif.out
+    rpi-imager
+    freecad
+    flatpak
+    prusa-slicer
+    via
+    vial
+    pdfarranger
+    tdf
+    pdfchain
+    pdftk
+    zathura
+    gpu-viewer
+    foliate
+    wl-mirror
+    soundconverter
+    wmctrl
 
-      epsonscan2
-      sane-airscan
-      xsane
+    scribus
+    gimp3
 
-      bitwarden-cli
-      bitwarden-desktop
-      tailscale
-      trayscale
-      font-manager
+    # godot_4
+    # gdtoolkit_4
 
-      papers
-      newsflash
+    epsonscan2
+    sane-airscan
+    xsane
 
-      stirling-pdf
-      ripdrag
+    bitwarden-cli
+    bitwarden-desktop
+    tailscale
+    trayscale
+    font-manager
 
-      polychromatic
+    papers
+    newsflash
 
-      swayidle
-      emojify
-      smile
+    stirling-pdf
+    ripdrag
 
-      impression
-      zoom-us
-      nyxt
-      ungoogled-chromium
-      obsidian
-      vlc
-      discord
-      slack
-      signal-desktop-bin
-      libreoffice
-      hyphenDicts.en_US
-      plex-mpv-shim
-      plexamp
+    polychromatic
 
-      switcheroo
+    swayidle
+    emojify
+    smile
 
-      blender
-      davinci-resolve-studio
-      processing
-      zotero
-      fractal
-      handbrake
-      gmic
-      krita
-      krita-plugin-gmic
-      rawtherapee
-      inkscape
+    impression
+    zoom-us
+    nyxt
+    ungoogled-chromium
+    obsidian
+    vlc
+    discord
+    slack
+    signal-desktop-bin
+    libreoffice
+    hyphenDicts.en_US
+    plex-mpv-shim
+    plexamp
 
-      # (kicad.override {
-      #   addons = with pkgs.kicadAddons; [ kikit kikit-library ];
-      # })
+    switcheroo
 
-      turbocase
-      openscad-unstable
-      openscad-lsp
+    blender
+    davinci-resolve-studio
+    processing
+    zotero
+    fractal
+    handbrake
+    gmic
+    krita
+    krita-plugin-gmic
+    rawtherapee
+    inkscape
 
-      picard
-      plugdata
-      pavucontrol
-      qpwgraph
-      clapper
-      ardour
-      oculante
-      halloy
-      paleta
-      wayback
-      protonplus
-      fstl
+    # (kicad.override {
+    #   addons = with pkgs.kicadAddons; [ kikit kikit-library ];
+    # })
 
-      librewolf
+    turbocase
+    openscad-unstable
+    openscad-lsp
 
-      wl-color-picker
+    picard
+    plugdata
+    pavucontrol
+    qpwgraph
+    clapper
+    ardour
+    oculante
+    halloy
+    paleta
+    wayback
+    protonplus
+    fstl
 
-      # screen recording and streaming
-      kooha
-      obs-studio
-      obs-studio-plugins.wlrobs
-      obs-studio-plugins.obs-gstreamer
+    librewolf
 
-      wineWowPackages.stagingFull
-      winetricks
+    wl-color-picker
 
-      virt-manager
+    # screen recording and streaming
+    kooha
+    obs-studio
+    obs-studio-plugins.wlrobs
+    obs-studio-plugins.obs-gstreamer
 
-      gnome-photos
-      gnome-tweaks
-      nautilus
-      nautilus-open-any-terminal
-      turtle
-      gnome-online-accounts
-      gnome-online-accounts-gtk
+    wineWowPackages.stagingFull
+    winetricks
 
-      wordbook
+    virt-manager
 
-      protonup
-      mangohud
-      dualsensectl.out
+    gnome-photos
+    gnome-tweaks
+    nautilus
+    nautilus-open-any-terminal
+    turtle
+    gnome-online-accounts
+    gnome-online-accounts-gtk
 
-      wpaperd
+    wordbook
 
-      zulip
-      revolt-desktop
-    ])
+    protonup
+    mangohud
+    dualsensectl.out
+
+    wpaperd
+
+    # zulip
+    # revolt-desktop
+
+    inputs.xwayland-satellite.packages.x86_64-linux.default
   ];
 
   home.pointerCursor = {
@@ -183,23 +185,23 @@
     };
   };
 
-  # qt = {
-  #   enable = true;
-  #   platformTheme = {
-  #     name = "gtk";
-  #   };
-  #   style = {
-  #     package = pkgs.adwaita-qt;
-  #     name = "adwaita-dark";
-  #   };
-  # };
+  qt = {
+    enable = true;
+    platformTheme = {
+      name = "gtk";
+    };
+    style = {
+      package = pkgs.adwaita-qt;
+      name = "adwaita-dark";
+    };
+  };
 
   dconf.settings = {
     "org/gnome/desktop/interface" = {
       color-scheme = "prefer-dark";
       gtk-theme = lib.mkForce "Colloid-Grey-Dark-Nord";
     };
- };
+  };
 
   fonts = {
     fontconfig = {