1 files changed, 49 insertions, 26 deletions

diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix
index 06c8215..c39f9d2 100644
--- a/nixos/modules/desktop.nix
+++ b/nixos/modules/desktop.nix
@@ -47,6 +47,7 @@ in {
             waybar
             swaybackground
             myswaylock
+            brightnessctl
 
             alacritty
             nautilus
@@ -67,9 +68,9 @@ in {
             resources
 
             isync
+            davmail
             msmtp
             notmuch
-            astroid
             dodo
             taskwarrior3
             gnupg
@@ -79,15 +80,22 @@ in {
               exts.pass-otp
               exts.pass-audit
             ]))
+            ranger
 
             chromium
+            tangram
             ferdium
             signal-desktop
-            libreoffice
             mupdf
             zathura
             pdfgrep
 
+            libreoffice-qt6-fresh
+            hunspell
+            hunspellDicts.en_US-large
+            hunspellDicts.en_GB-large
+            hunspellDicts.cs_CZ
+
             xdg-utils
             xdg-launch
             mesa-demos
@@ -95,8 +103,8 @@ in {
 
             pulsemixer
             mpd
-            mpc-cli
-            ncmpcpp
+            mpc
+            #ncmpcpp
             feh
             shotwell
             id3lib
@@ -141,7 +149,8 @@ in {
             inkscape
             blender
             tenacity
-            #kdePackages.kdenlive
+            kdePackages.kdenlive
+            qrrs
 
             # GStreamer
             gst_all_1.gstreamer
@@ -155,8 +164,7 @@ in {
 
             # Writing
             typst
-            typstfmt
-            typst-live
+            typstyle
             tinymist
             vale
 
@@ -165,6 +173,7 @@ in {
             kicad
             sweethome3d.application
             qelectrotech
+            super-slicer
           ]
           ++ (optionals cnf.laptop [
             # Power management
@@ -179,11 +188,9 @@ in {
         nativeMessagingHosts.packages = with pkgs; [browserpass];
       };
 
-      light.enable = mkIf cnf.laptop true;
-
       nix-ld = {
         enable = true;
-        libraries = with pkgs; [xorg.libXpm];
+        libraries = with pkgs; [libXpm];
       };
 
       usbkey = {
@@ -198,6 +205,13 @@ in {
         enable = true;
         enableSSHSupport = true;
         enableBrowserSocket = true;
+        pinentryPackage = pkgs.writeShellScriptBin "pinentry-auto" ''
+          if [ -n "$WAYLAND_DISPLAY" ] || [ -n "$DISPLAY" ]; then
+            exec ${pkgs.pinentry-gnome3}/bin/pinentry-gnome3 "$@"
+          else
+            exec ${pkgs.pinentry-gnome3}/bin/pinentry-curses "$@"
+          fi
+        '';
       };
 
       kdeconnect.enable = true;
@@ -271,6 +285,7 @@ in {
           cnijfilter2
         ];
       };
+      saned.enable = true;
       avahi.enable = true;
       samba-wsdd = {
         enable = true;
@@ -296,22 +311,30 @@ in {
       allowedUDPPorts = [3702];
     };
 
-    fonts.packages = with pkgs; [
-      nerd-fonts.hack
-      arkpandora_ttf
-      corefonts
-      dejavu_fonts
-      font-awesome
-      freefont_ttf
-      hack-font
-      liberation_ttf
-      libertine
-      noto-fonts
-      noto-fonts-emoji
-      terminus_font_ttf
-      ubuntu_font_family
-      unifont
-    ];
+    fonts = {
+      enableDefaultPackages = true;
+      packages = with pkgs; [
+        arkpandora_ttf
+        corefonts
+        dejavu_fonts
+        fira-code
+        fira-code-symbols
+        fira-math
+        fira-mono
+        fira-sans
+        font-awesome
+        freefont_ttf
+        hack-font
+        liberation_ttf
+        libertine
+        nerd-fonts.hack
+        noto-fonts
+        noto-fonts-color-emoji
+        terminus_font_ttf
+        ubuntu-classic
+        unifont
+      ];
+    };
 
     documentation = {
       enable = true;