softinio/nix-config
softinio/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

flake update & update jujitsu / vscode / fish #6

Merged
softinio merged 1 commit from push-lplpvwynrsom into main 2024-11-26 09:23:20 -08:00
Conversation 0 Commits 1 Files changed 4 +37 -21
4 changed files with 37 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
flake.lock
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731604581, "lastModified": 1732482255,
"narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -27,11 +27,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731642829, "lastModified": 1732420287,
"narHash": "sha256-vG+O2RZRzYZ8BUMNNJ+BLSj6PUoGW7taDQbp6QNJ3Xo=", "narHash": "sha256-CzvYF4x6jUh/+NEEIFrIY5t1W/N3IA2bNZJiMXu9GTo=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "f86f158efd4bab8dce3e207e4621f1df3a760b7a", "rev": "3c52583b99666a349a6219dc1f0dd07d75c82d6a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -42,11 +42,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1731319897, "lastModified": 1732014248,
"narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dc460ec76cbff0e66e269457d7b728432263166c", "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -58,11 +58,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1731730181, "lastModified": 1732591297,
"narHash": "sha256-uCyImsva4NYsRywcT+U6cr+MZrXx/e4Gu8SqTujrCBY=", "narHash": "sha256-OLx52EsEPL1vumyGc49JY4636l+GTKxlL17jA1zVYEw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "295cc9ee333bda9e7d58daae4d1c25fcdef3e5a6", "rev": "f82e8ba200b6b2c6619dfce29c909faaf15387c0",
"type": "github" "type": "github"
}, },
"original": { "original": {

26
home.nix
View file

@ -56,6 +56,7 @@
marksman marksman
marp-cli marp-cli
maven maven
meld
metals metals
multimarkdown multimarkdown
mypy mypy
@ -84,7 +85,6 @@
sbt sbt
scala-cli scala-cli
shellcheck shellcheck
skimpdf
slack slack
slides slides
slumber slumber
@ -190,12 +190,34 @@
programs.jujutsu = { programs.jujutsu = {
enable = true; enable = true;
settings = { settings = {
signing = {
key = "~/.ssh/id_ed25519.pub";
};
user = { user = {
name = "Salar Rahmanian"; name = "Salar Rahmanian";
email = "code@softinio.com"; email = "code@softinio.com";
}; };
ui = { ui = {
diff.format = "git";
diff.tool = [
"delta"
"--color-only"
"--hyperlinks"
"--line-numbers"
"--side-by-side"
"$left"
"$right"
];
editor = "nvim"; editor = "nvim";
merge-editor = [
"meld"
"$left"
"$base"
"$right"
"-o"
"$output"
];
pager = "delta";
}; };
}; };
}; };
@ -224,6 +246,6 @@
# Neovim Configuration # Neovim Configuration
xdg.configFile."nvim".source = builtins.fetchGit { xdg.configFile."nvim".source = builtins.fetchGit {
url = "https://code.softinio.com/softinio/nvim-config"; url = "https://code.softinio.com/softinio/nvim-config";
rev = "b535afb6d9259e0ec18e2e7fda54384b48264746"; rev = "a972cdf4f9067111d67f2f0b5655eede437cdff3";
}; };
} }

4
programs/fish/default.nix
View file

@ -30,9 +30,7 @@
fenv source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh fenv source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
end end
set -xg PATH $HOME/bin $HOME/.cargo/bin $PATH set -xg PATH /Applications/Ghostty.app/Contents/MacOS $HOME/bin $HOME/.cargo/bin /Users/salar/.luarocks/bin:/Users/salar/bin:/Users/salar/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin $PATH
set -xg PATH /Users/salar/.luarocks/bin:/Users/salar/bin:/Users/salar/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin $PATH
set -xg WORKSPACE /Users/salar/Projects set -xg WORKSPACE /Users/salar/Projects

4
programs/vscode/default.nix
View file

@ -60,10 +60,6 @@ let
"githubPullRequests.pullBranch" = "never"; "githubPullRequests.pullBranch" = "never";
"markdown.extension.preview.autoShowPreviewToSide" = true; "markdown.extension.preview.autoShowPreviewToSide" = true;
"notebook.formatOnSave" = 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";