Merge branch 'main' of https://git.xenia.me.uk/pixelifytica/emacs

init.el

@@ -427,7 +427,7 @@
 (keymap-global-set "C-h K" #'describe-keymap)
 
 (use-package text-mode
-  :hook ((text-mode) . (lambda () (setq fill-column 120)))
+  :hook ((text-mode) . (lambda () (setq fill-column 100)))
   :custom
   (text-mode-ispell-word-completion nil))
 

templates

@@ -1,19 +1,15 @@
 nix-mode
 
-(fhsenv "let" n
+(pyshell "let" n
          > "pkgs = import " (p "<nixpkgs>") " { };" n
-        > "fhs = pkgs.buildFHSUserEnv {" n
-        > "name = \"" (p "env") "\";" n
-        > "targetPkgs = _: [ " q " ];" n
-        > "profile = \"\";" n
-        > "};" n
          "in" n
-        > "fhs.env")
-
-(pyshell "import /etc/nixos/system/home/programming/pyshell.nix rec {" n
-         > "pkgs = import " (p "<nixpkgs>") " { };" n
-         > "python3 = pkgs." (p "python311Full") ";" n
-         > "extraPackages = with pkgs; [ uv poetry pre-commit " q " ];" n
+         "pkgs.mkShell {" n
+         > "packages = with pkgs; [ " (p "python3Full") " uv " q " ];" n
+         > "env.LD_LIBRARY_PATH = with pkgs; lib.makeLibraryPath [stdenv.cc.cc.lib libz];" n
+         > "shellHook = ''" n
+         > "[ ! -d .venv/ ] && python3 -m venv --copies --without-pip --prompt $(basename $(readlink -f .)) .venv" n
+         > "[ -f .venv/bin/activate ] && source .venv/bin/activate && uv pip install pyflakes isort -e ." n
+         > "'';" n
          "}")
 
 python-base-mode