genebean/dots
1
0
Fork 0
mirror of https://github.com/genebean/dots.git synced 2026-05-30 23:35:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #640 from genebean/macstuff

Browse source 
macstuff
This commit is contained in:
Gene Liverman 2026-05-22 11:51:28 -04:00 • committed by GitHub
commit 9ee2076a12
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 56 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

80
flake.lock generated
View file

@ -19,16 +19,16 @@
"brew-src": { "brew-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1769363988, "lastModified": 1778427648,
"narHash": "sha256-BiGPeulrDVetXP+tjxhMcGLUROZAtZIhU5m4MqawCfM=", "narHash": "sha256-pt9KaDGsMyYWB9JeHs4XGHs870f1lOZe3vx9LpVIhUE=",
"owner": "Homebrew", "owner": "Homebrew",
"repo": "brew", "repo": "brew",
"rev": "d01011cac6d72032c75fd2cd9489909e95d9faf2", "rev": "6f293daa9f9f5832e13b497976335e90509886d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Homebrew", "owner": "Homebrew",
"ref": "5.0.12", "ref": "5.1.11",
"repo": "brew", "repo": "brew",
"type": "github" "type": "github"
} }
@ -97,11 +97,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773889306, "lastModified": 1779226674,
"narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=", "narHash": "sha256-wuOkjI6pRiN4sEn/EPBRnNW5cmcpvd7xtIM8y5LooAs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "5ad85c82cc52264f4beddc934ba57f3789f28347", "rev": "65fb947964bd44fc0008faf77d1fcb7a9f40bb32",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -207,11 +207,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1772408722, "lastModified": 1778716662,
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -372,11 +372,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1774875830, "lastModified": 1778905220,
"narHash": "sha256-WPYlTmZvVa9dWlAziFkVjBdv1Z6giNIq40O1DxsBmiI=", "narHash": "sha256-ox/5IHc8uwy6UTw6N7Shp6uCHIgu/S2PsWeuXsOHSo8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7afd8cebb99e25a64a745765920e663478eb8830", "rev": "d1686dc7d36cbd1234cb226ad6ef97e882716acb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -395,11 +395,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1773726513, "lastModified": 1778728751,
"narHash": "sha256-0Qxa98QMOrE48quqNmE6vFatfZ94hPUF2CQ2cI8Hkow=", "narHash": "sha256-J8VySL959EhtwSGgxmIjdW3bbLln4HTjHMyZxRTqqGM=",
"owner": "numtide", "owner": "numtide",
"repo": "nix-auth", "repo": "nix-auth",
"rev": "8d0466addaf3318af68d8299a8981bb04a873597", "rev": "7af96c1b01444146ef89844fdca93acbafe7e066",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -431,11 +431,11 @@
}, },
"nix-flatpak": { "nix-flatpak": {
"locked": { "locked": {
"lastModified": 1768656715, "lastModified": 1777402031,
"narHash": "sha256-Sbh037scxKFm7xL0ahgSCw+X2/5ZKeOwI2clqrYr9j4=", "narHash": "sha256-6gkfl9y3+ti0Z6dgby8/R4/DRT8sWU0I0TLCIxwWtjk=",
"owner": "gmodena", "owner": "gmodena",
"repo": "nix-flatpak", "repo": "nix-flatpak",
"rev": "123fe29340a5b8671367055b75a6e7c320d6f89a", "rev": "22a3adbe7c5c8c8a10a635d32c9ef7fc01a6e4b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -449,11 +449,11 @@
"brew-src": "brew-src" "brew-src": "brew-src"
}, },
"locked": { "locked": {
"lastModified": 1769437432, "lastModified": 1778851564,
"narHash": "sha256-8d7KnCpT2LweRvSzZYEGd9IM3eFX+A78opcnDM0+ndk=", "narHash": "sha256-p8wzcnpB2Iys+QzAKM9/Eyw/pUyqCO3sw/NCnDH4dTE=",
"owner": "zhaofengli-wip", "owner": "zhaofengli-wip",
"repo": "nix-homebrew", "repo": "nix-homebrew",
"rev": "a5409abd0d5013d79775d3419bcac10eacb9d8c5", "rev": "b3a87b4793205cc111f3c61e25e018ffac3b8039",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -549,11 +549,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1774933469, "lastModified": 1779258371,
"narHash": "sha256-OrnCQeUO2bqaWUl0lkDWyGWjKsOhtCyd7JSfTedQNUE=", "narHash": "sha256-j1iZsLy6oFApqR1oiDmHhvkwxXqcNi0aoSJj643LuwU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "f4c4c2c0c923d7811ac2a63ccc154767e4195337", "rev": "c97bc4d15bd3473dd095e8e8ba57330ab1943a77",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -581,11 +581,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1772328832, "lastModified": 1777168982,
"narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -596,11 +596,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1778869304, "lastModified": 1779414690,
"narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "narHash": "sha256-gOTcX/9MZVMUE0Xvb4IEcv+0TQJkZFNEnL757ljU360=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "rev": "6dedf69f94d03cbe7bdde106f2d4c23ae2a853bf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -628,11 +628,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1778737229, "lastModified": 1779102034,
"narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=", "narHash": "sha256-vZJZjLo513IeI8hjzHFc6TDezUd4uCE2Eq4SNO3DNNg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5", "rev": "687f05a9184cad4eaf905c48b63649e3a86f5433",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -822,11 +822,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1774910634, "lastModified": 1777944972,
"narHash": "sha256-B+rZDPyktGEjOMt8PcHKYmgmKoF+GaNAFJhguktXAo0=", "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "19bf3d8678fbbfbc173beaa0b5b37d37938db301", "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -876,11 +876,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1773297127, "lastModified": 1775636079,
"narHash": "sha256-6E/yhXP7Oy/NbXtf1ktzmU8SdVqJQ09HC/48ebEGBpk=", "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "71b125cd05fbfd78cab3e070b73544abe24c5016", "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
modules/hosts/darwin/Blue-Rock/default.nix
View file

@ -31,7 +31,6 @@
"google-drive" "google-drive"
"kopiaui" "kopiaui"
"obs" "obs"
"pdk"
"puppet-agent" "puppet-agent"
"puppet-bolt" "puppet-bolt"
"qmk-toolbox" "qmk-toolbox"

4
modules/hosts/darwin/default.nix
View file

@ -21,6 +21,7 @@
bandwhich bandwhich
coreutils coreutils
hugo hugo
mas
nmap nmap
openjdk openjdk
sops sops
@ -31,7 +32,7 @@
homebrew = { homebrew = {
enable = true; enable = true;
onActivation = { onActivation = {
autoUpdate = true; autoUpdate = false; # was true but https://github.com/zhaofengli/nix-homebrew/issues/131
cleanup = "zap"; cleanup = "zap";
upgrade = true; upgrade = true;
}; };
@ -48,7 +49,6 @@
args = [ "with-srt" ]; args = [ "with-srt" ];
} }
#"firefox-profile-switcher-connector" # having had this on seems to mean I need to toggle browser.profiles.enabled to true in about:config for the new built in version #"firefox-profile-switcher-connector" # having had this on seems to mean I need to toggle browser.profiles.enabled to true in about:config for the new built in version
"mas"
"ssh-askpass" "ssh-askpass"
"telnet" "telnet"
]; ];

1
modules/hosts/darwin/home.nix
View file

@ -13,7 +13,6 @@
# Include Puppet's normal bin folder since it is installed via Homebrew # Include Puppet's normal bin folder since it is installed via Homebrew
export PATH=$PATH:/opt/puppetlabs/bin export PATH=$PATH:/opt/puppetlabs/bin
export PATH=$PATH:/opt/puppetlabs/pdk/bin
export PATH=$PATH:/opt/puppetlabs/puppet/bin export PATH=$PATH:/opt/puppetlabs/puppet/bin
# Podman installer pkg for the cli places podman here # Podman installer pkg for the cli places podman here

2
modules/hosts/darwin/mightymac/default.nix
View file

@ -21,7 +21,6 @@
taps = [ taps = [
"hashicorp/tap" "hashicorp/tap"
"openvoxproject/openvox" "openvoxproject/openvox"
"puppetlabs/puppet"
"wouterdebie/repo" "wouterdebie/repo"
]; ];
brews = [ brews = [
@ -49,7 +48,6 @@
"obs" "obs"
"openvox8-agent" "openvox8-agent"
"openvox8-openbolt" "openvox8-openbolt"
"pdk"
"podman-desktop" "podman-desktop"
"qmk-toolbox" "qmk-toolbox"
"raspberry-pi-imager" "raspberry-pi-imager"

14
modules/shared/home/general/default.nix
View file

@ -276,6 +276,20 @@
fi fi
export GPG_TTY=$(tty) export GPG_TTY=$(tty)
# gfr = git fetch rebase and functions on default branch
gfr() {
local default_branch
default_branch=$(git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@^refs/remotes/origin/@@')
if [ -z "$default_branch" ]; then
echo "Error: Default branch not found. Run 'git remote set-head origin -a' first."
return 1
fi
git fetch origin "$default_branch":"$default_branch" && git rebase "$default_branch"
}
function nv() { function nv() {
# Assumes all configs exist in directories named ~/.config/nvim-* # Assumes all configs exist in directories named ~/.config/nvim-*
local config=$(fd --max-depth 1 --glob 'nvim*' ~/.config | fzf --prompt="Neovim Configs > " --height=~50% --layout=reverse --border --exit-0) local config=$(fd --max-depth 1 --glob 'nvim*' ~/.config | fzf --prompt="Neovim Configs > " --height=~50% --layout=reverse --border --exit-0)