From 4b201f5f5ad11ab09ce71034d9354dea2f5fd2a4 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Wed, 14 Sep 2022 11:56:32 +0200 Subject: [PATCH 1/3] Fix my WSL setup --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 44443ba..8ffa334 100644 --- a/flake.nix +++ b/flake.nix @@ -96,7 +96,7 @@ homeConfigurations = { "${custom.username}@co-ws-con4" = home-manager.lib.homeManagerConfiguration { configuration = import "${inputs.self}/home-manager/work-wsl.nix"; - system = "x86_64"; + system = "x86_64-linux"; username = custom.username; homeDirectory = "/home/${custom.username}"; extraSpecialArgs = { From 2e7c5a7a16ceea9682c6bae8b9a587b52ecb99fe Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Thu, 15 Sep 2022 12:17:34 +0200 Subject: [PATCH 2/3] Enable language server --- home-manager/software/emacs/default.nix | 2 ++ home-manager/software/emacs/emacs.d/lib/languageserver.el | 3 +++ home-manager/software/emacs/emacs.d/modules.el | 1 + 3 files changed, 6 insertions(+) create mode 100644 home-manager/software/emacs/emacs.d/lib/languageserver.el diff --git a/home-manager/software/emacs/default.nix b/home-manager/software/emacs/default.nix index d363838..48719f7 100644 --- a/home-manager/software/emacs/default.nix +++ b/home-manager/software/emacs/default.nix @@ -23,6 +23,7 @@ python39Packages.flake8 python39Packages.jedi python39Packages.pip + python39Packages.python-lsp-server python39Packages.yapf epkgs.ace-window epkgs.amx @@ -62,6 +63,7 @@ epkgs.hydra epkgs.know-your-http-well epkgs.languagetool + epkgs.lsp-mode epkgs.lv epkgs.magit epkgs.makey diff --git a/home-manager/software/emacs/emacs.d/lib/languageserver.el b/home-manager/software/emacs/emacs.d/lib/languageserver.el new file mode 100644 index 0000000..d6449f0 --- /dev/null +++ b/home-manager/software/emacs/emacs.d/lib/languageserver.el @@ -0,0 +1,3 @@ +(use-package lsp-mode + :config + (add-hook 'python-mode-hook #'lsp)) diff --git a/home-manager/software/emacs/emacs.d/modules.el b/home-manager/software/emacs/emacs.d/modules.el index 9ab2434..c6f160f 100644 --- a/home-manager/software/emacs/emacs.d/modules.el +++ b/home-manager/software/emacs/emacs.d/modules.el @@ -30,6 +30,7 @@ (load-file (modules-path "direnv.el")) (load-file (modules-path "format_all.el")) (load-file (modules-path "magit.el")) +(load-file (modules-path "languageserver.el")) (load-file (modules-path "powershell.el")) (load-file (modules-path "projectile.el")) (load-file (modules-path "python.el")) From f56f7122971735c55e2a33636039ae73c9ba68fa Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Thu, 15 Sep 2022 15:30:38 +0200 Subject: [PATCH 3/3] show venv in starship --- home-manager/software/starship/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/software/starship/default.nix b/home-manager/software/starship/default.nix index 840b30c..f740508 100644 --- a/home-manager/software/starship/default.nix +++ b/home-manager/software/starship/default.nix @@ -8,6 +8,7 @@ "$hostname" "$directory" "$nix_shell" + "$python" "$git_branch" "$git_status" "$character" @@ -15,6 +16,9 @@ nix_shell = { format = "$symbol"; }; + python = { + format = "[$\{symbol\}($virtualenv) ]($style)"; + }; }; enable = true; };