diff --git a/flake.lock b/flake.lock index 01bdc08..9d58ee2 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1750304462, - "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", + "lastModified": 1748668774, + "narHash": "sha256-fYk/vk4ClmvHIgnGv/5GNRiDLtNCwXo9aLq36L/x+P4=", "owner": "nix-community", "repo": "home-manager", - "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", + "rev": "60e4624302d956fe94d3f7d96a560d14d70591b9", "type": "github" }, "original": { @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1749873626, - "narHash": "sha256-1Mc/D/1RwwmDKY59f4IpDBgcQttxffm+4o0m67lQ8hc=", + "lastModified": 1748352827, + "narHash": "sha256-sNUUP6qxGkK9hXgJ+p362dtWLgnIWwOCmiq72LAWtYo=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "2f140d6ac8840c6089163fb43ba95220c230f22b", + "rev": "44a7d0e687a87b73facfe94fba78d323a6686a90", "type": "github" }, "original": { @@ -63,11 +63,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750215678, - "narHash": "sha256-Rc/ytpamXRf6z8UA2SGa4aaWxUXRbX2MAWIu2C8M+ok=", + "lastModified": 1748568828, + "narHash": "sha256-5O6tAGsPwQyh+0TjqxLRGQ3g0IrF8pTKa8M/W6hwWt0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5395fb3ab3f97b9b7abca147249fa2e8ed27b192", + "rev": "6bfd7663660ecf5336c1054e9e877824a4f84954", "type": "github" }, "original": { @@ -79,11 +79,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "type": "github" }, "original": { @@ -100,11 +100,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1750305956, - "narHash": "sha256-o3Y5v3KmqKOEudWqBKX0utCOMvn/+hbEhWEZklS1Ej0=", + "lastModified": 1748708306, + "narHash": "sha256-wi+7mfLA0IQBtklOF/OC7Zhh3Riv6MH5zYtATlWDjTQ=", "owner": "nix-community", "repo": "nur", - "rev": "45c311c54cf6b948161b056f07b3e66515273315", + "rev": "7ef9c6546269642f3a8645bd273388d5761c42da", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index 3e77c96..b42ca39 100644 --- a/home.nix +++ b/home.nix @@ -32,7 +32,6 @@ packages = with pkgs; [ any-nix-shell aspell - ast-grep basedpyright bash-language-server cachix @@ -103,7 +102,6 @@ tokei tree tree-sitter - typst typescript typescript-language-server wget @@ -219,10 +217,8 @@ }; # Neovim Configuration - xdg.configFile."nvim".source = pkgs.fetchFromGitHub { - owner = "softinio"; - repo = "nvim-config"; + xdg.configFile."nvim".source = builtins.fetchGit { + url = "https://code.softinio.com/softinio/nvim-config"; rev = "ba28bef49a6ec11692d5bdb4949fc484139c8fa5"; - sha256 = "sha256-0I4yOFbcL9peHvKm8I9LXE2R9i54NvdDO5QJ5oPXTkU="; }; } diff --git a/programs/fish/default.nix b/programs/fish/default.nix index f311ce6..39f56c3 100644 --- a/programs/fish/default.nix +++ b/programs/fish/default.nix @@ -54,7 +54,6 @@ set -xg TOOLCHAINS swift - set -xg DEVELOPER_DIR "/Library/Developer/CommandLineTools" set -xg OPENAI_API_KEY (cat ~/.openai) set -xg ANTHROPIC_API_KEY (cat ~/.anthropic) ''; diff --git a/programs/git/default.nix b/programs/git/default.nix index c4a7a87..1cc8c45 100644 --- a/programs/git/default.nix +++ b/programs/git/default.nix @@ -71,7 +71,6 @@ in { programs.git = { enable = true; - lfs.enable = true; userEmail = "code@softinio.com"; userName = "Salar Rahmanian"; aliases = myAliases; diff --git a/programs/jujutsu/default.nix b/programs/jujutsu/default.nix index 6f4a9c8..18f6a01 100644 --- a/programs/jujutsu/default.nix +++ b/programs/jujutsu/default.nix @@ -17,7 +17,8 @@ in key = "~/.ssh/id_ed25519.pub"; }; ui = { - diff-formatter = [ + diff.format = "git"; + diff.tool = [ "difft" "--color=always" "$left"