From 41eee47c4abe36aaca9a3a130e83d7cf21fa0cc7 Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Sat, 19 Jul 2025 22:40:28 -0700 Subject: [PATCH 1/4] Add glodal python and update nvim --- home.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/home.nix b/home.nix index 89a2ef0..4757d05 100644 --- a/home.nix +++ b/home.nix @@ -81,6 +81,7 @@ pngpaste prettyping pyrefly + python3Full python3Packages.huggingface-hub python3Packages.jupyterlab rclone @@ -222,7 +223,7 @@ xdg.configFile."nvim".source = pkgs.fetchFromGitHub { owner = "softinio"; repo = "nvim-config"; - rev = "9e390d7b96198ff2525c3ba9ab5ab985e62198df"; - sha256 = "sha256-5o42JAxYkgSkhZbDimqKkoKFFFLuA4hLKFHWtcY0hbk="; + rev = "9a41e9cc3c4f855142a130f945ec31703ac76737"; + sha256 = "sha256-+VWOQMpUF1VdUvBhASvdgPk5h8F3GKDk525opMkwomE="; }; } From be5338f24b41ca6c72c8200af2df17f0b983fab0 Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Sat, 19 Jul 2025 23:02:39 -0700 Subject: [PATCH 2/4] remove harlequin and flake update --- flake.lock | 54 ++++++++++++++++-------------------------------------- home.nix | 1 - 2 files changed, 16 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index 2001c44..7980fb0 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1750304462, - "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", + "lastModified": 1752814804, + "narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=", "owner": "nix-community", "repo": "home-manager", - "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", + "rev": "d0300c8808e41da81d6edfc202f3d3833c157daf", "type": "github" }, "original": { @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1750325256, - "narHash": "sha256-vvlxGz/waqJ3TGqM/iqXbnEc7/R1qnEXmaBiPaQ1RE0=", + "lastModified": 1751313918, + "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "0d71cbf88d63e938b37b85b3bf8b238bcf7b39b9", + "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf", "type": "github" }, "original": { @@ -63,11 +63,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750215678, - "narHash": "sha256-Rc/ytpamXRf6z8UA2SGa4aaWxUXRbX2MAWIu2C8M+ok=", + "lastModified": 1752900028, + "narHash": "sha256-dPALCtmik9Wr14MGqVXm+OQcv7vhPBXcWNIOThGnB/Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5395fb3ab3f97b9b7abca147249fa2e8ed27b192", + "rev": "6b4955211758ba47fac850c040a27f23b9b4008f", "type": "github" }, "original": { @@ -79,11 +79,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750365781, - "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", + "lastModified": 1752687322, + "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", + "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", "type": "github" }, "original": { @@ -96,15 +96,14 @@ "nur": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2", - "treefmt-nix": "treefmt-nix" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1750470234, - "narHash": "sha256-D8oigkONATa1o5qNLjxYFJpuWAUN+/R0JmTLkzcNJ8Y=", + "lastModified": 1752990058, + "narHash": "sha256-lqoPK4dT60sUte+Uh2J2JkW5thFTd7mp/NkHgw9DFUw=", "owner": "nix-community", "repo": "nur", - "rev": "0c1a4c4ad21271cc1194e6cf3d450e1c2dc5da32", + "rev": "cd08fc29df7cd3a3e6b1c3935238649627820b21", "type": "github" }, "original": { @@ -120,27 +119,6 @@ "nixpkgs": "nixpkgs", "nur": "nur" } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", diff --git a/home.nix b/home.nix index 4757d05..501ace7 100644 --- a/home.nix +++ b/home.nix @@ -50,7 +50,6 @@ gnupg go graphviz - harlequin jetbrains-mono jjui jq-lsp From 2dba5a2de18dc0ad66dd44eda8b45d05837524b5 Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Sat, 23 Aug 2025 09:46:43 -0700 Subject: [PATCH 3/4] Flake update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 7980fb0..1fb9c57 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1752814804, - "narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=", + "lastModified": 1755914636, + "narHash": "sha256-VJ+Gm6YsHlPfUCpmRQxvdiZW7H3YPSrdVOewQHAhZN8=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0300c8808e41da81d6edfc202f3d3833c157daf", + "rev": "8b55a6ac58b678199e5bba701aaff69e2b3281c0", "type": "github" }, "original": { @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1751313918, - "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=", + "lastModified": 1755825449, + "narHash": "sha256-XkiN4NM9Xdy59h69Pc+Vg4PxkSm9EWl6u7k6D5FZ5cM=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf", + "rev": "8df64f819698c1fee0c2969696f54a843b2231e8", "type": "github" }, "original": { @@ -63,11 +63,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752900028, - "narHash": "sha256-dPALCtmik9Wr14MGqVXm+OQcv7vhPBXcWNIOThGnB/Q=", + "lastModified": 1755829505, + "narHash": "sha256-4/Jd+LkQ2ssw8luQVkqVs9spDBVE6h/u/hC/tzngsPo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6b4955211758ba47fac850c040a27f23b9b4008f", + "rev": "f937f8ecd1c70efd7e9f90ba13dfb400cf559de4", "type": "github" }, "original": { @@ -79,11 +79,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1752687322, - "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1752990058, - "narHash": "sha256-lqoPK4dT60sUte+Uh2J2JkW5thFTd7mp/NkHgw9DFUw=", + "lastModified": 1755963829, + "narHash": "sha256-2tON0rztjaw0oS8bxrJ/FOgfU9HHYmEK//kkHwl6UIs=", "owner": "nix-community", "repo": "nur", - "rev": "cd08fc29df7cd3a3e6b1c3935238649627820b21", + "rev": "b820a5b8019264f623f3ed36f2153df997020647", "type": "github" }, "original": { From 46163441628281d417ad0acfe2a43a6f2fa4fc9c Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Sat, 30 Aug 2025 11:02:20 -0700 Subject: [PATCH 4/4] flake update and add ghostty --- flake.lock | 24 ++++++++++++------------ flake.nix | 3 ++- home.nix | 1 - programs/default.nix | 1 + programs/ghostty/default.nix | 28 ++++++++++++++++++++++++++++ 5 files changed, 43 insertions(+), 14 deletions(-) create mode 100644 programs/ghostty/default.nix diff --git a/flake.lock b/flake.lock index 1fb9c57..23a741f 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1755914636, - "narHash": "sha256-VJ+Gm6YsHlPfUCpmRQxvdiZW7H3YPSrdVOewQHAhZN8=", + "lastModified": 1756496801, + "narHash": "sha256-IYIsnPy+cJxe8RbDHBrCtfJY0ry2bG2H7WvMcewiGS8=", "owner": "nix-community", "repo": "home-manager", - "rev": "8b55a6ac58b678199e5bba701aaff69e2b3281c0", + "rev": "77a71380c38fb2a440b4b5881bbc839f6230e1cb", "type": "github" }, "original": { @@ -63,11 +63,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755829505, - "narHash": "sha256-4/Jd+LkQ2ssw8luQVkqVs9spDBVE6h/u/hC/tzngsPo=", + "lastModified": 1756438964, + "narHash": "sha256-yo473URkISSmBZeIE1o6Mf94VRSn5qFVFS9phb7l6eg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f937f8ecd1c70efd7e9f90ba13dfb400cf559de4", + "rev": "c73522789a3c7552b1122773d6eaa34e1491cc1c", "type": "github" }, "original": { @@ -79,11 +79,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1756386758, + "narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "dfb2f12e899db4876308eba6d93455ab7da304cd", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1755963829, - "narHash": "sha256-2tON0rztjaw0oS8bxrJ/FOgfU9HHYmEK//kkHwl6UIs=", + "lastModified": 1756568538, + "narHash": "sha256-nnFpWhG/jtRzI2yJKKgokhefFELHTUw9fgqcTrdX6aM=", "owner": "nix-community", "repo": "nur", - "rev": "b820a5b8019264f623f3ed36f2153df997020647", + "rev": "e8f97acd1ededca7944f1fe1b659b61003131ce2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 63506ba..6908110 100644 --- a/flake.nix +++ b/flake.nix @@ -78,11 +78,12 @@ in { darwinConfigurations.salarm3max = nix-darwin.lib.darwinSystem { - system = "aarc64-darwin"; + system = "aarch64-darwin"; modules = [ m3maxConfiguration home-manager.darwinModules.home-manager { + home-manager.backupFileExtension = "backup"; home-manager.useUserPackages = true; home-manager.users.salar = homeManagerConfFor ./home.nix; } diff --git a/home.nix b/home.nix index 501ace7..e8a3dbb 100644 --- a/home.nix +++ b/home.nix @@ -62,7 +62,6 @@ metals multimarkdown mypy - neofetch neovim nerd-fonts.fira-code nil diff --git a/programs/default.nix b/programs/default.nix index 36307f9..97af51d 100644 --- a/programs/default.nix +++ b/programs/default.nix @@ -2,6 +2,7 @@ ./aider ./broot ./fish + ./ghostty ./git ./jujutsu ./kitty diff --git a/programs/ghostty/default.nix b/programs/ghostty/default.nix new file mode 100644 index 0000000..bf2778e --- /dev/null +++ b/programs/ghostty/default.nix @@ -0,0 +1,28 @@ +{ pkgs, ... }: +let + my_settings = { + auto-update = "off"; + copy-on-select = "clipboard"; + font-family = "SF Mono"; + font-size = 16; + macos-titlebar-style = "transparent"; + mouse-hide-while-typing = true; + split-divider-color = "orange"; + theme = "Builtin Tango Dark"; + window-inherit-working-directory = true; + window-save-state = "always"; + working-directory = "home"; + keybind = [ + "shift+enter=text:\n" + ]; + }; +in +{ + programs.ghostty = { + enable = true; + enableFishIntegration = true; + installVimSyntax = true; + package = pkgs.ghostty-bin; + settings = my_settings; + }; +}