nix update and comment out forcing git protocol for git config
This commit is contained in:
parent
5819915e4e
commit
595e21ea92
4 changed files with 20 additions and 20 deletions
24
flake.lock
24
flake.lock
|
@ -7,11 +7,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1682773107,
|
||||
"narHash": "sha256-+h94XeJnG3uk5imJlBi/1lVmcfCbxHpwZp5u7n3Krwg=",
|
||||
"lastModified": 1686307493,
|
||||
"narHash": "sha256-R4VEFnDn7nRmNxAu1LwNbjns5DPM8IBsvnrWmZ8ymPs=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "379d42fad6bc5c28f79d5f7ff2fa5f1c90cb7bf8",
|
||||
"rev": "7c16d31383a90e0e72ace0c35d2d66a18f90fb4f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -28,11 +28,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1682779989,
|
||||
"narHash": "sha256-H8AjcIBYFYrlRobYJ+n1B+ZJ6TsaaeZpuLn4iRqVvr4=",
|
||||
"lastModified": 1686391840,
|
||||
"narHash": "sha256-5S0APl6Mfm6a37taHwvuf11UHnAX0+PnoWQbsYbMUnc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "3144311f31194b537808ae6848f86f3dbf977d59",
|
||||
"rev": "0144ac418ef633bfc9dbd89b8c199ad3a617c59f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -43,11 +43,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1682692304,
|
||||
"narHash": "sha256-9/lyXN2BpHw+1xE+D2ySBSLMCHWqiWu5tPHBMRDib8M=",
|
||||
"lastModified": 1686412476,
|
||||
"narHash": "sha256-inl9SVk6o5h75XKC79qrDCAobTD1Jxh6kVYTZKHzewA=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "937a9d1ee7b1351d8c55fff6611a8edf6e7c1c37",
|
||||
"rev": "21951114383770f96ae528d0ae68824557768e81",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -59,11 +59,11 @@
|
|||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1682820334,
|
||||
"narHash": "sha256-dE9vVSJZei3fqZDTbDYU35/N7XCpHoEPdS8LBid1tb4=",
|
||||
"lastModified": 1686512756,
|
||||
"narHash": "sha256-tsIkWXV8l4p4h1ABaCd/kb8ywa+l24I2ZIKY1oZQz/g=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nur",
|
||||
"rev": "119de5f27fc96b9dc56406050b764b9a1016a061",
|
||||
"rev": "46c244ec901161db0195ef690b4f8224c565dbbb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
4
home.nix
4
home.nix
|
@ -77,7 +77,6 @@
|
|||
ripgrep
|
||||
ripgrep-all
|
||||
rnix-lsp
|
||||
rust-analyzer
|
||||
rustup
|
||||
sbt
|
||||
scala-cli
|
||||
|
@ -275,6 +274,7 @@
|
|||
'';
|
||||
|
||||
interactiveShellInit = ''
|
||||
set -xg PATH $HOME/bin $HOME/.cargo/bin $PATH
|
||||
eval (direnv hook fish)
|
||||
any-nix-shell fish --info-right | source
|
||||
ssh-add ~/.ssh/id_ed25519 --apple-use-keychain --apple-load-keychain
|
||||
|
@ -330,7 +330,7 @@
|
|||
# Neovim Configuration
|
||||
xdg.configFile."nvim".source = builtins.fetchGit {
|
||||
url = "https://git.softinio.com/nvim-config.git";
|
||||
rev = "3c5cdb2304a76e942cfb126e5ad0c93076626c7a";
|
||||
rev = "bc2b71fa94386902cddf145b556575ab7381f827";
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[
|
||||
./git
|
||||
./tmux
|
||||
# ./wezterm
|
||||
./wezterm
|
||||
]
|
||||
|
|
|
@ -19,11 +19,11 @@ let
|
|||
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\"";
|
||||
prompt = false;
|
||||
};
|
||||
url = {
|
||||
"git@github.com:" = {
|
||||
insteadOf = "https://github.com/";
|
||||
};
|
||||
};
|
||||
# url = {
|
||||
# "git@github.com:" = {
|
||||
# insteadOf = "https://github.com/";
|
||||
# };
|
||||
# };
|
||||
fetch.prune = true;
|
||||
pull = {
|
||||
rebase = true;
|
||||
|
|
Loading…
Reference in a new issue