diff --git a/flake.lock b/flake.lock index a4bc48f..7372f7d 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1726188813, - "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=", + "lastModified": 1726616680, + "narHash": "sha256-i0h300W3t7Q7PltJPmucj+ub45SE/bNQ+pf83tasYAQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80", + "rev": "6374cd7e50aa057a688142eed2345083047ad884", "type": "github" }, "original": { @@ -96,11 +96,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1726440980, - "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", + "lastModified": 1726611255, + "narHash": "sha256-/bxaYvIK6/d3zqpW26QFS0rqfd0cO4qreSNWvYLTl/w=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", + "rev": "d2493de5cd1da06b6a4c3e97f4e7d5dd791df457", "type": "github" }, "original": { @@ -186,11 +186,11 @@ }, "nixlib": { "locked": { - "lastModified": 1725757153, - "narHash": "sha256-c1a6iLmCVPFI9EUVMrBN8xdmFxFXEjcVwiTSVmqajOs=", + "lastModified": 1726362065, + "narHash": "sha256-4h15WKdrs9zf6DGaeeV7ntU/pHHGkH6geYt1QBW0CP4=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "68584f89dd0eb16fea5d80ae127f3f681f6a5df7", + "rev": "9db4db09d82e4b2207bfa7f1e747a4f49d214555", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1726102718, - "narHash": "sha256-u89QyfjtXryLHrO3Wre4kuWK5KDKiXe8lgRi6+cUOEw=", + "lastModified": 1726494069, + "narHash": "sha256-eBmurYEjTDfWbpJOO5jQu9yxoznOxLF/7IwYJyD+ljw=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "5ae384b83b91080f0fead6bc1add1cff8277cb3f", + "rev": "934dff070150ec3f67aea4f1dbe6ad303870669f", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726396940, - "narHash": "sha256-EpiSl9nSINTmIW6MG6CulGwNAa6sHrBt8gQdyHUXzR4=", + "lastModified": 1726583932, + "narHash": "sha256-zACxiQx8knB3F8+Ze+1BpiYrI+CbhxyWpcSID9kVhkQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76d7694a3f681b0b750c01783df5d2177ef39fe7", + "rev": "658e7223191d2598641d50ee4e898126768fe847", "type": "github" }, "original": { @@ -459,11 +459,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1726218807, - "narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=", + "lastModified": 1726524647, + "narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e", + "rev": "e2d404a7ea599a013189aa42947f66cede0645c8", "type": "github" }, "original": { diff --git a/nix/hosts/heraclitus/darwin-configuration.nix b/nix/hosts/heraclitus/darwin-configuration.nix index 765de27..d34b973 100644 --- a/nix/hosts/heraclitus/darwin-configuration.nix +++ b/nix/hosts/heraclitus/darwin-configuration.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { imports = [ ./homebrew.nix @@ -12,8 +12,7 @@ # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget - # environment.systemPackages = with pkgs; [ emacs ]; - environment.systemPackages = with pkgs; [ emacs-macport ]; + # environment.systemPackages = with pkgs; [ emacs-macport ]; # Auto upgrade nix package and the daemon service. services.nix-daemon.enable = true; diff --git a/nix/hosts/heraclitus/homebrew.nix b/nix/hosts/heraclitus/homebrew.nix index a753953..bf1ebde 100644 --- a/nix/hosts/heraclitus/homebrew.nix +++ b/nix/hosts/heraclitus/homebrew.nix @@ -8,10 +8,31 @@ _: "homebrew/cask-versions" "homebrew/services" "1password/tap" - "fission-codes/fission" + "d12frosted/emacs-plus" ]; - brews = [ "coreutils" "fontconfig" "ipfs" ]; + brews = [ + { + name = "emacs-plus"; + args = [ "with-native-comp" ]; + } + "awscli" + "cmake" + "coreutils" + "drone-cli" + "doppler" + "fd" + "fontconfig" + "gcc" + "gh" + "helm" + "ipfs" + "kind" + "kubernetes-cli" + "mr" + "ripgrep" + "tea" + ]; casks = [ "1password" @@ -31,6 +52,7 @@ _: "font-jetbrains-mono" "font-jetbrains-mono-nerd-font" "google-chrome" + "google-cloud-sdk" "gpg-suite" "hazel" "iterm2" diff --git a/nix/modules/dev/default.nix b/nix/modules/dev/default.nix index 6868849..bf729e3 100644 --- a/nix/modules/dev/default.nix +++ b/nix/modules/dev/default.nix @@ -2,31 +2,6 @@ { environment.systemPackages = with pkgs; [ - # Cloud - awscli2 - google-cloud-sdk - doppler - - # Git / CI - drone-cli - mr - tea - - # NodeJS - bun - nodejs - pnpm - - # Golang - go - - # k8s - chart-testing - k9s - kind - kubectl - kubernetes-helm - # Nix cachix nixd