summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian T <julian@jtle.dk>2021-12-08 14:49:34 +0100
committerJulian T <julian@jtle.dk>2021-12-08 14:49:34 +0100
commit4624a239a936d7bc584c3a36dd9561a8642df749 (patch)
treed651bc307c0b7e0fe772da6916924717a4ede795
parent53a34fa0d72e0a65dfc1b74897c699aae9dfc4ea (diff)
Kakoune changes, and fixes for new nix release
-rw-r--r--kakoune/.config/kak/kakrc6
-rw-r--r--nixhome/.config/nixpkgs/overlays/pythonEnv.nix6
2 files changed, 8 insertions, 4 deletions
diff --git a/kakoune/.config/kak/kakrc b/kakoune/.config/kak/kakrc
index 67e8483..0393024 100644
--- a/kakoune/.config/kak/kakrc
+++ b/kakoune/.config/kak/kakrc
@@ -1,18 +1,20 @@
# Lsp stuff
eval %sh{kak-lsp --kakoune -s %kak_session}
+
lsp-enable
map global user l %{: enter-user-mode lsp<ret>} -docstring "LSP mode"
# lsp-auto-hover-enable
# General stuff
-colorscheme gruvbox
+colorscheme gruvbox-dark
-hook global InsertChar \t %{ exec -draft -itersel h@ }
+# hook global InsertChar \t %{ exec -draft -itersel h@ }
set global tabstop 4
set global indentwidth 4
map global insert <c-w> '<a-;><a-/>\S+\s*<ret><a-;>d'
+map global insert <tab> '.<a-;>><backspace>'
add-highlighter global/matching show-matching
set-face global MatchingChar blue+b
diff --git a/nixhome/.config/nixpkgs/overlays/pythonEnv.nix b/nixhome/.config/nixpkgs/overlays/pythonEnv.nix
index 947caba..1acf14d 100644
--- a/nixhome/.config/nixpkgs/overlays/pythonEnv.nix
+++ b/nixhome/.config/nixpkgs/overlays/pythonEnv.nix
@@ -2,11 +2,13 @@ self: super: {
defaultPythonEnv = super.buildEnv {
name = "defaultPythonEnv";
paths = [
- (self.python38.withPackages (
+ (self.python39.withPackages (
ps: with ps; [
- ipython python-language-server pep8
+ ipython pep8
jupyterlab jupyter-c-kernel
+ python-lsp-server
+
# Math stuff
numpy scipy matplotlib