changes
3 files changed, 41 insertions(+), 67 deletions(-)
- flake.nix
hosts
flake.nix-38
| ... | @@ -13,17 +13,6 @@ | ... | @@ -13,17 +13,6 @@ |
| 13 | inputs.nixpkgs.follows = "nixpkgs"; | 13 | inputs.nixpkgs.follows = "nixpkgs"; |
| 14 | }; | 14 | }; |
| 15 | 15 | ||
| 16 | # nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew"; | ||
| 17 | # | ||
| 18 | # homebrew-core = { | ||
| 19 | # url = "github:homebrew/homebrew-core"; | ||
| 20 | # flake = false; | ||
| 21 | # }; | ||
| 22 | # homebrew-cask = { | ||
| 23 | # url = "github:homebrew/homebrew-cask"; | ||
| 24 | # flake = false; | ||
| 25 | # }; | ||
| 26 | |||
| 27 | hosts = { | 16 | hosts = { |
| 28 | url = "github:StevenBlack/hosts"; | 17 | url = "github:StevenBlack/hosts"; |
| 29 | #flake = false; | 18 | #flake = false; |
| ... | @@ -72,9 +61,6 @@ | ... | @@ -72,9 +61,6 @@ |
| 72 | ghostty, | 61 | ghostty, |
| 73 | nixos-cosmic, | 62 | nixos-cosmic, |
| 74 | nh_darwin, | 63 | nh_darwin, |
| 75 | # nix-homebrew, | ||
| 76 | # homebrew-core, | ||
| 77 | # homebrew-cask, | ||
| 78 | ... | 64 | ... |
| 79 | } @ inputs: let | 65 | } @ inputs: let |
| 80 | overlays = [ | 66 | overlays = [ |
| ... | @@ -114,30 +100,6 @@ | ... | @@ -114,30 +100,6 @@ |
| 114 | "Natalies-MacBook-Air" = darwin.lib.darwinSystem { | 100 | "Natalies-MacBook-Air" = darwin.lib.darwinSystem { |
| 115 | system = "aarch64-darwin"; | 101 | system = "aarch64-darwin"; |
| 116 | modules = [ | 102 | modules = [ |
| 117 | # nix-homebrew.darwinModules.nix-homebrew | ||
| 118 | # { | ||
| 119 | # nix-homebrew = { | ||
| 120 | # # Install Homebrew under the default prefix | ||
| 121 | # enable = true; | ||
| 122 | # | ||
| 123 | # # Apple Silicon Only: Also install Homebrew under the default Intel prefix for Rosetta 2 | ||
| 124 | # enableRosetta = true; | ||
| 125 | # | ||
| 126 | # # User owning the Homebrew prefix | ||
| 127 | # user = "nmarks"; | ||
| 128 | # | ||
| 129 | # # Optional: Declarative tap management | ||
| 130 | # taps = { | ||
| 131 | # "homebrew/homebrew-core" = homebrew-core; | ||
| 132 | # "homebrew/homebrew-cask" = homebrew-cask; | ||
| 133 | # }; | ||
| 134 | # | ||
| 135 | # # Optional: Enable fully-declarative tap management | ||
| 136 | # # | ||
| 137 | # # With mutableTaps disabled, taps can no longer be added imperatively with `brew tap`. | ||
| 138 | # mutableTaps = false; | ||
| 139 | # }; | ||
| 140 | # } | ||
| 141 | # nh_darwin.nixDarwinModules.default | 103 | # nh_darwin.nixDarwinModules.default |
| 142 | {nixpkgs.overlays = overlays;} | 104 | {nixpkgs.overlays = overlays;} |
| 143 | ./hosts/laptop/configuration.nix | 105 | ./hosts/laptop/configuration.nix |
hosts/laptop/configuration.nix+32-26
| ... | @@ -62,32 +62,38 @@ | ... | @@ -62,32 +62,38 @@ |
| 62 | services.tailscale.enable = true; | 62 | services.tailscale.enable = true; |
| 63 | 63 | ||
| 64 | # Use homebrew to install casks and Mac App Store apps | 64 | # Use homebrew to install casks and Mac App Store apps |
| 65 | # homebrew = { | 65 | homebrew = { |
| 66 | # enable = true; | 66 | enable = true; |
| 67 | # | 67 | |
| 68 | # onActivation = { | 68 | onActivation = { |
| 69 | # autoUpdate = true; | 69 | autoUpdate = true; |
| 70 | # cleanup = "uninstall"; | 70 | cleanup = "uninstall"; |
| 71 | # upgrade = true; | 71 | upgrade = true; |
| 72 | # }; | 72 | }; |
| 73 | # | 73 | |
| 74 | # taps = [ | 74 | # taps = [ |
| 75 | # "armcord/armcord" | 75 | # "legcord/legcord" |
| 76 | # ]; | 76 | # ]; |
| 77 | # | 77 | |
| 78 | # casks = [ | 78 | brews = [ |
| 79 | # "1password" | 79 | "imagemagick" |
| 80 | # "firefox" | 80 | ]; |
| 81 | # "obsidian" | 81 | |
| 82 | # "raycast" | 82 | casks = [ |
| 83 | # "armcord" | 83 | # "1password" |
| 84 | # "battle-net" | 84 | # "firefox" |
| 85 | # ]; | 85 | # "obsidian" |
| 86 | # | 86 | # "raycast" |
| 87 | # masApps = { | 87 | # "legcord" |
| 88 | # "wireguard" = 1451685025; | 88 | "battle-net" |
| 89 | # }; | 89 | "stremio" |
| 90 | # }; | 90 | "alt-tab" |
| 91 | ]; | ||
| 92 | |||
| 93 | masApps = { | ||
| 94 | "wireguard" = 1451685025; | ||
| 95 | }; | ||
| 96 | }; | ||
| 91 | 97 | ||
| 92 | # set some OSX preferences that I always end up hunting down and changing. | 98 | # set some OSX preferences that I always end up hunting down and changing. |
| 93 | system.defaults = { | 99 | system.defaults = { |
hosts/laptop/home.nix+9-3
| ... | @@ -32,9 +32,14 @@ | ... | @@ -32,9 +32,14 @@ |
| 32 | 32 | ||
| 33 | home.packages = with pkgs; [ | 33 | home.packages = with pkgs; [ |
| 34 | # ghostty.packages.aarch64-darwin.default | 34 | # ghostty.packages.aarch64-darwin.default |
| 35 | lua51Packages.lua | ||
| 36 | lua51Packages.luarocks | ||
| 37 | luajitPackages.magick | ||
| 38 | ripgrep | ||
| 39 | lemonade | ||
| 35 | anki-bin | 40 | anki-bin |
| 36 | wireguard-tools | 41 | wireguard-tools |
| 37 | pyright | 42 | basedpyright |
| 38 | ruff | 43 | ruff |
| 39 | python312Packages.jedi-language-server | 44 | python312Packages.jedi-language-server |
| 40 | tor | 45 | tor |
| ... | @@ -112,8 +117,8 @@ | ... | @@ -112,8 +117,8 @@ |
| 112 | programs.neovim = { | 117 | programs.neovim = { |
| 113 | viAlias = true; | 118 | viAlias = true; |
| 114 | vimAlias = true; | 119 | vimAlias = true; |
| 115 | extraPackages = with pkgs; [ | 120 | extraLuaPackages = ps: [ps.magick]; |
| 116 | ]; | 121 | extraPackages = [pkgs.imagemagick]; |
| 117 | }; | 122 | }; |
| 118 | #Link neovim config into nix | 123 | #Link neovim config into nix |
| 119 | #xdg.configFile.nvim.source = ./nvim; | 124 | #xdg.configFile.nvim.source = ./nvim; |
| ... | @@ -130,6 +135,7 @@ | ... | @@ -130,6 +135,7 @@ |
| 130 | } | 135 | } |
| 131 | ]; | 136 | ]; |
| 132 | shellAliases = { | 137 | shellAliases = { |
| 138 | DYLD_FALLBACK_LIBRARY_PATH = "$(brew --prefix)/lib:$DYLD_FALLBACK_LIBRARY_PATH"; | ||
| 133 | }; | 139 | }; |
| 134 | }; | 140 | }; |
| 135 | 141 |