swaphb/nix-darwin-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update flake.lock with new versions for Homebrew and other dependencies; modify manage.sh to use sudo for rebuild commands; add gnu-tar and freelens to homebrew apps; set primary user in system configuration

Browse Source
This commit is contained in:
swaphb
2025-07-25 15:43:38 -04:00
parent b8e1e27b88
commit f292f26361
4 changed files with 37 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
flake.lock generated
View File

@@ -3,16 +3,16 @@
"brew-src": {
"flake": false,
"locked": {
"lastModified": 1742457334,
"narHash": "sha256-Gn7ruyb3NDFr+SsHBfA2NsJI8YkkWdECqLRj/xcjt+E=",
"lastModified": 1748658199,
"narHash": "sha256-xmI9Bk8zDWgmvJlPpeHZk9yHCZPG5uxZH9VmdEdWCkU=",
"owner": "Homebrew",
"repo": "brew",
"rev": "f3bd91d3afe086824d24708230e1f0c7f943135a",
"rev": "54c8b127ea2263fbbaf1354e3d8d86025e387ea6",
"type": "github"
},
"original": {
"owner": "Homebrew",
"ref": "4.4.25",
"ref": "4.5.4",
"repo": "brew",
"type": "github"
}
@@ -24,11 +24,11 @@
]
},
"locked": {
"lastModified": 1744223888,
"narHash": "sha256-reYpe0J1J+wH34JFs7KKp0G5nP7+XSQ5z0ZLFJcfJr8=",
"lastModified": 1749038741,
"narHash": "sha256-lD8lB9flJWTeeUcoEsCcwSGSowQUGrsbpj2d1rWxopA=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "79461936709b12e17adb9c91dd02d1c66d577f09",
"rev": "3830a21aa2313239b582e4e4ac97f0b25243cb7a",
"type": "github"
},
"original": {
@@ -56,11 +56,11 @@
"homebrew-bundle": {
"flake": false,
"locked": {
"lastModified": 1742475687,
"narHash": "sha256-GoaP8X0livBYzfb8kRCyf3z61+sXSh6tE5gMZtxjLQA=",
"lastModified": 1745335228,
"narHash": "sha256-TIKR2UgtyUmHLNZp255/vLs+1I10hXe+sciMEbAGFwE=",
"owner": "homebrew",
"repo": "homebrew-bundle",
"rev": "dc4311afc4c34833b288cd4978421803ec2c9ff8",
"rev": "a3265c84b232e13048ecbf6fc18a2eedfadbeb08",
"type": "github"
},
"original": {
@@ -72,11 +72,11 @@
"homebrew-cask": {
"flake": false,
"locked": {
"lastModified": 1744236362,
"narHash": "sha256-eYe52jMTHwcSIzzq2BP2MEYot8sUkxFL1c66iFNAPlI=",
"lastModified": 1749044086,
"narHash": "sha256-1r9PseYgz8HEQrH13O0ug2ztggSReQMUx+764dehlss=",
"owner": "homebrew",
"repo": "homebrew-cask",
"rev": "d9c1a4b97936816ad63b34cc46642e9fbc69d13c",
"rev": "010aab6f4721b21f4fcacc2566462d865d602fc4",
"type": "github"
},
"original": {
@@ -88,11 +88,11 @@
"homebrew-core": {
"flake": false,
"locked": {
"lastModified": 1744243351,
"narHash": "sha256-dXBnP9Ei/3AyMHxercLSck4bR2xtOQ4dv874fEtXzmI=",
"lastModified": 1749045561,
"narHash": "sha256-U26zJ8HEi+mjeUukR1Sn+AWWEax2C53OdLF3gSH1/0c=",
"owner": "homebrew",
"repo": "homebrew-core",
"rev": "021b921b879a2676364115ab2b4a82be5b6954b0",
"rev": "526f3d25ccf53720b84327ef5c7c8d3c1b941e29",
"type": "github"
},
"original": {
@@ -120,11 +120,11 @@
"homebrew-siderolabs": {
"flake": false,
"locked": {
"lastModified": 1744120639,
"narHash": "sha256-+8s+yaOtkpuUl89EIIJ4nuPJuL9q3qBIC21TOWDSOBI=",
"lastModified": 1748520644,
"narHash": "sha256-enVGoYjFQBKtpX923ZmWyAIwOqeZcnVD7gd3jTaNOOE=",
"owner": "siderolabs",
"repo": "homebrew-tap",
"rev": "52c8208478314a9ff57935c710ec249187d4f096",
"rev": "396cc783756fc003cc1451c0dd78c1343f60ac78",
"type": "github"
},
"original": {
@@ -140,29 +140,11 @@
]
},
"locked": {
"lastModified": 1744224272,
"narHash": "sha256-cqePj5nuC7flJWNncaVAFq1YZncU0PSyO0DEqGn+vYc=",
"lastModified": 1749012745,
"narHash": "sha256-Cax/k9ZRPKqTz18vZtmqGR45pHRXM+sDvEVd4V/3NrU=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "113883e37d985d26ecb65282766e5719f2539103",
"type": "github"
},
"original": {
"owner": "LnL7",
"repo": "nix-darwin",
"type": "github"
}
},
"nix-darwin_2": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1716329735,
"narHash": "sha256-ap51w+VqG21vuzyQ04WrhI2YbWHd3UGz0e7dc/QQmoA=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "eac4f25028c1975a939c8f8fba95c12f8a25e01c",
"rev": "fa6120c32f10bd2aac9e8c9a6e71528a9d9d823b",
"type": "github"
},
"original": {
@@ -173,16 +155,14 @@
},
"nix-homebrew": {
"inputs": {
"brew-src": "brew-src",
"nix-darwin": "nix-darwin_2",
"nixpkgs": "nixpkgs_2"
"brew-src": "brew-src"
},
"locked": {
"lastModified": 1742619394,
"narHash": "sha256-8uwIBjbKxeJ7u0VACSNs634HwtgRLxP6/+cIkUXmuyI=",
"lastModified": 1748885738,
"narHash": "sha256-fsOHwWowjhajWL5zsWiN5SdeKPNQa0RD3+sQUoH5VgQ=",
"owner": "zhaofengli-wip",
"repo": "nix-homebrew",
"rev": "04b0536479d2d2e8d71dc8c8ee97c2b61f0c9987",
"rev": "29fe08d458f227200a62e38f5d5eafe625d7fda3",
"type": "github"
},
"original": {
@@ -193,40 +173,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1687274257,
"narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=",
"path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source",
"rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1716330097,
"narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
"lastModified": 1748856973,
"narHash": "sha256-RlTsJUvvr8ErjPBsiwrGbbHYW8XbB/oek0Gi78XdWKg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1744096231,
"narHash": "sha256-kUfx3FKU1Etnua3EaKvpeuXs7zoFiAcli1gBwkPvGSs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b2b0718004cc9a5bca610326de0a82e6ea75920b",
"rev": "e4b09e47ace7d87de083786b404bf232eb6c89d8",
"type": "github"
},
"original": {
@@ -247,7 +198,7 @@
"homebrew-siderolabs": "homebrew-siderolabs",
"nix-darwin": "nix-darwin",
"nix-homebrew": "nix-homebrew",
"nixpkgs": "nixpkgs_3"
"nixpkgs": "nixpkgs"
}
}
},

4
manage.sh
View File

@@ -21,13 +21,13 @@ case $choice in
echo -e "${GREEN}Rebuilding configuration...${NC}"
read -p "Enter hostname (default: swaphb-mba): " hostname
hostname=${hostname:-swaphb-mba}
darwin-rebuild switch --flake .#$hostname
sudo darwin-rebuild switch --flake .#$hostname
;;
2)
echo -e "${GREEN}Updating flakes and rebuilding...${NC}"
read -p "Enter hostname (default: swaphb-mba): " hostname
hostname=${hostname:-swaphb-mba}
nix flake update && darwin-rebuild switch --flake .#$hostname
nix flake update && sudo darwin-rebuild switch --flake .#$hostname
;;
3)
echo -e "${GREEN}Cleaning nix store...${NC}"

2
modules/darwin/apps/homebrew.nix
View File

@@ -12,6 +12,7 @@
"argoproj/homebrew-tap/kubectl-argo-rollouts"
"gh"
"git"
"gnu-tar"
"hauler-dev/homebrew-tap/hauler"
"helm"
"httpie"
@@ -26,6 +27,7 @@
"citrix-workspace"
"cursor"
"elgato-wave-link"
"freelens"
"ghostty"
"httpie"
"joplin"

6
modules/darwin/system/system.nix
View File

@@ -1,6 +1,8 @@
{ config, lib, ... }:
{
system.primaryUser = config._module.args.username;
system.defaults.screencapture = {
location = "~/Documents/Screenshots"; # Set default screenshot location
# Add more screencapture settings here
@@ -22,8 +24,4 @@
system.defaults.WindowManager.EnableStandardClickToShowDesktop = false; # Disable/Enable standard click to show desktop
# You can add more Mac defaults here as well...
system.activationScripts.postUserActivation.text = ''
# Following line should allow us to avoid a logout/login cycle
/System/Library/PrivateFrameworks/SystemAdministration.framework/Resources/activateSettings -u
''; # Activate settings after user activation
}