From bc53e58cfaabbea8d1579e2d1a53abc2466ca278 Mon Sep 17 00:00:00 2001 From: James Walker Date: Thu, 2 Jun 2022 17:21:54 -0400 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20heraclitus:=20initial=20config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 42 +++++++------- flake.nix | 3 +- hosts/heraclitus/darwin-configuration.nix | 56 ++++++++++++++++++ hosts/heraclitus/homebrew.nix | 69 +++++++++++++++++++++++ 4 files changed, 148 insertions(+), 22 deletions(-) create mode 100644 hosts/heraclitus/darwin-configuration.nix create mode 100644 hosts/heraclitus/homebrew.nix diff --git a/flake.lock b/flake.lock index 7b500c9..52722cf 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1652776076, - "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1653518057, - "narHash": "sha256-cam3Nfae5ADeEs6mRPzr0jXB7+DhyMIXz0/0Q13r/yk=", + "lastModified": 1653943687, + "narHash": "sha256-xXW9t24HLf89+n/92kOqRRfOBE3KDna+9rAOefs5WSQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "64831f938bd413cefde0b0cf871febc494afaa4f", + "rev": "8f3e26705178cc8c1d982d37d881fc0d5b5b1837", "type": "github" }, "original": { @@ -140,11 +140,11 @@ }, "nixpkgs-21_11": { "locked": { - "lastModified": 1653132211, - "narHash": "sha256-5ugEYisGqixwarfn3BJvuWDnO6gT/AoxlsA6jnG8Fv8=", + "lastModified": 1653819578, + "narHash": "sha256-a1vaUl6VZz1NsWxMw0i5lRyHIOVUIuMZdQzV+4s+rY8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b5991e4971523a5fcc9413b9003b58e5c15aa7d8", + "rev": "baa82d4b626288c7439eeea073a18aabbe435991", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-22_05": { "locked": { - "lastModified": 1653460991, - "narHash": "sha256-8MgFe84UUKw5k5MybirNH0S+oSluN2cRQGt+ZkW+dxQ=", + "lastModified": 1653822412, + "narHash": "sha256-xZwMDQ8MdNiTwE8dcKAX1h3qCmLtuudNGxmFUX3xIes=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c3bf3a5c3ab6be29138b88900c417660a284fbd", + "rev": "db78278ff296cf21eca7e8c08ee99707387a54fa", "type": "github" }, "original": { @@ -172,11 +172,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1653326962, - "narHash": "sha256-W8feCYqKTsMre4nAEpv5Kx1PVFC+hao/LwqtB2Wci/8=", + "lastModified": 1654007547, + "narHash": "sha256-G812EeXZeGeGjkAvbTleGwcKFCGxdLOQb9aViOWASPc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "41cc1d5d9584103be4108c1815c350e07c807036", + "rev": "5643714dea562f0161529ab23058562afeff46d0", "type": "github" }, "original": { @@ -186,11 +186,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1653495658, - "narHash": "sha256-66YwJ6nuDHRxpYRiKtNC3qA9QkrHHJn6c+cJriiOGZI=", + "lastModified": 1653931853, + "narHash": "sha256-O3wncIouj9x7gBPntzHeK/Hkmm9M1SGlYq7JI7saTAE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7fa8d8b2e206be87de8e4128441384f171c8a33b", + "rev": "f1c167688a6f81f4a51ab542e5f476c8c595e457", "type": "github" }, "original": { @@ -221,11 +221,11 @@ "nixpkgs-22_05": "nixpkgs-22_05" }, "locked": { - "lastModified": 1653462763, - "narHash": "sha256-n0beO7WNvAeEtTtnetzQCaGs615tU/DfM97k8r/7bUw=", + "lastModified": 1653827546, + "narHash": "sha256-va51HFf7UwktvriIbe9pjRPMr7p8IaxrwcDlZe7twzI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "7385b12722ce903e477878147794bed9040227e2", + "rev": "36b5901782e7fbfc191cace910f67f8b8743f678", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index af1d317..4653a19 100644 --- a/flake.nix +++ b/flake.nix @@ -71,7 +71,7 @@ { devShells.default = pkgs.mkShell { name = "athens"; - buildInputs = [ deploy-rs.packages.${system}.deploy-rs pkgs.sops ]; + buildInputs = [ deploy-rs.packages.${system}.deploy-rs pkgs.nixpkgs-fmt pkgs.sops ]; }; }) // { nixosConfigurations = { @@ -86,6 +86,7 @@ }; darwinConfigurations = { epicurus = mkDarwin "epicurus" "aarch64-darwin" [ ./hosts/epicurus/darwin-configuration.nix ]; + heraclitus = mkDarwin "heraclitus" "aarch64-darwin" [ ./hosts/heraclitus/darwin-configuration.nix ]; }; deploy.nodes = { diff --git a/hosts/heraclitus/darwin-configuration.nix b/hosts/heraclitus/darwin-configuration.nix new file mode 100644 index 0000000..3786bc7 --- /dev/null +++ b/hosts/heraclitus/darwin-configuration.nix @@ -0,0 +1,56 @@ +{ config, lib, pkgs, dotfiles, ... }: +{ + imports = [ + ./homebrew.nix + ../../modules/builder + ]; + + # List packages installed in system profile. To search by name, run: + # $ nix-env -qaP | grep wget + # environment.systemPackages = with pkgs; [ emacs-nox vim ghc go gopls niv rustup stack ]; + environment.systemPackages = with pkgs; [ deno elixir emacs go niv nodejs rustup ]; + + # Auto upgrade nix package and the daemon service. + services.nix-daemon.enable = true; + + users.nix.configureBuildUsers = true; + users.users.walkah = { + home = "/Users/walkah"; + shell = pkgs.zsh; + }; + + home-manager.users.walkah = import "${dotfiles}/home.nix"; + + nix = { + package = pkgs.nix; + + trustedUsers = [ "root" "@admin" ]; + + extraOptions = '' + extra-platforms = x86_64-darwin aarch64-darwin + experimental-features = nix-command flakes + ''; + }; + + services.lorri.enable = true; + + programs = { + zsh = { + enable = true; + promptInit = ""; + }; + }; + + system = { + defaults = { + dock = { + autohide = true; + orientation = "left"; + }; + }; + }; + + # Used for backwards compatibility, please read the changelog before changing. + # $ darwin-rebuild changelog + system.stateVersion = 4; +} diff --git a/hosts/heraclitus/homebrew.nix b/hosts/heraclitus/homebrew.nix new file mode 100644 index 0000000..b50922c --- /dev/null +++ b/hosts/heraclitus/homebrew.nix @@ -0,0 +1,69 @@ +{ config, lib, pkgs, ... }: + +{ + homebrew = { + enable = true; + brewPrefix = "/opt/homebrew/bin"; + autoUpdate = true; + cleanup = "zap"; + global = { + brewfile = true; + noLock = true; + }; + + taps = [ + "homebrew/cask" + "homebrew/cask-drivers" + "homebrew/cask-fonts" + "homebrew/cask-versions" + "homebrew/services" + ]; + + brews = [ "coreutils" ]; + + casks = [ + "1password" + "bartender" + "brave-browser" + "bunch" + "discord" + "docker" + "element" + "fantastical" + "figma" + "firefox" + "firefox-developer-edition" + "font-jetbrains-mono" + "font-jetbrains-mono-nerd-font" + "google-chrome" + "gpg-suite" + "hazel" + "ipfs" + "iterm2" + "keybase" + "logi-options-plus" + "logseq" + "raycast" + "slack" + "sonos" + "spotify" + "stats" + "syncthing" + "synology-drive" + "todoist" + "visual-studio-code" + "zoom" + ]; + + masApps = { + OnePasswordSafari = 1569813296; + Bumpr = 1166066070; + DayOne = 1055511498; + Drafts = 1435957248; + Reeder = 1529448980; + Tailscale = 1475387142; + UlyssesMac = 1225570693; + Xcode = 497799835; + }; + }; +}