diff --git a/hosts/common/system/shells/python/default.nix b/hosts/common/system/shells/python/default.nix index d5061bb..0a2e362 100644 --- a/hosts/common/system/shells/python/default.nix +++ b/hosts/common/system/shells/python/default.nix @@ -1,6 +1,16 @@ { pkgs, ... }: pkgs.mkShell { - packages = with pkgs; [ python3 ]; + packages = with pkgs; [ + (python3.withPackages ( + python-pkgs: with python-pkgs; [ + pip + numpy + pandas + python-dotenv + requests + ] + )) + ]; shellHook = '' exec $SHELL diff --git a/hosts/common/user/configs/console/nix-direnv/default.nix b/hosts/common/user/configs/console/nix-direnv/default.nix new file mode 100644 index 0000000..391c194 --- /dev/null +++ b/hosts/common/user/configs/console/nix-direnv/default.nix @@ -0,0 +1,17 @@ +{ + user ? throw "user argument is required", + home ? throw "home argument is required", +}: +{ inputs, ... }: +{ + home-manager.users.${user} = { + programs.direnv = { + enable = true; + silent = true; + nix-direnv.enable = true; + enableZshIntegration = true; + }; + }; + + environment.persistence."/persist"."${home}/.config/direnv/direnv.toml" = { }; +} diff --git a/hosts/common/user/configs/gui/vscode/default.nix b/hosts/common/user/configs/gui/vscode/default.nix index bad89f5..16df14c 100644 --- a/hosts/common/user/configs/gui/vscode/default.nix +++ b/hosts/common/user/configs/gui/vscode/default.nix @@ -35,7 +35,15 @@ in enable = true; mutableExtensionsDir = false; - extensions = with pkgs.vscode-extensions; [ naumovs.color-highlight ]; + + extensions = with pkgs.vscode-extensions; [ + mkhl.direnv + mhutchie.git-graph + ms-azuretools.vscode-docker + ms-vsliveshare.vsliveshare + github.copilot + naumovs.color-highlight + ]; userSettings = { "diffEditor.ignoreTrimWhitespace" = false; @@ -97,6 +105,9 @@ in }; }; - imports = [ ./langs/nix.nix ]; + imports = [ + ./langs/nix + ./langs/python + ]; }; } diff --git a/hosts/common/user/configs/gui/vscode/langs/nix.nix b/hosts/common/user/configs/gui/vscode/langs/nix.nix deleted file mode 100644 index b7dfc72..0000000 --- a/hosts/common/user/configs/gui/vscode/langs/nix.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs, ... }: -{ - programs.vscode = { - userSettings = { - "nix.enableLanguageServer" = true; - "nix.formatterPath" = "nixpkgs-fmt"; - "nix.serverSettings" = { }; - }; - extensions = with pkgs; with vscode-extensions; [ jnoortheen.nix-ide ]; - }; - - home.packages = with pkgs; [ - nil - nixpkgs-fmt - ]; -} diff --git a/hosts/common/user/configs/gui/vscode/langs/nix/default.nix b/hosts/common/user/configs/gui/vscode/langs/nix/default.nix new file mode 100644 index 0000000..fa9ea73 --- /dev/null +++ b/hosts/common/user/configs/gui/vscode/langs/nix/default.nix @@ -0,0 +1,19 @@ +{ lib, pkgs, ... }: +{ + programs.vscode = { + userSettings = { + "nix.enableLanguageServer" = true; + "nix.serverPath" = lib.meta.getExe pkgs.nil; + "nix.serverSettings" = { + nil.formatting.command = [ + (lib.meta.getExe pkgs.nix) + "fmt" + "--" + "--" + ]; + }; + }; + + extensions = with pkgs; with vscode-extensions; [ jnoortheen.nix-ide ]; + }; +} diff --git a/hosts/common/user/configs/gui/vscode/langs/python/default.nix b/hosts/common/user/configs/gui/vscode/langs/python/default.nix new file mode 100644 index 0000000..bc5608c --- /dev/null +++ b/hosts/common/user/configs/gui/vscode/langs/python/default.nix @@ -0,0 +1,15 @@ +{ pkgs, ... }: +{ + programs.vscode.extensions = + with pkgs; + with vscode-extensions; + [ + ms-python.python + ms-python.vscode-pylance + ms-python.debugpy + ms-python.pylint + ms-toolsai.jupyter + ms-toolsai.jupyter-renderers + njpwerner.autodocstring + ]; +} diff --git a/hosts/eirene/users/nick.nix b/hosts/eirene/users/nick.nix index 8770254..17a35ad 100644 --- a/hosts/eirene/users/nick.nix +++ b/hosts/eirene/users/nick.nix @@ -21,6 +21,7 @@ in (import ../../common/user/configs/console/imagemagick { inherit user home; }) (import ../../common/user/configs/console/ncdu { inherit user home; }) (import ../../common/user/configs/console/neovim { inherit user home; }) + (import ../../common/user/configs/console/nix-direnv { inherit user home; }) (import ../../common/user/configs/console/nixpkgs { inherit user home; }) (import ../../common/user/configs/console/pipewire { inherit user home; }) (import ../../common/user/configs/console/ranger { inherit user home; })