add jujutsu, vscode updates and flake update

This commit is contained in:
Salar Rahmanian 2024-11-13 22:37:45 -08:00
parent 5c8bf490c2
commit 2889dbcfb8
4 changed files with 62 additions and 13 deletions

View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730837930, "lastModified": 1731535640,
"narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "rev": "35b055009afd0107b69c286fca34d2ad98940d57",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -27,11 +27,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731153869, "lastModified": 1731454423,
"narHash": "sha256-3Ftf9oqOypcEyyrWJ0baVkRpvQqroK/SVBFLvU3nPuc=", "narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "5c74ab862c8070cbf6400128a1b56abb213656da", "rev": "6c71c49e2448e51ad830ed211024e6d0edc50116",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -42,11 +42,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1730785428, "lastModified": 1731139594,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -58,11 +58,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1731177199, "lastModified": 1731561145,
"narHash": "sha256-C99JI1nnLGEG6TWDlHTyxcuPTNNPakIcvUjlkFJA7rk=", "narHash": "sha256-OC9Tx1y7m/vs+i4TnvWfkgAR36z4ax5SV5pygm5roG8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "3f335d1febbcea794cf5104725b4944d0d4b2066", "rev": "079b8eda3a720dce65c8af244fb70bb88675ab5e",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -19,6 +19,7 @@
"vscode-extension-github-copilot" "vscode-extension-github-copilot"
"vscode-extension-github-copilot-chat" "vscode-extension-github-copilot-chat"
"vscode-extension-MS-python-vscode-pylance" "vscode-extension-MS-python-vscode-pylance"
"vscode-extension-visualjj-visualjj"
"zoom" "zoom"
]; ];
@ -49,6 +50,7 @@
go go
graphviz graphviz
jq-lsp jq-lsp
lazyjj
luajit luajit
lua-language-server lua-language-server
marksman marksman
@ -185,6 +187,19 @@
enable = true; enable = true;
}; };
programs.jujutsu = {
enable = true;
settings = {
user = {
name = "Salar Rahmanian";
email = "code@softinio.com";
};
ui = {
editor = "nvim";
};
};
};
programs.lazygit = { programs.lazygit = {
enable = true; enable = true;
}; };

View file

@ -42,6 +42,7 @@
''; '';
interactiveShellInit = '' interactiveShellInit = ''
jj util completion fish | source
eval (direnv hook fish) eval (direnv hook fish)
any-nix-shell fish --info-right | source any-nix-shell fish --info-right | source
''; '';

View file

@ -4,6 +4,7 @@ let
myExtensions = with pkgs.vscode-extensions; [ myExtensions = with pkgs.vscode-extensions; [
asvetliakov.vscode-neovim asvetliakov.vscode-neovim
baccata.scaladex-search baccata.scaladex-search
charliermarsh.ruff
davidanson.vscode-markdownlint davidanson.vscode-markdownlint
enkia.tokyo-night enkia.tokyo-night
github.copilot github.copilot
@ -16,8 +17,14 @@ let
marp-team.marp-vscode marp-team.marp-vscode
mechatroner.rainbow-csv mechatroner.rainbow-csv
mkhl.direnv mkhl.direnv
ms-python.debugpy
ms-python.python ms-python.python
ms-python.vscode-pylance 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-vscode.makefile-tools
ms-toolsai.jupyter ms-toolsai.jupyter
redhat.java redhat.java
@ -30,6 +37,7 @@ let
timonwong.shellcheck timonwong.shellcheck
usernamehw.errorlens usernamehw.errorlens
visualstudioexptteam.vscodeintellicode visualstudioexptteam.vscodeintellicode
visualjj.visualjj
vscode-icons-team.vscode-icons vscode-icons-team.vscode-icons
vscjava.vscode-java-pack vscjava.vscode-java-pack
xyz.local-history xyz.local-history
@ -43,18 +51,43 @@ let
"extensions.experimental.affinity" = { "extensions.experimental.affinity" = {
"asvetliakov.vscode-neovim" = 1; "asvetliakov.vscode-neovim" = 1;
}; };
"extensions.ignoreRecommendations" = true;
"files.autoSave" = "afterDelay"; "files.autoSave" = "afterDelay";
"git.autoSave" = "afterDelay"; "git.confirmSync" = true;
"git.rebaseWhenSync" = true; "git.rebaseWhenSync" = true;
"github.gitProtocol" = "ssh"; "github.gitProtocol" = "ssh";
"githubPullRequests.notifications" = "pullRequests"; "githubPullRequests.notifications" = "pullRequests";
"githubPullRequests.pullBranch" = "never"; "githubPullRequests.pullBranch" = "never";
"markdown.extension.preview.autoShowPreviewToSide" = true; "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 ) # Install paste image manually as not in nix ( https://marketplace.visualstudio.com/items?itemName=mushan.vscode-paste-image )
"pasteImage.insertPattern" = "![[\${imageFileName}]]"; "pasteImage.insertPattern" = "![[\${imageFileName}]]";
"pasteImage.path" = "\${projectRoot}/Attachments"; "pasteImage.path" = "\${projectRoot}/Attachments";
"python.analysis.extraPaths" = [ "src" ]; "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"; "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"; "window.openFoldersInNewWindow" = "on";
"workbench.colorTheme" = "Tokyo Night"; "workbench.colorTheme" = "Tokyo Night";
"workbench.iconTheme" = "vscode-icons"; "workbench.iconTheme" = "vscode-icons";