Merge branch 'main' of gitlab.com:marcuskammer/emacs.d into main

bundle/custom_win32_EVG02667NB.el

@@ -69,7 +69,7 @@
    "c:/Users/Marcus.Kammer/AppData/Local/Programs/plantuml/plantuml.jar")
  '(package-selected-packages
    (quote
-    (elpy eglot color-theme-sanityinc-tomorrow ein projectile nov markdown-preview-mode request rust-mode sphinx-frontend sphinx-mode racket-mode geiser slime web-mode js2-mode markdown-mode yaml-mode olivetti use-package nord-theme nordless-theme org toc-org ox-reveal ace-window htmlize ivy magit)))
+    (slime-company elpy eglot color-theme-sanityinc-tomorrow ein projectile nov markdown-preview-mode request rust-mode sphinx-frontend sphinx-mode racket-mode geiser slime web-mode js2-mode markdown-mode yaml-mode olivetti use-package nord-theme nordless-theme org toc-org ox-reveal ace-window htmlize ivy magit)))
  '(python-indent-guess-indent-offset nil)
  '(python-shell-interpreter "ipython")
  '(ring-bell-function (quote ignore))

init.el

@@ -80,6 +80,11 @@ There are two things you can do about this warning:
 (defalias 'yes-or-no-p 'y-or-n-p)
 
 ;; PACKAGES
+(use-package company
+  :ensure t
+  :init
+  (global-company-mode))
+
 (use-package ivy
   :ensure t
   :init
@@ -95,6 +100,9 @@ There are two things you can do about this warning:
   :init
   (projectile-mode +1))
 
+(define-key projectile-mode-map (kbd "s-p") 'projectile-command-map)
+(define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map)
+
 (use-package elpy
   :ensure t)