mirror of
https://github.com/cupcakearmy/nix-macos.git
synced 2025-09-06 02:40:39 +00:00
Compare commits
10 Commits
aaec06be58
...
main
Author | SHA1 | Date | |
---|---|---|---|
dde705cf76 | |||
1cb2aa0a04 | |||
|
6946fcb6fe | ||
|
6425ba60eb | ||
|
246ec2c64c | ||
6cf8fc5ef5 | |||
0e9cccf82e | |||
|
8a51c74620 | ||
|
2f0d9a097e | ||
|
f797752d8c |
2
cask.nix
2
cask.nix
@@ -19,7 +19,6 @@
|
||||
"sloth"
|
||||
"vscodium"
|
||||
"visual-studio-code"
|
||||
"bruno"
|
||||
"utm"
|
||||
"balenaetcher"
|
||||
"outerbase-studio"
|
||||
@@ -29,6 +28,7 @@
|
||||
"obsidian"
|
||||
"figma"
|
||||
"zen"
|
||||
"ungoogled-chromium"
|
||||
"bitwarden"
|
||||
"spotify"
|
||||
"slack"
|
||||
|
18
flake.lock
generated
18
flake.lock
generated
@@ -7,11 +7,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1753943136,
|
||||
"narHash": "sha256-eiEE5SabVcIlGSTRcRyBjmJMaYAV95SJnjy8YSsVeW4=",
|
||||
"lastModified": 1756579987,
|
||||
"narHash": "sha256-duCce8zGsaMsrqqOmLOsuaV1PVIw/vXWnKuLKZClsGg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "bd82507edd860c453471c46957cbbe3c9fd01b5c",
|
||||
"rev": "99a69bdf8a3c6bf038c4121e9c4b6e99706a187a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -27,11 +27,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": {
|
||||
@@ -42,11 +42,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1753844155,
|
||||
"narHash": "sha256-w81jpZeM3AtYlTKIhT05p3IqvJRIHZPyp0Acgb6hXWc=",
|
||||
"lastModified": 1756536218,
|
||||
"narHash": "sha256-ynQxPVN2FIPheUgTFhv01gYLbaiSOS7NgWJPm9LF9D0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e44b8dc0882d66e2627a8ff252b04a22f4a629fd",
|
||||
"rev": "a918bb3594dd243c2f8534b3be01b3cb4ed35fd1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@@ -32,6 +32,9 @@
|
||||
flake = self;
|
||||
};
|
||||
modules = [
|
||||
{
|
||||
nixpkgs.overlays = [ (import ./overlay.nix) ];
|
||||
}
|
||||
(import ./darwin.nix)
|
||||
home-manager.darwinModules.home-manager
|
||||
{
|
||||
|
@@ -42,6 +42,7 @@
|
||||
l = "eza -a1lh";
|
||||
ls = "eza";
|
||||
cat = "bat";
|
||||
cd = "z";
|
||||
|
||||
# QOL
|
||||
dc = "docker compose";
|
||||
@@ -54,6 +55,7 @@
|
||||
px = "pnpm -s dlx";
|
||||
n = "fnm use --install-if-missing";
|
||||
c = "pwd | pbcopy";
|
||||
k = "kubectl";
|
||||
|
||||
vai = "sudo darwin-rebuild switch --flake ~/.config/nix-macos#${host.hostName}";
|
||||
};
|
||||
@@ -72,6 +74,9 @@
|
||||
if type -q fnm
|
||||
fnm env --use-on-cd | source
|
||||
end
|
||||
if type -q nvs
|
||||
nvs env --source | source
|
||||
end
|
||||
'';
|
||||
};
|
||||
bash = {
|
||||
|
@@ -41,8 +41,13 @@ with pkgs;
|
||||
colima
|
||||
lazydocker
|
||||
exercism
|
||||
posting
|
||||
terraform
|
||||
k9s
|
||||
kubectl
|
||||
|
||||
# Editor
|
||||
nvs
|
||||
neovim
|
||||
fzf
|
||||
lazygit
|
||||
|
@@ -7,12 +7,9 @@
|
||||
extras = {
|
||||
casks = [
|
||||
"surfshark"
|
||||
"raspberry-pi-imager"
|
||||
"visual-studio-code"
|
||||
"signal"
|
||||
"discord"
|
||||
"vlc"
|
||||
"handbrake"
|
||||
"daisydisk"
|
||||
"blender"
|
||||
"bambu-studio"
|
||||
|
@@ -19,6 +19,15 @@
|
||||
mysql84
|
||||
cocoapods
|
||||
xcodes
|
||||
|
||||
# For projects
|
||||
pixman
|
||||
pkg-config
|
||||
pango
|
||||
libpng
|
||||
giflib
|
||||
librsvg
|
||||
python313Packages.setuptools
|
||||
];
|
||||
};
|
||||
}
|
||||
|
27
overlay.nix
Normal file
27
overlay.nix
Normal file
@@ -0,0 +1,27 @@
|
||||
final: prev: {
|
||||
nvs = prev.buildGoModule rec {
|
||||
pname = "nvs";
|
||||
version = "1.10.5";
|
||||
|
||||
src = prev.fetchFromGitHub {
|
||||
owner = "cupcakearmy";
|
||||
repo = pname;
|
||||
# tag = "v${version}";
|
||||
rev = "1700f2751e969b77b7f7ab3cc16a4e0f3955ce14";
|
||||
sha256 = "sha256-RScXYxkrfLJp1nAgN2YgSRC4mLGK4yXsYjGBrDR00b8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-l2FdnXA+vKVRekcIKt1R+MxppraTsmo0b/B7RNqnxjA=";
|
||||
|
||||
# Completions
|
||||
nativeBuildInputs = [ prev.installShellFiles ];
|
||||
postInstall = ''
|
||||
export HOME=$TMPDIR
|
||||
installShellCompletion --cmd nvs \
|
||||
--bash <($out/bin/nvs completion bash) \
|
||||
--fish <($out/bin/nvs completion fish) \
|
||||
--zsh <($out/bin/nvs completion zsh)
|
||||
'';
|
||||
|
||||
};
|
||||
}
|
Reference in New Issue
Block a user