diff --git a/modules/emacs.nix b/modules/emacs.nix
new file mode 100644
index 0000000..490b5fc
--- /dev/null
+++ b/modules/emacs.nix
@@ -0,0 +1,126 @@
+{ pkgs, lib, config, ... }:
+
+with lib;
+{
+  services.emacs = {
+    enable = true;
+    package = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages 
+      (epkgs: with epkgs; [
+        vterm
+        magit
+        pdf-tools
+        consult-eglot
+        org
+        org-roam
+        command-log-mode
+        all-the-icons
+        doom-modeline
+        doom-themes
+        rainbow-delimiters
+        smartparens
+        aggressive-indent
+        adaptive-wrap
+        which-key
+        exec-path-from-shell
+        no-littering
+        tree-sitter
+        tree-sitter-langs
+        rustic
+        evil
+        evil-collection
+        general
+        evil-escape
+        evil-surround
+        evil-org
+        org-super-agenda
+        websocket
+        org-roam-ui
+        org-present
+        org-modern
+        org-re-reveal
+        org-re-reveal-ref
+        org-re-reveal-citeproc
+        ox-reveal
+        oer-reveal
+        ox-spectacle
+        unicode-fonts
+        emojify
+        undo-tree
+        visual-fill-column
+        toc-org
+        pulsar
+        vertico
+        consult
+        marginalia
+        all-the-icons-completion
+        embark
+        embark-consult
+        corfu
+        orderless
+        cape
+        devdocs
+        yasnippet
+        tempel
+        projectile
+        simple-httpd
+        avy
+        evil-avy
+        ace-link
+        ace-window
+        helpful
+        format-all
+        web-mode
+        lua-mode
+        nix-mode
+        cmake-mode
+        fennel-mode
+        yaml-mode
+        docker
+        docker-tramp
+        fish-mode
+        markdown-mode
+        qml-mode
+        csv-mode
+        restclient
+        ob-restclient
+        dart-mode
+        flutter
+        hover
+        direnv
+        all-the-icons-dired
+        dired-single
+        dired-rainbow
+        diredfl
+        dired-rsync
+        fd-dired
+        ledger-mode
+        org-msg
+        calfw
+        calfw-org
+        calfw-ical
+        org-caldav
+        org-wild-notifier
+        magit
+        sly
+        nov
+        elfeed
+        elfeed-org
+        bongo
+        emms
+        transmission
+        hass
+        pass
+        password-store
+        password-store-otp
+        plz
+        ement
+        mastodon
+        qrencode
+        gcmh
+        use-package
+        esh-autosuggest
+        pkgs.mu
+      ]));
+    defaultEditor = true;
+  };
+}
diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix
index f543769..0d14054 100644
--- a/pkgs/desktop-packages.nix
+++ b/pkgs/desktop-packages.nix
@@ -98,6 +98,7 @@ with lib;
     spotdl
     kdenlive
     minetest
+    pqiv
     # natron
     digikam
     rubberband
diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix
index f57dd37..5b77f78 100644
--- a/system/kaladin/configuration.nix
+++ b/system/kaladin/configuration.nix
@@ -6,6 +6,7 @@
       ./hardware-configuration.nix
       ../../pkgs/base-packages.nix
       ../../pkgs/desktop-packages.nix
+      ../../modules/emacs.nix
     ];
 
   nix = {
@@ -273,127 +274,6 @@
   #   )
   # ];
 
-  services.emacs = {
-    enable = true;
-    package = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages 
-      (epkgs: with epkgs; [
-        vterm
-        magit
-        pdf-tools
-        consult-eglot
-        org
-        org-roam
-        command-log-mode
-        all-the-icons
-        doom-modeline
-        doom-themes
-        rainbow-delimiters
-        smartparens
-        aggressive-indent
-        adaptive-wrap
-        which-key
-        exec-path-from-shell
-        no-littering
-        tree-sitter
-        tree-sitter-langs
-        rustic
-        evil
-        evil-collection
-        general
-        evil-escape
-        evil-surround
-        evil-org
-        org-super-agenda
-        websocket
-        org-roam-ui
-        org-present
-        org-modern
-        org-re-reveal
-        org-re-reveal-ref
-        org-re-reveal-citeproc
-        ox-reveal
-        oer-reveal
-        ox-spectacle
-        unicode-fonts
-        emojify
-        undo-tree
-        visual-fill-column
-        toc-org
-        pulsar
-        vertico
-        consult
-        marginalia
-        all-the-icons-completion
-        embark
-        embark-consult
-        corfu
-        orderless
-        cape
-        devdocs
-        yasnippet
-        tempel
-        projectile
-        simple-httpd
-        avy
-        evil-avy
-        ace-link
-        ace-window
-        helpful
-        format-all
-        web-mode
-        lua-mode
-        nix-mode
-        cmake-mode
-        fennel-mode
-        yaml-mode
-        docker
-        docker-tramp
-        fish-mode
-        markdown-mode
-        qml-mode
-        csv-mode
-        restclient
-        ob-restclient
-        dart-mode
-        flutter
-        hover
-        direnv
-        all-the-icons-dired
-        dired-single
-        dired-rainbow
-        diredfl
-        dired-rsync
-        fd-dired
-        ledger-mode
-        org-msg
-        calfw
-        calfw-org
-        calfw-ical
-        org-caldav
-        org-wild-notifier
-        magit
-        sly
-        nov
-        elfeed
-        elfeed-org
-        bongo
-        emms
-        transmission
-        hass
-        pass
-        password-store
-        password-store-otp
-        plz
-        ement
-        mastodon
-        qrencode
-        gcmh
-        use-package
-        esh-autosuggest
-        pkgs.mu
-      ]));
-    defaultEditor = true;
-  };
   services.samba-wsdd.enable = true;
   services.samba = {
     enable = true;