softinio/nix-config
1
0
Fork 0
mirror of https://github.com/softinio/nix-config.git synced 2025-10-18 19:16:41 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

use intellij as git mergetool, update tmux theme

Browse source
This commit is contained in:
Salar Rahmanian 2025-10-04 15:19:46 -07:00
parent 91aa2d907a
commit 57313eb0d8
4 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
home.nix
View file

@ -63,7 +63,6 @@
marksman marksman
marp-cli marp-cli
maven maven
meld
metals metals
multimarkdown multimarkdown
mypy mypy

2
programs/fish/default.nix
View file

@ -46,7 +46,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 $HOME/.npm-global/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 $HOME/bin $HOME/.cargo/bin $HOME/.npm-global/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 "/Applications/IntelliJ IDEA.app/Contents/MacOS" $PATH
set -xg WORKSPACE /Users/salar/Projects set -xg WORKSPACE /Users/salar/Projects

8
programs/jujutsu/default.nix
View file

@ -4,7 +4,7 @@ let
l = [ l = [
"log" "log"
"-r" "-r"
"(main..@):: | (main..@)-" "(main@origin..@):: | (main@origin..@)-"
]; ];
}; };
in in
@ -17,6 +17,7 @@ in
key = "~/.ssh/id_ed25519.pub"; key = "~/.ssh/id_ed25519.pub";
}; };
ui = { ui = {
default-command = "log";
diff-formatter = [ diff-formatter = [
"difft" "difft"
"--color=always" "--color=always"
@ -25,11 +26,10 @@ in
]; ];
editor = "nvim"; editor = "nvim";
merge-editor = [ merge-editor = [
"meld" "idea"
"$left" "$left"
"$base"
"$right" "$right"
"-o" "$base"
"$output" "$output"
]; ];
pager = "less -FRX"; pager = "less -FRX";

2
programs/tmux/default.nix
View file

@ -15,8 +15,8 @@ in
extraConfig = tmuxConfig; extraConfig = tmuxConfig;
plugins = with pkgs.tmuxPlugins; [ plugins = with pkgs.tmuxPlugins; [
sensible sensible
tokyo-night-tmux
yank yank
kanagawa
{ {
plugin = tokyo-night-tmux; plugin = tokyo-night-tmux;
extraConfig = '' extraConfig = ''