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 = { 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")) 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; };