Add more mac defaults

2025-08-11 20:32:27 +00:00 · 2025-04-12 22:47:45 -04:00
11 changed files with 46 additions and 114 deletions
--- a/.envrc
+++ b/.envrc
@@ -0,0 +1,5 @@
+if has lorri; then
+  eval "$(lorri direnv)"
+else
+  use nix
+fi
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .pre-commit-config.yaml
 .vscode
+git-crypt-key
 result
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # nix-config

-This repo stores nix configuration to manage my hosts running [NixOS](https://nixos.org/) and macOS.
+This repo stores nix configuration to manage my machines running [NixOS](https://nixos.org/) and macOS.

 The configuration is very specific to my own machines and setup, but it may be a useful reference for anyone else learning or experimenting with nix, whether it be on a personal workstation or a server environment.

@@ -45,4 +45,4 @@ just clean

 ## Pre-commit hooks

-Run `nix develop` to install the pre-commit hooks.
+Pre-commit hooks are automatically activated when [direnv](https://github.com/direnv/direnv) is installed.
--- a/default.nix
+++ b/default.nix
@@ -0,0 +1,13 @@
+let
+  nix-pre-commit-hooks = import (
+    builtins.fetchTarball "https://github.com/cachix/git-hooks.nix/tarball/master"
+  );
+in
+{
+  pre-commit-check = nix-pre-commit-hooks.run {
+    src = ./.;
+    hooks = {
+      shellcheck.enable = true;
+    };
+  };
+}
--- a/flake.lock
+++ b/flake.lock
@@ -257,22 +257,6 @@
      }
    },
    "flake-compat_3": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_4": {
      "flake": false,
      "locked": {
        "lastModified": 1733328505,
@@ -471,7 +455,7 @@
          "stylix",
          "flake-compat"
        ],
-        "gitignore": "gitignore_3",
+        "gitignore": "gitignore_2",
        "nixpkgs": [
          "stylix",
          "nixpkgs"
@@ -514,27 +498,6 @@
      }
    },
    "gitignore_2": {
-      "inputs": {
-        "nixpkgs": [
-          "pre-commit-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "gitignore_3": {
      "inputs": {
        "nixpkgs": [
          "stylix",
@@ -847,22 +810,6 @@
      }
    },
    "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1730768919,
-        "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_7": {
      "locked": {
        "lastModified": 1743703532,
        "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=",
@@ -878,7 +825,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_8": {
+    "nixpkgs_7": {
      "locked": {
        "lastModified": 1743814133,
        "narHash": "sha256-drDyYyUmjeYGiHmwB9eOPTQRjmrq3Yz26knwmMPLZFk=",
@@ -946,26 +893,6 @@
        "type": "github"
      }
    },
-    "pre-commit-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat_3",
-        "gitignore": "gitignore_2",
-        "nixpkgs": "nixpkgs_6"
-      },
-      "locked": {
-        "lastModified": 1742649964,
-        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
    "root": {
      "inputs": {
        "darwin": "darwin",
@@ -975,7 +902,6 @@
        "nixpkgs": "nixpkgs_5",
        "nixpkgs-unstable": "nixpkgs-unstable",
        "nixvim": "nixvim",
-        "pre-commit-hooks": "pre-commit-hooks",
        "stylix": "stylix",
        "vpngate": "vpngate"
      }
@@ -1004,12 +930,12 @@
        "base16-helix": "base16-helix",
        "base16-vim": "base16-vim",
        "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-compat": "flake-compat_4",
+        "flake-compat": "flake-compat_3",
        "flake-utils": "flake-utils_2",
        "git-hooks": "git-hooks_2",
        "gnome-shell": "gnome-shell",
        "home-manager": "home-manager_3",
-        "nixpkgs": "nixpkgs_7",
+        "nixpkgs": "nixpkgs_6",
        "systems": "systems_2",
        "tinted-foot": "tinted-foot",
        "tinted-kitty": "tinted-kitty",
@@ -1149,7 +1075,7 @@
    "vpngate": {
      "inputs": {
        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_8"
+        "nixpkgs": "nixpkgs_7"
      },
      "locked": {
        "lastModified": 1743991519,
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,6 @@
    fh.url = "https://flakehub.com/f/DeterminateSystems/fh/*";
    nixpkgs-unstable.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1";
    nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/*";
-    pre-commit-hooks.url = "github:cachix/git-hooks.nix";
    darwin = {
      url = "github:lnl7/nix-darwin/nix-darwin-24.11";
      inputs.nixpkgs.follows = "nixpkgs";
@@ -22,7 +21,6 @@

  outputs =
    {
-      self,
      darwin,
      fh,
      determinate,
@@ -33,31 +31,7 @@
      vpngate,
      ...
    }@inputs:
-    let
-      supportedSystems = [
-        "x86_64-linux"
-        "aarch64-linux"
-        "x86_64-darwin"
-        "aarch64-darwin"
-      ];
-
-      forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
-    in
    {
-      checks = forAllSystems (system: {
-        pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run {
-          src = ./.;
-          hooks = {
-            nixfmt-rfc-style.enable = true;
-          };
-        };
-      });
-      devShells = forAllSystems (system: {
-        default = nixpkgs.legacyPackages.${system}.mkShell {
-          inherit (self.checks.${system}.pre-commit-check) shellHook;
-          buildInputs = self.checks.${system}.pre-commit-check.enabledPackages;
-        };
-      });
      nixosConfigurations =
        let
          unstable = import nixpkgs-unstable {
@@ -74,7 +48,7 @@
            };
            modules = [
              ./fonts.nix
-              ./hosts/hephaestus/configuration.nix
+              ./machines/hephaestus/configuration.nix
              ./packages.nix
              ./services/netdata/default.nix
              ./upgrade-diff.nix
@@ -94,9 +68,7 @@
                          "root"
                          "dave"
                        ];
-                        trusted-public-keys = [
-                          "davegallant.cachix.org-1:SsUMqL4+tF2R3/G6X903E9laLlY1rES2QKFfePegF08="
-                        ];
+                        trusted-public-keys = [ "davegallant.cachix.org-1:SsUMqL4+tF2R3/G6X903E9laLlY1rES2QKFfePegF08=" ];
                      };
                      registry = {
                        nixpkgs.flake = nixpkgs;
@@ -146,7 +118,7 @@
            modules = [
              home-manager.darwinModules.home-manager
              stylix.darwinModules.stylix
-              ./hosts/zelus/configuration.nix
+              ./machines/zelus/configuration.nix
              ./packages.nix
              ./upgrade-diff.nix

--- a/home/default.nix
+++ b/home/default.nix
@@ -387,7 +387,7 @@ in
    };

    vscode = {
-      enable = stdenv.isLinux;
+      enable = true;
      package = pkgs.vscode;
      extensions =
        with pkgs.vscode-extensions;
--- a/2
+++ b/2
@@ -8,7 +8,7 @@ arch := `uname -s`
 cmd := if arch == "Linux" { "sudo nixos-rebuild --use-remote-sudo" } else { "darwin-rebuild" }

 rebuild:
-  $cmd switch --flake . -I nixos-config="hosts/$(hostname)/configuration.nix"
+  $cmd switch --flake . -I nixos-config="machines/$(hostname)/configuration.nix"

 rollback:
  $cmd switch --rollback --flake .
--- a/machines/hephaestus/configuration.nix
+++ b/machines/hephaestus/configuration.nix
--- a/machines/zelus/configuration.nix
+++ b/machines/zelus/configuration.nix
@@ -85,6 +85,7 @@
      "coreutils"
      "gnu-sed"
      "gnu-tar"
+      "netdata"
      "node"
      "oras"
      "k6"
@@ -106,6 +107,7 @@
      "mitmproxy"
      "notunes"
      "ollama"
+      "postman"
      "raycast"
      "rectangle"
      "signal"
--- a/shell.nix
+++ b/shell.nix
@@ -0,0 +1,13 @@
+let
+  nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-24.11";
+  pkgs = import nixpkgs {
+    config = { };
+    overlays = [ ];
+  };
+
+in
+pkgs.mkShell {
+  shellHook = ''
+    ${(import ./default.nix).pre-commit-check.shellHook}
+  '';
+}