diff --git a/bundle/bundle--package.el b/bundle/bundle--package.el
index e979d009..3bfe8061 100644
--- a/bundle/bundle--package.el
+++ b/bundle/bundle--package.el
@@ -37,11 +37,12 @@
   :init (auto-insert-mode 1)
   :config
   (setq auto-insert-query nil)
-  (let ((new-templates '((("\\.sh\\'" . "Shell script header") nil "#!/bin/bash\n# -*- mode: shell-script; coding: utf-8; -*-\n")
-                         (("\\.js\\'" . "JavaScript header") nil "#!/usr/bin/env node\n// -*- mode: js; coding: utf-8; -*-\n")
-                         (("\\.css\\'" . "CSS header") nil "/* -*- mode: css; coding: utf-8; -*-\n * Dependencies: none\n */\n")
-                         (("\\.html\\'" . "HTML header") nil "<!-- -*- mode: web; coding: utf-8; -*- -->\n")
-                         (("\\.lisp\\'" . "Lisp header") nil ";;;; -*- mode: common-lisp; coding: utf-8; -*-\n"))))
+  (let ((new-templates
+         '((("\\.sh\\'" . "Shell script header") nil "#!/bin/bash\n# -*- mode: shell-script; coding: utf-8; -*-\n")
+           (("\\.js\\'" . "JavaScript header") nil "#!/usr/bin/env node\n// -*- mode: js; coding: utf-8; -*-\n")
+           (("\\.css\\'" . "CSS header") nil "/* -*- mode: css; coding: utf-8; -*-\n * Dependencies: none\n */\n")
+           (("\\.html\\'" . "HTML header") nil "<!-- -*- mode: web; coding: utf-8; -*- -->\n")
+           (("\\.lisp\\'" . "Lisp header") nil ";;;; -*- mode: common-lisp; coding: utf-8; -*-\n"))))
     (setq auto-insert-alist (nconc new-templates auto-insert-alist))))
 
 (use-package tramp
@@ -143,10 +144,8 @@
       (add-to-list 'eglot-server-programs '((c++-mode c-mode) "clangd"))
     (add-to-list 'eglot-server-programs '((c++-mode c-mode) "ccls"))))
 
+
 (use-package sql
-  :if (or (and (eq system-type 'windows-nt)
-               (file-directory-p "C:/Program Files/PostgreSQL/16/bin/psql.exe"))
-          (eq system-type 'gnu/linux))
   :config
   (setq sql-connection-alist
         '((finance-db
@@ -307,9 +306,9 @@
 ;;   :hook (typescript-mode . eglot-ensure)
 ;;   :config (setq typescript-indent-level 2))
 
-(use-package spotify
-  :if (eq system-type 'gnu/linux)
-  :bind ("S-<pause>" . spotify-playpause))
+(when (eq system-type 'gnu/linux)
+  (use-package spotify
+    :bind ("S-<pause>" . spotify-playpause)))
 
 (use-package mastodon
   :defer t