diff --git a/flake.lock b/flake.lock index 059734c..aaddb66 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1737299337, - "narHash": "sha256-0NBrY2A7buujKmeCbieopOMSbLxTu8TFcTLqAbTnQDw=", + "lastModified": 1737575492, + "narHash": "sha256-qa/D3NC1JoApnUuLrq1gseBmIxeg6icm/ojPgggMDVQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f8ef4541bb8a54a8b52f19b52912119e689529b3", + "rev": "cefb1889b96ddd1dac3dd4734e894f4cadab7802", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1737162735, - "narHash": "sha256-5T+HkouTMGaRm0rh3kgD4Z1O7ONKfgjyoPQH5rSyreU=", + "lastModified": 1737504076, + "narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "87131f51f8256952d1a306b5521cedc2dc61aa08", + "rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737110817, - "narHash": "sha256-DSenga8XjPaUV5KUFW/i3rNkN7jm9XmguW+qQ1ZJTR4=", + "lastModified": 1737525964, + "narHash": "sha256-3wFonKmNRWKq1himW9N3TllbeGIHFACI5vmLpk6moF8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "041c867bad68dfe34b78b2813028a2e2ea70a23c", + "rev": "5757bbb8bd7c0630a0cc4bb19c47e588db30b97c", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1737316880, - "narHash": "sha256-OXznpCUcWbp5SzpM5kHlyTkQX/t6Tu9BbA83ZNtTn74=", + "lastModified": 1737569578, + "narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "08e9df6c6126655718a197f5f1274d00206d92cb", + "rev": "47addd76727f42d351590c905d9d1905ca895b82", "type": "github" }, "original": { diff --git a/hosts/mba/mac-apps.nix b/hosts/mba/mac-apps.nix index ea72af7..7ebe7b9 100644 --- a/hosts/mba/mac-apps.nix +++ b/hosts/mba/mac-apps.nix @@ -24,10 +24,6 @@ homebrew = { enable = true; - brews = [ - # "mongodb/brew/mongodb-community" - ]; - caskArgs = { appdir = "/Applications"; }; diff --git a/modules/shell.nix b/modules/shell.nix index e1a3439..3156832 100644 --- a/modules/shell.nix +++ b/modules/shell.nix @@ -4,6 +4,7 @@ enable = true; shellAliases = { ls = "lsd"; + lg = "lazygit"; neofetch = "fastfetch"; nv = "nvim"; python = "python3"; diff --git a/modules/zed.nix b/modules/zed.nix index cba9f8f..c919156 100644 --- a/modules/zed.nix +++ b/modules/zed.nix @@ -10,16 +10,34 @@ buffer_font_size = 14; buffer_font_family = "JetBrainsMono Nerd Font"; + ensure_final_newline_on_save = false; + + hard_tabs = true; + languages = { "TypeScript" = { code_actions_on_format = { - source.fixAll.eslint = true; - source.organizeImports = true; + "source.fixAll.eslint" = true; + "source.organizeImports" = true; + }; + codeActionOnSave = { + rules = ["import/order"]; }; formatter = "prettier"; }; }; + lsp = { + }; + + search = { + regex = true; + }; + + show_whitespaces = "boundary"; + + tab_size = 4; + tab_bar = { show_nav_history_buttons = false; };