diff --git a/flake.lock b/flake.lock index 3727ee4..b2b0ce5 100644 --- a/flake.lock +++ b/flake.lock @@ -19,16 +19,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1778427648, - "narHash": "sha256-pt9KaDGsMyYWB9JeHs4XGHs870f1lOZe3vx9LpVIhUE=", + "lastModified": 1769363988, + "narHash": "sha256-BiGPeulrDVetXP+tjxhMcGLUROZAtZIhU5m4MqawCfM=", "owner": "Homebrew", "repo": "brew", - "rev": "6f293daa9f9f5832e13b497976335e90509886d7", + "rev": "d01011cac6d72032c75fd2cd9489909e95d9faf2", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "5.1.11", + "ref": "5.0.12", "repo": "brew", "type": "github" } @@ -97,11 +97,11 @@ ] }, "locked": { - "lastModified": 1779226674, - "narHash": "sha256-wuOkjI6pRiN4sEn/EPBRnNW5cmcpvd7xtIM8y5LooAs=", + "lastModified": 1773889306, + "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=", "owner": "nix-community", "repo": "disko", - "rev": "65fb947964bd44fc0008faf77d1fcb7a9f40bb32", + "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347", "type": "github" }, "original": { @@ -207,11 +207,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "type": "github" }, "original": { @@ -372,11 +372,11 @@ ] }, "locked": { - "lastModified": 1778905220, - "narHash": "sha256-ox/5IHc8uwy6UTw6N7Shp6uCHIgu/S2PsWeuXsOHSo8=", + "lastModified": 1774875830, + "narHash": "sha256-WPYlTmZvVa9dWlAziFkVjBdv1Z6giNIq40O1DxsBmiI=", "owner": "nix-community", "repo": "home-manager", - "rev": "d1686dc7d36cbd1234cb226ad6ef97e882716acb", + "rev": "7afd8cebb99e25a64a745765920e663478eb8830", "type": "github" }, "original": { @@ -395,11 +395,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1778728751, - "narHash": "sha256-J8VySL959EhtwSGgxmIjdW3bbLln4HTjHMyZxRTqqGM=", + "lastModified": 1773726513, + "narHash": "sha256-0Qxa98QMOrE48quqNmE6vFatfZ94hPUF2CQ2cI8Hkow=", "owner": "numtide", "repo": "nix-auth", - "rev": "7af96c1b01444146ef89844fdca93acbafe7e066", + "rev": "8d0466addaf3318af68d8299a8981bb04a873597", "type": "github" }, "original": { @@ -431,11 +431,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1777402031, - "narHash": "sha256-6gkfl9y3+ti0Z6dgby8/R4/DRT8sWU0I0TLCIxwWtjk=", + "lastModified": 1768656715, + "narHash": "sha256-Sbh037scxKFm7xL0ahgSCw+X2/5ZKeOwI2clqrYr9j4=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "22a3adbe7c5c8c8a10a635d32c9ef7fc01a6e4b8", + "rev": "123fe29340a5b8671367055b75a6e7c320d6f89a", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "brew-src": "brew-src" }, "locked": { - "lastModified": 1778851564, - "narHash": "sha256-p8wzcnpB2Iys+QzAKM9/Eyw/pUyqCO3sw/NCnDH4dTE=", + "lastModified": 1769437432, + "narHash": "sha256-8d7KnCpT2LweRvSzZYEGd9IM3eFX+A78opcnDM0+ndk=", "owner": "zhaofengli-wip", "repo": "nix-homebrew", - "rev": "b3a87b4793205cc111f3c61e25e018ffac3b8039", + "rev": "a5409abd0d5013d79775d3419bcac10eacb9d8c5", "type": "github" }, "original": { @@ -549,11 +549,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1779258371, - "narHash": "sha256-j1iZsLy6oFApqR1oiDmHhvkwxXqcNi0aoSJj643LuwU=", + "lastModified": 1774933469, + "narHash": "sha256-OrnCQeUO2bqaWUl0lkDWyGWjKsOhtCyd7JSfTedQNUE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c97bc4d15bd3473dd095e8e8ba57330ab1943a77", + "rev": "f4c4c2c0c923d7811ac2a63ccc154767e4195337", "type": "github" }, "original": { @@ -581,11 +581,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1777168982, - "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", + "lastModified": 1772328832, + "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", + "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", "type": "github" }, "original": { @@ -596,11 +596,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1779414690, - "narHash": "sha256-gOTcX/9MZVMUE0Xvb4IEcv+0TQJkZFNEnL757ljU360=", + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6dedf69f94d03cbe7bdde106f2d4c23ae2a853bf", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "type": "github" }, "original": { @@ -628,11 +628,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1779102034, - "narHash": "sha256-vZJZjLo513IeI8hjzHFc6TDezUd4uCE2Eq4SNO3DNNg=", + "lastModified": 1778737229, + "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "687f05a9184cad4eaf905c48b63649e3a86f5433", + "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5", "type": "github" }, "original": { @@ -822,11 +822,11 @@ ] }, "locked": { - "lastModified": 1777944972, - "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", + "lastModified": 1774910634, + "narHash": "sha256-B+rZDPyktGEjOMt8PcHKYmgmKoF+GaNAFJhguktXAo0=", "owner": "mic92", "repo": "sops-nix", - "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", + "rev": "19bf3d8678fbbfbc173beaa0b5b37d37938db301", "type": "github" }, "original": { @@ -876,11 +876,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1775636079, - "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", + "lastModified": 1773297127, + "narHash": "sha256-6E/yhXP7Oy/NbXtf1ktzmU8SdVqJQ09HC/48ebEGBpk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", + "rev": "71b125cd05fbfd78cab3e070b73544abe24c5016", "type": "github" }, "original": { diff --git a/modules/hosts/darwin/Blue-Rock/default.nix b/modules/hosts/darwin/Blue-Rock/default.nix index 65afc70..a6efc0d 100644 --- a/modules/hosts/darwin/Blue-Rock/default.nix +++ b/modules/hosts/darwin/Blue-Rock/default.nix @@ -31,6 +31,7 @@ "google-drive" "kopiaui" "obs" + "pdk" "puppet-agent" "puppet-bolt" "qmk-toolbox" diff --git a/modules/hosts/darwin/default.nix b/modules/hosts/darwin/default.nix index 38765c5..77f01cf 100644 --- a/modules/hosts/darwin/default.nix +++ b/modules/hosts/darwin/default.nix @@ -21,7 +21,6 @@ bandwhich coreutils hugo - mas nmap openjdk sops @@ -32,7 +31,7 @@ homebrew = { enable = true; onActivation = { - autoUpdate = false; # was true but https://github.com/zhaofengli/nix-homebrew/issues/131 + autoUpdate = true; cleanup = "zap"; upgrade = true; }; @@ -49,6 +48,7 @@ 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 + "mas" "ssh-askpass" "telnet" ]; diff --git a/modules/hosts/darwin/home.nix b/modules/hosts/darwin/home.nix index 0e01412..7df380e 100644 --- a/modules/hosts/darwin/home.nix +++ b/modules/hosts/darwin/home.nix @@ -13,6 +13,7 @@ # Include Puppet's normal bin folder since it is installed via Homebrew export PATH=$PATH:/opt/puppetlabs/bin + export PATH=$PATH:/opt/puppetlabs/pdk/bin export PATH=$PATH:/opt/puppetlabs/puppet/bin # Podman installer pkg for the cli places podman here diff --git a/modules/hosts/darwin/mightymac/default.nix b/modules/hosts/darwin/mightymac/default.nix index df8ca26..bb3d2de 100644 --- a/modules/hosts/darwin/mightymac/default.nix +++ b/modules/hosts/darwin/mightymac/default.nix @@ -21,6 +21,7 @@ taps = [ "hashicorp/tap" "openvoxproject/openvox" + "puppetlabs/puppet" "wouterdebie/repo" ]; brews = [ @@ -48,6 +49,7 @@ "obs" "openvox8-agent" "openvox8-openbolt" + "pdk" "podman-desktop" "qmk-toolbox" "raspberry-pi-imager" diff --git a/modules/shared/home/general/default.nix b/modules/shared/home/general/default.nix index 7fc6b4e..1395417 100644 --- a/modules/shared/home/general/default.nix +++ b/modules/shared/home/general/default.nix @@ -276,20 +276,6 @@ fi 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() { # 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)