From 87f3f7d9dffc2836a66f3fdc1baf9a92a781c583 Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Mon, 8 Sep 2025 18:58:04 -0700 Subject: [PATCH 1/4] wezterm and neovim updates --- home.nix | 4 ++-- programs/git/default.nix | 10 +++++----- programs/wezterm/wezterm.lua | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/home.nix b/home.nix index f0ce7eb..0b7d242 100644 --- a/home.nix +++ b/home.nix @@ -222,7 +222,7 @@ xdg.configFile."nvim".source = pkgs.fetchFromGitHub { owner = "softinio"; repo = "nvim-config"; - rev = "9a41e9cc3c4f855142a130f945ec31703ac76737"; - sha256 = "sha256-+VWOQMpUF1VdUvBhASvdgPk5h8F3GKDk525opMkwomE="; + rev = "e89dc85e3a4116796d4393d37c12c31737e6f17c"; + sha256 = "sha256-HCLF7vM4pUbW2OlOuat1isnuyfqfPxjJ4wWYLcNcu0M="; }; } diff --git a/programs/git/default.nix b/programs/git/default.nix index c4a7a87..83b517a 100644 --- a/programs/git/default.nix +++ b/programs/git/default.nix @@ -34,11 +34,11 @@ let pull = { rebase = true; }; - url = { - "git@github.com:" = { - insteadOf = "https://github.com/"; - }; - }; + # url = { + # "git@github.com:" = { + # insteadOf = "https://github.com/"; + # }; + # }; }; myAliases = { ci = "commit"; diff --git a/programs/wezterm/wezterm.lua b/programs/wezterm/wezterm.lua index 58502e1..cf9c394 100644 --- a/programs/wezterm/wezterm.lua +++ b/programs/wezterm/wezterm.lua @@ -19,6 +19,7 @@ return { default_gui_startup_args = { 'connect', 'unix' }, font = wezterm.font_with_fallback { 'JetBrains Mono', 'Noto Sans' }, font_size = 12.0, + freetype_load_flags = 'NO_HINTING', dpi = 144, scrollback_lines = 50000, initial_cols = 400, From ae1c4c491db8cfe482c2918b895d65a8c3045a4a Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Fri, 12 Sep 2025 21:52:37 -0700 Subject: [PATCH 2/4] flake update and re-enable zed --- flake.lock | 30 +++++++++++++++--------------- home.nix | 1 - programs/default.nix | 2 +- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index ceaa74e..7e8b1d6 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1757075491, - "narHash": "sha256-a+NMGl5tcvm+hyfSG2DlVPa8nZLpsumuRj1FfcKb2mQ=", + "lastModified": 1757698511, + "narHash": "sha256-UqHHGydF/q3jfYXCpvYLA0TWtvByOp1NwOKCUjhYmPs=", "owner": "nix-community", "repo": "home-manager", - "rev": "f56bf065f9abedc7bc15e1f2454aa5c8edabaacf", + "rev": "a3fcc92180c7462082cd849498369591dfb20855", "type": "github" }, "original": { @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1757130842, - "narHash": "sha256-4i7KKuXesSZGUv0cLPLfxbmF1S72Gf/3aSypgvVkwuA=", + "lastModified": 1757430124, + "narHash": "sha256-MhDltfXesGH8VkGv3hmJ1QEKl1ChTIj9wmGAFfWj/Wk=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "15f067638e2887c58c4b6ba1bdb65a0b61dc58c5", + "rev": "830b3f0b50045cf0bcfd4dab65fad05bf882e196", "type": "github" }, "original": { @@ -63,11 +63,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756911493, - "narHash": "sha256-6n/n1GZQ/vi+LhFXMSyoseKdNfc2QQaSBXJdgamrbkE=", + "lastModified": 1757686808, + "narHash": "sha256-PL+Z3OrNpFNHddbsBaxeojYkWObYc2NlyhTmsmpt+hc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c6a788f552b7b7af703b1a29802a7233c0067908", + "rev": "098982b6eca9b809cc2f583e733338f5a36b3ad8", "type": "github" }, "original": { @@ -79,11 +79,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756787288, - "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", + "lastModified": 1757487488, + "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", + "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1757175473, - "narHash": "sha256-zi5d9XZMqZwsnEOFn2mgNQTAVp7oifTNtdqAzSsNZbc=", + "lastModified": 1757736493, + "narHash": "sha256-lZ9GQ2ZbRsggjvyXWzVAcxFHT2LGiCergEZRUvtxyH0=", "owner": "nix-community", "repo": "nur", - "rev": "56a58305f2668b2d5519f64eaac93e8d1cef1827", + "rev": "3332e0914da238ef6ec3091cb1dfcae2aac81286", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index 0b7d242..c288088 100644 --- a/home.nix +++ b/home.nix @@ -80,7 +80,6 @@ pngpaste prettyping pyrefly - python3Full python3Packages.huggingface-hub python3Packages.jupyterlab rclone diff --git a/programs/default.nix b/programs/default.nix index c7caf95..97af51d 100644 --- a/programs/default.nix +++ b/programs/default.nix @@ -9,5 +9,5 @@ ./tmux ./wezterm ./vscode - # ./zed + ./zed ] From 8aba8483378a00d64f8ac2d5d7ae22c0097bb3d3 Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Sat, 13 Sep 2025 23:17:15 -0700 Subject: [PATCH 3/4] update fish --- programs/fish/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/fish/default.nix b/programs/fish/default.nix index f311ce6..3c25ce2 100644 --- a/programs/fish/default.nix +++ b/programs/fish/default.nix @@ -46,7 +46,7 @@ fenv source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh end - set -xg PATH /Applications/Ghostty.app/Contents/MacOS $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 $PATH set -xg WORKSPACE /Users/salar/Projects From 9aae0182b302d83e1f6f5f1ffd663be0dad3e414 Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Fri, 19 Sep 2025 18:06:37 -0700 Subject: [PATCH 4/4] flake update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 7e8b1d6..72a9e75 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1757698511, - "narHash": "sha256-UqHHGydF/q3jfYXCpvYLA0TWtvByOp1NwOKCUjhYmPs=", + "lastModified": 1758296614, + "narHash": "sha256-l60D1i0aaSqemy9dL7wP0ePMfcv/oZbeKpvUMY+q0kQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "a3fcc92180c7462082cd849498369591dfb20855", + "rev": "55b1f5b7b191572257545413b98e37abab2fdb00", "type": "github" }, "original": { @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1757430124, - "narHash": "sha256-MhDltfXesGH8VkGv3hmJ1QEKl1ChTIj9wmGAFfWj/Wk=", + "lastModified": 1758102940, + "narHash": "sha256-wwqf3+A8EiqwWpcAaPN20QXJLlpGPpwtLTrzgnngI2o=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "830b3f0b50045cf0bcfd4dab65fad05bf882e196", + "rev": "ebd0bfc11fc2b5cff37401e9b3703881ad5fabbd", "type": "github" }, "original": { @@ -63,11 +63,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757686808, - "narHash": "sha256-PL+Z3OrNpFNHddbsBaxeojYkWObYc2NlyhTmsmpt+hc=", + "lastModified": 1758262103, + "narHash": "sha256-aBGl3XEOsjWw6W3AHiKibN7FeoG73dutQQEqnd/etR8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "098982b6eca9b809cc2f583e733338f5a36b3ad8", + "rev": "12bd230118a1901a4a5d393f9f56b6ad7e571d01", "type": "github" }, "original": { @@ -79,11 +79,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1757487488, - "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", + "lastModified": 1758198701, + "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", + "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1757736493, - "narHash": "sha256-lZ9GQ2ZbRsggjvyXWzVAcxFHT2LGiCergEZRUvtxyH0=", + "lastModified": 1758314668, + "narHash": "sha256-UeSA8UbYgBeeI/r6YRlkwKrBMhnE2ZliSFb7QB7p4zQ=", "owner": "nix-community", "repo": "nur", - "rev": "3332e0914da238ef6ec3091cb1dfcae2aac81286", + "rev": "180ae0f66d4d50d36c01e750bd7c05f49ff8f24b", "type": "github" }, "original": {