cupcakearmy/nix-macos
1
0
Fork 0
mirror of https://github.com/cupcakearmy/nix-macos.git synced 2025-09-06 10:50:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: cupcakearmy:b986b3a6c5d6c513227a857b03544bf9bd5de3ef
Branches Tags
cupcakearmy:main cupcakearmy:multi-host
...
compare: cupcakearmy:aaec06be589ce3537f8722b404bc39a898ac4d1f
Branches Tags
cupcakearmy:main cupcakearmy:multi-host

9 Commits
b986b3a6c5 ... aaec06be58

Author SHA1 Message Date
cupcakearmy
aaec06be58 Merge branch 'main' of github.com:cupcakearmy/nix 2025-07-31 11:11:55 +02:00
cupcakearmy
a345a227aa update nix 2025-07-31 11:11:43 +02:00
Nicco
b712b580a9 Merge pull request #3 from ordionary/main 
sync back
 2025-07-31 11:10:38 +02:00
nicco
8d79067cb2 remove zen 2025-07-31 11:10:10 +02:00
Nicco
86e48260f6 Merge branch 'cupcakearmy:main' into main 2025-07-31 10:48:05 +02:00
nicco
3f30b041c7 add ios stuff 2025-07-31 10:45:42 +02:00
nicco
412d5200f2 switch back to vscode 2025-07-31 10:45:32 +02:00
nicco
c4e7214a17 cli tools 2025-07-21 18:01:06 +02:00
nicco
03098ec5d9 add delta for git 2025-07-21 18:01:00 +02:00
6 changed files with 19 additions and 7 deletions
Expand all files Collapse all files

1
cask.nix
View File

@@ -23,6 +23,7 @@
"utm" "utm"
"balenaetcher" "balenaetcher"
"outerbase-studio" "outerbase-studio"
"hoppscotch"
# Base # Base
"obsidian" "obsidian"

2
darwin.nix
View File

@@ -40,7 +40,7 @@
persistent-apps = [ persistent-apps = [
"/Applications/Zen.app" "/Applications/Zen.app"
"/Applications/Ghostty.app" "/Applications/Ghostty.app"
"/Applications/VSCodium.app" "/Applications/Visual Studio Code.app"
"/Applications/Spotify.app" "/Applications/Spotify.app"
"/System/Applications/System Settings.app" "/System/Applications/System Settings.app"
]; ];

6
files/git/gitconfig
View File

@@ -4,9 +4,12 @@
process = git-lfs filter-process process = git-lfs filter-process
required = true required = true
[core] [core]
pager = delta
excludesfile = ~/.gitignore_global excludesfile = ~/.gitignore_global
autocrlf = input autocrlf = input
ignorecase=false ignorecase=false
[interactive]
diffFilter = delta --color-only
[pull] [pull]
rebase = false rebase = false
@@ -27,3 +30,6 @@
[include] [include]
path = ~/.gitconfig.local path = ~/.gitconfig.local
[delta]
navigate = true

12
flake.lock generated
View File

@@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752814804, "lastModified": 1753943136,
"narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=", "narHash": "sha256-eiEE5SabVcIlGSTRcRyBjmJMaYAV95SJnjy8YSsVeW4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d0300c8808e41da81d6edfc202f3d3833c157daf", "rev": "bd82507edd860c453471c46957cbbe3c9fd01b5c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -42,11 +42,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1752900028, "lastModified": 1753844155,
"narHash": "sha256-dPALCtmik9Wr14MGqVXm+OQcv7vhPBXcWNIOThGnB/Q=", "narHash": "sha256-w81jpZeM3AtYlTKIhT05p3IqvJRIHZPyp0Acgb6hXWc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6b4955211758ba47fac850c040a27f23b9b4008f", "rev": "e44b8dc0882d66e2627a8ff252b04a22f4a629fd",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
home/pkgs.nix
View File

@@ -20,6 +20,7 @@ with pkgs;
woff2 woff2
rsync rsync
yq yq
delta
# Rust utils # Rust utils
bat bat

4
hosts/ordio.nix
View File

@@ -15,6 +15,10 @@
pkgs: with pkgs; [ pkgs: with pkgs; [
mkcert mkcert
dnsmasq dnsmasq
awscli2
mysql84
cocoapods
xcodes
]; ];
}; };
} }