diff --git a/flake.lock b/flake.lock index 23a741f..2001c44 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1756496801, - "narHash": "sha256-IYIsnPy+cJxe8RbDHBrCtfJY0ry2bG2H7WvMcewiGS8=", + "lastModified": 1750304462, + "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", "owner": "nix-community", "repo": "home-manager", - "rev": "77a71380c38fb2a440b4b5881bbc839f6230e1cb", + "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", "type": "github" }, "original": { @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1755825449, - "narHash": "sha256-XkiN4NM9Xdy59h69Pc+Vg4PxkSm9EWl6u7k6D5FZ5cM=", + "lastModified": 1750325256, + "narHash": "sha256-vvlxGz/waqJ3TGqM/iqXbnEc7/R1qnEXmaBiPaQ1RE0=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "8df64f819698c1fee0c2969696f54a843b2231e8", + "rev": "0d71cbf88d63e938b37b85b3bf8b238bcf7b39b9", "type": "github" }, "original": { @@ -63,11 +63,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756438964, - "narHash": "sha256-yo473URkISSmBZeIE1o6Mf94VRSn5qFVFS9phb7l6eg=", + "lastModified": 1750215678, + "narHash": "sha256-Rc/ytpamXRf6z8UA2SGa4aaWxUXRbX2MAWIu2C8M+ok=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c73522789a3c7552b1122773d6eaa34e1491cc1c", + "rev": "5395fb3ab3f97b9b7abca147249fa2e8ed27b192", "type": "github" }, "original": { @@ -79,11 +79,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756386758, - "narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=", + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dfb2f12e899db4876308eba6d93455ab7da304cd", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "type": "github" }, "original": { @@ -96,14 +96,15 @@ "nur": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_2", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1756568538, - "narHash": "sha256-nnFpWhG/jtRzI2yJKKgokhefFELHTUw9fgqcTrdX6aM=", + "lastModified": 1750470234, + "narHash": "sha256-D8oigkONATa1o5qNLjxYFJpuWAUN+/R0JmTLkzcNJ8Y=", "owner": "nix-community", "repo": "nur", - "rev": "e8f97acd1ededca7944f1fe1b659b61003131ce2", + "rev": "0c1a4c4ad21271cc1194e6cf3d450e1c2dc5da32", "type": "github" }, "original": { @@ -119,6 +120,27 @@ "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/flake.nix b/flake.nix index 6908110..63506ba 100644 --- a/flake.nix +++ b/flake.nix @@ -78,12 +78,11 @@ in { darwinConfigurations.salarm3max = nix-darwin.lib.darwinSystem { - system = "aarch64-darwin"; + system = "aarc64-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 e8a3dbb..89a2ef0 100644 --- a/home.nix +++ b/home.nix @@ -50,6 +50,7 @@ gnupg go graphviz + harlequin jetbrains-mono jjui jq-lsp @@ -62,6 +63,7 @@ metals multimarkdown mypy + neofetch neovim nerd-fonts.fira-code nil @@ -79,7 +81,6 @@ pngpaste prettyping pyrefly - python3Full python3Packages.huggingface-hub python3Packages.jupyterlab rclone @@ -221,7 +222,7 @@ xdg.configFile."nvim".source = pkgs.fetchFromGitHub { owner = "softinio"; repo = "nvim-config"; - rev = "9a41e9cc3c4f855142a130f945ec31703ac76737"; - sha256 = "sha256-+VWOQMpUF1VdUvBhASvdgPk5h8F3GKDk525opMkwomE="; + rev = "9e390d7b96198ff2525c3ba9ab5ab985e62198df"; + sha256 = "sha256-5o42JAxYkgSkhZbDimqKkoKFFFLuA4hLKFHWtcY0hbk="; }; } diff --git a/programs/default.nix b/programs/default.nix index 97af51d..36307f9 100644 --- a/programs/default.nix +++ b/programs/default.nix @@ -2,7 +2,6 @@ ./aider ./broot ./fish - ./ghostty ./git ./jujutsu ./kitty diff --git a/programs/ghostty/default.nix b/programs/ghostty/default.nix deleted file mode 100644 index bf2778e..0000000 --- a/programs/ghostty/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ 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; - }; -}