Compare commits

..

No commits in common. "21e4415d6d7da3fd6e84f22816f419a3f99a982c" and "1dfa3b33b639532138a5831417c48373d65411df" have entirely different histories.

5 changed files with 19 additions and 24 deletions

30
flake.lock generated
View file

@ -28,11 +28,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750304462, "lastModified": 1748668774,
"narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", "narHash": "sha256-fYk/vk4ClmvHIgnGv/5GNRiDLtNCwXo9aLq36L/x+P4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", "rev": "60e4624302d956fe94d3f7d96a560d14d70591b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -48,11 +48,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749873626, "lastModified": 1748352827,
"narHash": "sha256-1Mc/D/1RwwmDKY59f4IpDBgcQttxffm+4o0m67lQ8hc=", "narHash": "sha256-sNUUP6qxGkK9hXgJ+p362dtWLgnIWwOCmiq72LAWtYo=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "2f140d6ac8840c6089163fb43ba95220c230f22b", "rev": "44a7d0e687a87b73facfe94fba78d323a6686a90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -63,11 +63,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1750215678, "lastModified": 1748568828,
"narHash": "sha256-Rc/ytpamXRf6z8UA2SGa4aaWxUXRbX2MAWIu2C8M+ok=", "narHash": "sha256-5O6tAGsPwQyh+0TjqxLRGQ3g0IrF8pTKa8M/W6hwWt0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5395fb3ab3f97b9b7abca147249fa2e8ed27b192", "rev": "6bfd7663660ecf5336c1054e9e877824a4f84954",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -79,11 +79,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1750134718, "lastModified": 1748460289,
"narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -100,11 +100,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1750305956, "lastModified": 1748708306,
"narHash": "sha256-o3Y5v3KmqKOEudWqBKX0utCOMvn/+hbEhWEZklS1Ej0=", "narHash": "sha256-wi+7mfLA0IQBtklOF/OC7Zhh3Riv6MH5zYtATlWDjTQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "45c311c54cf6b948161b056f07b3e66515273315", "rev": "7ef9c6546269642f3a8645bd273388d5761c42da",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -32,7 +32,6 @@
packages = with pkgs; [ packages = with pkgs; [
any-nix-shell any-nix-shell
aspell aspell
ast-grep
basedpyright basedpyright
bash-language-server bash-language-server
cachix cachix
@ -103,7 +102,6 @@
tokei tokei
tree tree
tree-sitter tree-sitter
typst
typescript typescript
typescript-language-server typescript-language-server
wget wget
@ -219,10 +217,8 @@
}; };
# Neovim Configuration # Neovim Configuration
xdg.configFile."nvim".source = pkgs.fetchFromGitHub { xdg.configFile."nvim".source = builtins.fetchGit {
owner = "softinio"; url = "https://code.softinio.com/softinio/nvim-config";
repo = "nvim-config";
rev = "ba28bef49a6ec11692d5bdb4949fc484139c8fa5"; rev = "ba28bef49a6ec11692d5bdb4949fc484139c8fa5";
sha256 = "sha256-0I4yOFbcL9peHvKm8I9LXE2R9i54NvdDO5QJ5oPXTkU=";
}; };
} }

View file

@ -54,7 +54,6 @@
set -xg TOOLCHAINS swift set -xg TOOLCHAINS swift
set -xg DEVELOPER_DIR "/Library/Developer/CommandLineTools"
set -xg OPENAI_API_KEY (cat ~/.openai) set -xg OPENAI_API_KEY (cat ~/.openai)
set -xg ANTHROPIC_API_KEY (cat ~/.anthropic) set -xg ANTHROPIC_API_KEY (cat ~/.anthropic)
''; '';

View file

@ -71,7 +71,6 @@ in
{ {
programs.git = { programs.git = {
enable = true; enable = true;
lfs.enable = true;
userEmail = "code@softinio.com"; userEmail = "code@softinio.com";
userName = "Salar Rahmanian"; userName = "Salar Rahmanian";
aliases = myAliases; aliases = myAliases;

View file

@ -17,7 +17,8 @@ in
key = "~/.ssh/id_ed25519.pub"; key = "~/.ssh/id_ed25519.pub";
}; };
ui = { ui = {
diff-formatter = [ diff.format = "git";
diff.tool = [
"difft" "difft"
"--color=always" "--color=always"
"$left" "$left"