From ccaca2cbe12ff40b7232491497785b024a350c4c Mon Sep 17 00:00:00 2001
From: marc <marc@sastre.cat>
Date: Sun, 4 Dec 2022 19:31:30 +0100
Subject: [PATCH] Config changes

---
 config/doom/config.el                         | 11 +++----
 data/devenv/devenv.sh                         | 17 +++++++----
 .../templates/{python => python39}/flake.nix  | 20 +++++++++----
 modules/editors/emacs.nix                     | 29 -------------------
 4 files changed, 32 insertions(+), 45 deletions(-)
 rename data/devenv/templates/{python => python39}/flake.nix (59%)

diff --git a/config/doom/config.el b/config/doom/config.el
index 50a8196..241f170 100644
--- a/config/doom/config.el
+++ b/config/doom/config.el
@@ -136,12 +136,13 @@
 (load! "modules/prettify-utils.el")
 
 (pretty-hook python-mode
-  ;; ("def" "𝙛")
+  ("def" "")
   ;; ("class" "𝙘")
-  '("None" "∅")
-  '("lambda" "λ")
-  '("not in" "∉")
-  '("in" "∈"))
+  ("None" "∅")
+  ("lambda" "λ")
+  ("not in" "∉")
+  ("in" "∈"))
+  
   
 
 (pretty-hook emacs-lisp-mode)
diff --git a/data/devenv/devenv.sh b/data/devenv/devenv.sh
index 556d71b..b6df0d5 100644
--- a/data/devenv/devenv.sh
+++ b/data/devenv/devenv.sh
@@ -13,15 +13,16 @@ check_template () {
     if [ -z "$TEMPLATE" ]; then
         echo "No template given"
         list_templates
-        exit 1
+        return 1
     elif [ ! -e "$TEMPLATES_DIR/$TEMPLATE" ]; then
         echo "The given template '$TEMPLATE' doesn't exist!"
         list_templates
-        exit 1
+        return 1
     fi
 }
 
 devenv_install() {
+    TEMPLATE=$1
     install -m 644 $TEMPLATES_DIR/$TEMPLATE/* ./
     echo "use flake . --impure" > .envrc
     direnv allow
@@ -29,22 +30,26 @@ devenv_install() {
 
 devenv_init() {
     TEMPLATE=$1
-    check_template $TEMPLATE
-    devenv_install
+    if ! check_template $TEMPLATE ; then
+        return 1
+    fi
+    devenv_install $TEMPLATE
 }
 
 devenv_sandbox() {
     DIRECTORY=$1
     if [ -z "$DIRECTORY" ]; then
         show_help_sandbox
-        exit 1
+        return 1
     fi
     SANDBOX_DIR="$SANDBOXES_DIR/$DIRECTORY"
     TEMPLATE=$2
     if [ -z "$TEMPLATE" ]; then
         TEMPLATE=$DIRECTORY
     fi
-    check_template $TEMPLATE
+    if ! check_template $TEMPLATE; then
+        return 1
+    fi
     if [ ! -e $SANDBOX_DIR ]; then
         echo "Creating sandbox at $SANDBOX_DIR with template $TEMPLATE"
         mkdir -p $SANDBOX_DIR
diff --git a/data/devenv/templates/python/flake.nix b/data/devenv/templates/python39/flake.nix
similarity index 59%
rename from data/devenv/templates/python/flake.nix
rename to data/devenv/templates/python39/flake.nix
index 429be23..2e21e2b 100644
--- a/data/devenv/templates/python/flake.nix
+++ b/data/devenv/templates/python39/flake.nix
@@ -8,7 +8,10 @@
 
       pkgs = nixpkgs.legacyPackages.${system};
 
-      projectDependencies = with pkgs; [
+      python = pkgs.python39;
+      pythonPackages = pkgs.python39Packages;
+
+      projectDependencies = with pythonPackages; [
       ];
 
     in {
@@ -16,12 +19,19 @@
         nativeBuildInputs = [ pkgs.bashInteractive ];
         buildInputs = with pkgs; [
           # Core python dependencies
-          python39
-          python39Packages.pip
-          python39Packages.virtualenv
+          python
+          pythonPackages.pip
+          pythonPackages.virtualenv
+          # IDE tools
+          pythonPackages.isort
+          nodePackages.pyright
           # Development tools
-          python39Packages.ipython
+          black
+          pythonPackages.ipython
+          pythonPackages.pytest
+          pythonPackages.setuptools
         ] ++ projectDependencies;
+
       };
     });
 }
diff --git a/modules/editors/emacs.nix b/modules/editors/emacs.nix
index 83f87d1..18ad43c 100644
--- a/modules/editors/emacs.nix
+++ b/modules/editors/emacs.nix
@@ -41,33 +41,6 @@ in {
       libtool
       cmake
 
-      # # :lang cc
-      # ccls
-      # cmake
-      # gcc
-      # glslang
-      # # :lang haskell
-      # stack
-      # haskellPackages.ghcide
-      # haskellPackages.hoogle
-      # # :lang latex && :lang org (latex preview)
-      # (texlive.combine { inherit (texlive) scheme-full; })
-      # # biber
-      # # :lang nix
-      # nixfmt
-      # # :lang python
-      # black
-      # python3
-      # python3Packages.isort
-      # # python3Packages.python-language-server
-      # python3Packages.pytest
-      # python3Packages.setuptools
-      # nodePackages.pyright
-      # # :tools lookup & :lang org +roam
-      # sqlite
-      # # :tools direnv
-      # direnv
-
       # Fonts
       emacs-all-the-icons-fonts
       # fira-code
@@ -119,8 +92,6 @@ in {
     system.userActivationScripts = {
       installDoomEmacs = ''
         EMACS_FOLDER="$HOME/.config/emacs"
-        echo $XDG_CONFIG_HOME
-        echo $EMACS_FOLDER
         if [ ! -d "$EMACS_FOLDER" ]; then
           ${pkgs.git}/bin/git clone --depth=1 --single-branch "https://github.com/doomemacs/doomemacs" "$EMACS_FOLDER"
         fi