From 2889dbcfb825877d2185fc39cc634f3c43a13332 Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Wed, 13 Nov 2024 22:37:45 -0800 Subject: [PATCH] add jujutsu, vscode updates and flake update --- flake.lock | 24 ++++++++++++------------ home.nix | 15 +++++++++++++++ programs/fish/default.nix | 1 + programs/vscode/default.nix | 35 ++++++++++++++++++++++++++++++++++- 4 files changed, 62 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index dbf65dd..6140534 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1730837930, - "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", + "lastModified": 1731535640, + "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", + "rev": "35b055009afd0107b69c286fca34d2ad98940d57", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1731153869, - "narHash": "sha256-3Ftf9oqOypcEyyrWJ0baVkRpvQqroK/SVBFLvU3nPuc=", + "lastModified": 1731454423, + "narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "5c74ab862c8070cbf6400128a1b56abb213656da", + "rev": "6c71c49e2448e51ad830ed211024e6d0edc50116", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "nur": { "locked": { - "lastModified": 1731177199, - "narHash": "sha256-C99JI1nnLGEG6TWDlHTyxcuPTNNPakIcvUjlkFJA7rk=", + "lastModified": 1731561145, + "narHash": "sha256-OC9Tx1y7m/vs+i4TnvWfkgAR36z4ax5SV5pygm5roG8=", "owner": "nix-community", "repo": "nur", - "rev": "3f335d1febbcea794cf5104725b4944d0d4b2066", + "rev": "079b8eda3a720dce65c8af244fb70bb88675ab5e", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index 2284b87..1c60660 100644 --- a/home.nix +++ b/home.nix @@ -19,6 +19,7 @@ "vscode-extension-github-copilot" "vscode-extension-github-copilot-chat" "vscode-extension-MS-python-vscode-pylance" + "vscode-extension-visualjj-visualjj" "zoom" ]; @@ -49,6 +50,7 @@ go graphviz jq-lsp + lazyjj luajit lua-language-server marksman @@ -185,6 +187,19 @@ enable = true; }; + programs.jujutsu = { + enable = true; + settings = { + user = { + name = "Salar Rahmanian"; + email = "code@softinio.com"; + }; + ui = { + editor = "nvim"; + }; + }; + }; + programs.lazygit = { enable = true; }; diff --git a/programs/fish/default.nix b/programs/fish/default.nix index 7954ec7..e9ba0fa 100644 --- a/programs/fish/default.nix +++ b/programs/fish/default.nix @@ -42,6 +42,7 @@ ''; interactiveShellInit = '' + jj util completion fish | source eval (direnv hook fish) any-nix-shell fish --info-right | source ''; diff --git a/programs/vscode/default.nix b/programs/vscode/default.nix index 923ba01..55f4a97 100644 --- a/programs/vscode/default.nix +++ b/programs/vscode/default.nix @@ -4,6 +4,7 @@ let myExtensions = with pkgs.vscode-extensions; [ asvetliakov.vscode-neovim baccata.scaladex-search + charliermarsh.ruff davidanson.vscode-markdownlint enkia.tokyo-night github.copilot @@ -16,8 +17,14 @@ let marp-team.marp-vscode mechatroner.rainbow-csv mkhl.direnv + ms-python.debugpy ms-python.python ms-python.vscode-pylance + ms-toolsai.jupyter + ms-toolsai.jupyter-keymap + ms-toolsai.jupyter-renderers + ms-toolsai.vscode-jupyter-cell-tags + ms-toolsai.vscode-jupyter-slideshow ms-vscode.makefile-tools ms-toolsai.jupyter redhat.java @@ -30,6 +37,7 @@ let timonwong.shellcheck usernamehw.errorlens visualstudioexptteam.vscodeintellicode + visualjj.visualjj vscode-icons-team.vscode-icons vscjava.vscode-java-pack xyz.local-history @@ -43,18 +51,43 @@ let "extensions.experimental.affinity" = { "asvetliakov.vscode-neovim" = 1; }; + "extensions.ignoreRecommendations" = true; "files.autoSave" = "afterDelay"; - "git.autoSave" = "afterDelay"; + "git.confirmSync" = true; "git.rebaseWhenSync" = true; "github.gitProtocol" = "ssh"; "githubPullRequests.notifications" = "pullRequests"; "githubPullRequests.pullBranch" = "never"; "markdown.extension.preview.autoShowPreviewToSide" = true; + "notebook.formatOnSave" = true; + "notebook.codeActionsOnSave" = { + "notebook.source.fixAll" = true; + "notebook.source.organizeImports" = true; + }; # Install paste image manually as not in nix ( https://marketplace.visualstudio.com/items?itemName=mushan.vscode-paste-image ) "pasteImage.insertPattern" = "![[\${imageFileName}]]"; "pasteImage.path" = "\${projectRoot}/Attachments"; "python.analysis.extraPaths" = [ "src" ]; + "python.analysis.autoFormatStrings" = true; + "python.analysis.autoImportCompletions" = true; + "python.analysis.completeFunctionParens" = true; + "python.analysis.inlayHints.pytestParameters" = true; + "python.analysis.typeCheckingMode" = "strict"; + "python.testing.pytestEnabled" = true; + "[python]" = { + "editor.defaultFormatter" = "charliermarsh.ruff"; + "editor.formatOnSave" = true; + "editor.codeActionsOnSave" = { + "source.fixAll" = true; + "source.organizeImports" = true; + }; + }; "telemetry.telemetryLevel" = "off"; + "terminal.integrated.defaultProfile.osx" = "fish"; + "terminal.integrated.fontFamily" = "SF Mono"; + "terminal.integrated.fontSize" = 13; + "update.mode" = "none"; + "vsicons.dontShowNewVersionMessage" = true; "window.openFoldersInNewWindow" = "on"; "workbench.colorTheme" = "Tokyo Night"; "workbench.iconTheme" = "vscode-icons";