From e9f5463f26b6e15e6651480c6420a631f7ea49f1 Mon Sep 17 00:00:00 2001
From: Taryel Hlontsi <tahln@vestas.com>
Date: Mon, 22 Apr 2024 18:41:54 +0200
Subject: [PATCH] Update snippets for Python, remove pyenv-mode

---
 init.el                     | 35 ++++++++++++++++++-----------------
 snippets/python-mode/script | 10 +++++++++-
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/init.el b/init.el
index 2f60f88..cbee428 100644
--- a/init.el
+++ b/init.el
@@ -7,7 +7,7 @@
    '("b99e334a4019a2caa71e1d6445fc346c6f074a05fcbb989800ecbe54474ae1b0" default))
  '(initial-frame-alist '((fullscreen . maximized)))
  '(package-selected-packages
-   '(zig-mode treesit ef-themes dockerfile-mode dap-mode julia-ts-mode lsp-julia julia-mode marginalia vertico tide which-key use-package pyenv-mode flycheck exec-path-from-shell elpy doom-themes doom-modeline all-the-icons)))
+   '(docker-compose-mode zig-mode treesit ef-themes dockerfile-mode dap-mode julia-ts-mode lsp-julia julia-mode marginalia vertico tide which-key use-package pyenv-mode flycheck exec-path-from-shell elpy doom-themes doom-modeline all-the-icons)))
 
 (require 'package)
 (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
@@ -31,9 +31,18 @@
 
 (require 'treesit)
 
+(use-package docker-compose-mode
+  :ensure t)
+
 (use-package zig-mode
   :ensure t)
 
+(use-package dockerfile-mode
+  :ensure t)
+
+(use-package flycheck
+  :ensure t)
+
 (use-package dired
   :config
   (put 'dired-find-alternate-file 'disabled nil)
@@ -79,6 +88,8 @@
 
 (add-hook 'before-save-hook 'whitespace-cleanup)
 
+(add-hook 'prog-mode-hook 'flycheck-mode)
+
 (setq-default frame-title-format
               '(:eval
                 (format "%s"
@@ -90,9 +101,6 @@
 (use-package elpy
              :ensure t)
 
-(use-package flycheck
-            :ensure t)
-
 (use-package exec-path-from-shell
              :ensure t)
 
@@ -112,11 +120,6 @@
 (add-hook 'python-mode-hook
           (lambda () (setq gud-pdb-command-name "python3 -m pdb")))
 
-(use-package pyenv-mode
-             :ensure t)
-
-(pyenv-mode)
-
 (use-package yasnippet
   :config
   (setq yas-snippet-dirs '("~/.emacs.d/snippets"))
@@ -215,7 +218,7 @@
 
 (defcustom display-line-numbers-exempt-modes
   '(gud-mode inferior-python-mode dired-mode vterm-mode eshell-mode shell-mode term-mode ansi-tern-mode treemacs-mode)
-  "Major modes on which to disable line numbers"
+  "Major modes on which to disable line numbers."
   :group 'display-line-numbers
   :type 'list
   :version "green")
@@ -330,23 +333,21 @@ ef-themes-variable-pitch-ui t)
   (local-set-key [f7] 'lsp-find-implementation)
   (local-set-key [f2] 'lsp-rename))
 
+(add-hook 'lsp-mode-hook
+          (lambda () (setup-lsp-keys)))
+
 (defun setup-dotnet ()
   (interactive)
   (exec-path-from-shell-copy-env "DOTNET_ROOT")
   (lsp-deferred))
 
+(add-to-list 'auto-mode-alist '("\\.csproj\\'" . xml-mode))
+
 (add-hook 'csharp-mode-hook
           (lambda () (setup-dotnet)))
 
-(add-hook 'lsp-mode-hook
-          (lambda () (setup-lsp-keys)))
-
 (require 'dap-netcore)
 
-(use-package dockerfile-mode
-  :ensure t)
-
-
 (defun find-project-root ()
   (interactive)
   (if (ignore-errors (eproject-root))
diff --git a/snippets/python-mode/script b/snippets/python-mode/script
index 10259b7..5c9d25d 100644
--- a/snippets/python-mode/script
+++ b/snippets/python-mode/script
@@ -2,4 +2,12 @@
 # name: script
 # key: s
 # --
-#!/usr/bin/env python3
\ No newline at end of file
+#!/usr/bin/env python3
+
+
+def main():
+    pass$0
+
+
+if __name__ == "__main__":
+    main()
\ No newline at end of file