clo/config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changes

Browse source
This commit is contained in:
Natalie 2024-11-09 18:11:01 -08:00
parent 75e3fc2ec9
commit 98e31513f2
3 changed files with 41 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
flake.nix
View file

@ -13,17 +13,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew";
#
# homebrew-core = {
# url = "github:homebrew/homebrew-core";
# flake = false;
# };
# homebrew-cask = {
# url = "github:homebrew/homebrew-cask";
# flake = false;
# };
hosts = { hosts = {
url = "github:StevenBlack/hosts"; url = "github:StevenBlack/hosts";
#flake = false; #flake = false;
@ -72,9 +61,6 @@
ghostty, ghostty,
nixos-cosmic, nixos-cosmic,
nh_darwin, nh_darwin,
# nix-homebrew,
# homebrew-core,
# homebrew-cask,
... ...
} @ inputs: let } @ inputs: let
overlays = [ overlays = [
@ -114,30 +100,6 @@
"Natalies-MacBook-Air" = darwin.lib.darwinSystem { "Natalies-MacBook-Air" = darwin.lib.darwinSystem {
system = "aarch64-darwin"; system = "aarch64-darwin";
modules = [ modules = [
# nix-homebrew.darwinModules.nix-homebrew
# {
# nix-homebrew = {
# # Install Homebrew under the default prefix
# enable = true;
#
# # Apple Silicon Only: Also install Homebrew under the default Intel prefix for Rosetta 2
# enableRosetta = true;
#
# # User owning the Homebrew prefix
# user = "nmarks";
#
# # Optional: Declarative tap management
# taps = {
# "homebrew/homebrew-core" = homebrew-core;
# "homebrew/homebrew-cask" = homebrew-cask;
# };
#
# # Optional: Enable fully-declarative tap management
# #
# # With mutableTaps disabled, taps can no longer be added imperatively with `brew tap`.
# mutableTaps = false;
# };
# }
# nh_darwin.nixDarwinModules.default # nh_darwin.nixDarwinModules.default
{nixpkgs.overlays = overlays;} {nixpkgs.overlays = overlays;}
./hosts/laptop/configuration.nix ./hosts/laptop/configuration.nix

58
hosts/laptop/configuration.nix
View file

@ -62,32 +62,38 @@
services.tailscale.enable = true; services.tailscale.enable = true;
# Use homebrew to install casks and Mac App Store apps # Use homebrew to install casks and Mac App Store apps
# homebrew = { homebrew = {
# enable = true; enable = true;
#
# onActivation = { onActivation = {
# autoUpdate = true; autoUpdate = true;
# cleanup = "uninstall"; cleanup = "uninstall";
# upgrade = true; upgrade = true;
# }; };
#
# taps = [ # taps = [
# "armcord/armcord" # "legcord/legcord"
# ]; # ];
#
# casks = [ brews = [
# "1password" "imagemagick"
# "firefox" ];
# "obsidian"
# "raycast" casks = [
# "armcord" # "1password"
# "battle-net" # "firefox"
# ]; # "obsidian"
# # "raycast"
# masApps = { # "legcord"
# "wireguard" = 1451685025; "battle-net"
# }; "stremio"
# }; "alt-tab"
];
masApps = {
"wireguard" = 1451685025;
};
};
# set some OSX preferences that I always end up hunting down and changing. # set some OSX preferences that I always end up hunting down and changing.
system.defaults = { system.defaults = {

12
hosts/laptop/home.nix
View file

@ -32,9 +32,14 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
# ghostty.packages.aarch64-darwin.default # ghostty.packages.aarch64-darwin.default
lua51Packages.lua
lua51Packages.luarocks
luajitPackages.magick
ripgrep
lemonade
anki-bin anki-bin
wireguard-tools wireguard-tools
pyright basedpyright
ruff ruff
python312Packages.jedi-language-server python312Packages.jedi-language-server
tor tor
@ -112,8 +117,8 @@
programs.neovim = { programs.neovim = {
viAlias = true; viAlias = true;
vimAlias = true; vimAlias = true;
extraPackages = with pkgs; [ extraLuaPackages = ps: [ps.magick];
]; extraPackages = [pkgs.imagemagick];
}; };
#Link neovim config into nix #Link neovim config into nix
#xdg.configFile.nvim.source = ./nvim; #xdg.configFile.nvim.source = ./nvim;
@ -130,6 +135,7 @@
} }
]; ];
shellAliases = { shellAliases = {
DYLD_FALLBACK_LIBRARY_PATH = "$(brew --prefix)/lib:$DYLD_FALLBACK_LIBRARY_PATH";
}; };
}; };