flake.lock: Update

Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/3df2a80f3f85f91ea06e5e91071fa74ba92e5084' (2024-01-23) → 'github:nix-community/home-manager/d634c3abafa454551f2083b054cd95c3f287be61' (2024-01-28) • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d' (2023-11-24) → 'github:LnL7/nix-darwin/91b9daf672c957ef95a05491a75f62e6a01d5aaf' (2024-01-30) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/5f5210aa20e343b7e35f40c033000db0ef80d7b9' (2024-01-22) → 'github:nixos/nixpkgs/222c1940fafeda4dea161858ffe6ebfc853d3db5' (2024-01-30)
Adds Homebrew support and packages
2024-01-31 16:07:31 +05:30 · 2024-01-31 16:00:03 +05:30 · 2024-01-31 14:35:02 +05:30
9 changed files with 210 additions and 63 deletions
--- a/configuration.nix
+++ b/configuration.nix
@ -0,0 +1,46 @@
+{ pkgs, inputs, ... }:
+{
+  imports = [./nix.nix];
+  security.pam.enableSudoTouchIdAuth = true;
+  system = {
+    defaults = {
+      dock = {
+        appswitcher-all-displays = false;
+        autohide = true;
+        magnification = true;
+        mru-spaces = false;
+        orientation = "bottom";
+        wvous-bl-corner = 13;
+        wvous-br-corner = 14;
+        wvous-tl-corner = 2;
+        wvous-tr-corner = 3;
+      };
+      finder = {
+        AppleShowAllExtensions = true;
+        FXPreferredViewStyle = "Nlsv";
+      };
+      NSGlobalDomain = {
+        AppleEnableMouseSwipeNavigateWithScrolls = true;
+        AppleEnableSwipeNavigateWithScrolls = true;
+        AppleICUForce24HourTime = true;
+        AppleInterfaceStyle = "Dark";
+        AppleInterfaceStyleSwitchesAutomatically = false;
+        NSAutomaticCapitalizationEnabled = false;
+        NSAutomaticDashSubstitutionEnabled = true;
+        NSAutomaticSpellingCorrectionEnabled = false;
+        NSAutomaticPeriodSubstitutionEnabled = false;
+        NSAutomaticQuoteSubstitutionEnabled = true;
+        _HIHideMenuBar = true;
+      };
+      trackpad = {
+        Clicking = true;
+        TrackpadRightClick = true;
+      };
+    };
+    keyboard = {
+      enableKeyMapping = true;
+      remapCapsLockToControl = true;
+    };
+    stateVersion = 4;
+  };
+}
--- a/flake.lock
+++ b/flake.lock
@ -71,11 +71,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1706001011,
-        "narHash": "sha256-J7Bs9LHdZubgNHZ6+eE/7C18lZ1P6S5/zdJSdXFItI4=",
+        "lastModified": 1706473109,
+        "narHash": "sha256-iyuAvpKTsq2u23Cr07RcV5XlfKExrG8gRpF75hf1uVc=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "3df2a80f3f85f91ea06e5e91071fa74ba92e5084",
+        "rev": "d634c3abafa454551f2083b054cd95c3f287be61",
        "type": "github"
      },
      "original": {
@ -101,19 +101,39 @@
        "type": "github"
      }
    },
+    "nix-darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1706581965,
+        "narHash": "sha256-1H7dRdK9LJ7+2X1XQtbwXr+QMqtVVo/ZF0/LIvkjdK8=",
+        "owner": "LnL7",
+        "repo": "nix-darwin",
+        "rev": "91b9daf672c957ef95a05491a75f62e6a01d5aaf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "LnL7",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1705883077,
-        "narHash": "sha256-ByzHHX3KxpU1+V0erFy8jpujTufimh6KaS/Iv3AciHk=",
+        "lastModified": 1706589919,
+        "narHash": "sha256-pNHnDITxSI3a17GOF1RUF3jBO1OiNYTRH2yV/cJG4m4=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "5f5210aa20e343b7e35f40c033000db0ef80d7b9",
+        "rev": "222c1940fafeda4dea161858ffe6ebfc853d3db5",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
        "repo": "nixpkgs",
-        "rev": "5f5210aa20e343b7e35f40c033000db0ef80d7b9",
        "type": "github"
      }
    },
@ -125,6 +145,7 @@
        "flake-compat": "flake-compat",
        "home-manager": "home-manager",
        "monaspace-font": "monaspace-font",
+        "nix-darwin": "nix-darwin",
        "nixpkgs": "nixpkgs"
      }
    }
--- a/flake.nix
+++ b/flake.nix
@ -1,8 +1,12 @@
 {
-  description = "Home Manager configuration of Abhinav Sarkar";
+  description = "Nix Darwin + Home Manager configuration of Abhinav Sarkar";

  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs?rev=5f5210aa20e343b7e35f40c033000db0ef80d7b9";
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    nix-darwin = {
+      url = "github:LnL7/nix-darwin";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
    home-manager = {
      url = "github:nix-community/home-manager";
      inputs.nixpkgs.follows = "nixpkgs";
@ -29,25 +33,34 @@
    };
  };

-  outputs = inputs@{ nixpkgs, home-manager, ... }:
+  outputs = inputs@{ self, nixpkgs, nix-darwin, home-manager, ... }:
    let
      system = "x86_64-darwin";
      pkgs = import nixpkgs {
        inherit system;
        config = { allowUnfree = true; };
      };
-    in {
-      homeConfigurations.abhinav = home-manager.lib.homeManagerConfiguration {
-        inherit pkgs;
-        modules = [ ./home.nix ];
-        extraSpecialArgs = { inherit inputs; };
+    in
+    {
+      darwinConfigurations."Abhinavs-MacBook-Pro" = nix-darwin.lib.darwinSystem {
+        inherit system;
+        specialArgs = { inherit inputs; };
+        modules = [
+          ./configuration.nix
+          ./homebrew.nix
+          home-manager.darwinModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.users.abhinav = import ./home.nix;
+            home-manager.extraSpecialArgs = { inherit inputs; };
+          }
+        ];
      };
      devShells.${system}.default = pkgs.mkShell {
        buildInputs = with pkgs; [ (import home-manager { inherit pkgs; }).home-manager just ];
        shellHook = ''
-          export NIX_PATH=$HOME/.hm-nixchannels;
-          mkdir -p $NIX_PATH;
-          ln -f -s ${pkgs.path} -T $NIX_PATH/nixpkgs;
+          export NIXPKGS_PATH=${pkgs.path};
        '';
      };
    };
--- a/home.nix
+++ b/home.nix
@ -1,11 +1,12 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:

-{
-  imports = [ ./programs ./scripts ./launchd.nix ./nix.nix ];
+let username = config.home.username;
+in {
+  imports = [ ./programs ./scripts ./launchd.nix ];

  home = {
    username = "abhinav";
-    homeDirectory = "/Users/abhinav";
+    homeDirectory = lib.mkForce "/Users/${username}";
    stateVersion = "22.05";
    enableNixpkgsReleaseCheck = true;

@ -23,7 +24,7 @@

    sessionVariables = {
      EDITOR = "micro";
-      NIX_PATH = "$HOME/.hm-nixchannels";
+      NIX_PATH = "/nix/var/nix/profiles/per-user/${username}/channels";
    };

    file."Applications/Home Manager Apps".source = let
--- a/homebrew.nix
+++ b/homebrew.nix
@ -0,0 +1,43 @@
+{ ... }: {
+  homebrew = {
+    enable = true;
+    onActivation = {
+      autoUpdate = false;
+      cleanup = "uninstall";
+      upgrade = false;
+    };
+    global = {
+      autoUpdate = false;
+      brewfile = true;
+    };
+    casks = [
+      "amethyst"
+      "calibre"
+      "dropbox"
+      "fanny"
+      "firefox"
+      "garmin-express"
+      "google-chrome"
+      "homebrew/cask/handbrake"
+      "spotify"
+      "telegram"
+      "utm"
+      "vlc"
+    ];
+    masApps = {
+      Amphetamine = 937984704;
+      Bear = 1091189122;
+      GarageBand = 682658836;
+      iMovie = 408981434;
+      Ivory = 6444602274;
+      Keynote = 409183694;
+      Kindle = 302584613;
+      NextDNS = 1464122853;
+      Numbers = 409203825;
+      Pages = 409201541;
+      Reeder = 1449412482;
+      TestFlight = 899247664;
+      Xcode = 497799835;
+    };
+  };
+}
--- a/19
+++ b/19
@ -1,5 +1,6 @@
 in_nix_shell := env_var_or_default("IN_NIX_SHELL", "false")
 root_dir := justfile_directory()
+hostname := `scutil --get LocalHostName`

 # choose a just command to run
 default:
@ -18,24 +19,26 @@ _run cmd:
    fi

 _build:
-    home-manager -v build --flake "{{ root_dir }}#abhinav"
+    nix build {{ root_dir }}#darwinConfigurations.{{ hostname }}.system

 # build latest home-manager generation
 build: (_run "_build")

-_switch:
-    home-manager -v switch --flake "{{ root_dir }}#abhinav"
-    report-hm-changes
+_switch: _build
+    ./result/sw/bin/darwin-rebuild -v switch --flake "{{ root_dir }}"

 # switch to latest home-manager generation
 switch: (_run "_switch")

-_update-vscode-extensions:
-    $NIX_PATH/nixpkgs/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh > \
+_update: && _switch _brew-update
+    nix flake update --commit-lock-file "{{ root_dir }}"
+    $NIXPKGS_PATH/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh > \
        {{ root_dir }}/programs/vscode/extensions.nix

-_update: _update-vscode-extensions && _switch
-    nix flake update --commit-lock-file "{{ root_dir }}"
+_brew-update:
+    brew update
+    brew upgrade
+    mas upgrade

 # update packages and switch
 update: (_run "_update")
--- a/nix.nix
+++ b/nix.nix
@ -1,19 +1,36 @@
-{ config, pkgs, ... }:
-
+{ config, pkgs, inputs, ... }:
 {
-  nixpkgs.config.allowUnfree = true;
-  nix.package = pkgs.nixStable;
-  nix.settings = {
-    experimental-features = [ "nix-command" "flakes" "repl-flake" ];
-    max-jobs = 6;
-    cores = 2;
-    auto-optimise-store = true;
-    connect-timeout = 5;
-    log-lines = 25;
-    min-free = 128000000;
-    max-free = 1000000000;
-    fallback = true;
-    warn-dirty = false;
-    keep-outputs = true;
+  services.nix-daemon.enable = true;
+  nix = {
+    package = pkgs.nixFlakes;
+    registry.nixpkgs.flake = inputs.nixpkgs;
+    nixPath = [{ nixpkgs = inputs.nixpkgs.outPath; }];
+    extraOptions = ''
+      keep-outputs = true
+      keep-derivations = true
+    '';
+    gc = {
+      automatic = true;
+      interval.Day = 1;
+      options = "--delete-older-than 7d";
+    };
+    settings = {
+      auto-optimise-store = true;
+      connect-timeout = 5;
+      cores = 2;
+      experimental-features = [ "nix-command" "flakes" "repl-flake" ];
+      fallback = true;
+      keep-outputs = true;
+      log-lines = 25;
+      max-free = 1000000000;
+      max-jobs = 6;
+      min-free = 128000000;
+      warn-dirty = false;
+      trusted-users = ["@admin"];
+    };
+  };
+  nixpkgs = {
+    hostPlatform = "x86_64-darwin";
+    config.allowUnfree = true;
  };
 }
--- a/programs/fish.nix
+++ b/programs/fish.nix
@ -1,6 +1,7 @@
 { inputs, config, pkgs, ... }:

-{
+let username = config.home.username;
+in {
  programs.fish = {
    enable = true;

@ -29,7 +30,9 @@
    shellInit = ''
      # nix
      fenv source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
-      fish_add_path -m ~/.local/bin ~/.cabal/bin
+      fenv source /etc/profiles/per-user/${username}/etc/profile.d/hm-session-vars.sh
+      fish_add_path -m ~/.local/bin ~/.cabal/bin /etc/profiles/per-user/${username}/bin
+      eval "$(/usr/local/bin/brew shellenv)"
    '';
  };
 }
--- a/programs/vscode/extensions.nix
+++ b/programs/vscode/extensions.nix
@ -20,8 +20,8 @@
  {
    name = "vscode-markdownlint";
    publisher = "DavidAnson";
-    version = "0.53.0";
-    sha256 = "1jd2bgzmk11jgv897605ibfl38lr0yssmic6yv6mrrwcgvmrg402";
+    version = "0.54.0";
+    sha256 = "171qw6mymc9hmm8xin3gwr8r2ac8yfr3s8agagsqq9193cawbcq6";
  }
  {
    name = "mustache";
@ -44,14 +44,14 @@
  {
    name = "copilot";
    publisher = "GitHub";
-    version = "1.153.669";
-    sha256 = "11qy0ksv8baym7ds7j6qmggr0l41bfacd3sy6niypxn33iad01mv";
+    version = "1.156.683";
+    sha256 = "0hks2vav7xxcrrwqrpg6lckanxh8qd0a5zzhywn72i8r18a14jl2";
  }
  {
    name = "copilot-chat";
    publisher = "GitHub";
-    version = "0.12.2024012301";
-    sha256 = "18px2wnlb8vrh2fy0c413m0s57bkqcjmciv35bzfmi5grp5h6gwx";
+    version = "0.12.2024013003";
+    sha256 = "0k5mqhx1acf41sf2qn5fnw5icah2awvivgpqgfrkxn98b5adc2p0";
  }
  {
    name = "go";
@ -110,8 +110,8 @@
  {
    name = "black-formatter";
    publisher = "ms-python";
-    version = "2023.9.10231018";
-    sha256 = "104ng2sl8pdi011pqbwdlp6b3xpkj6mfs9d5jcw099y9m18h5s3w";
+    version = "2023.9.10291927";
+    sha256 = "1alh8j35qidgmbb293ar02x5xbigqcv7khq1bp7blsffisdxdqm4";
  }
  {
    name = "debugpy";
@ -122,14 +122,14 @@
  {
    name = "python";
    publisher = "ms-python";
-    version = "2023.25.10221012";
-    sha256 = "14bkvlflib4wky6lw1hq0i01ymzf5349cl4d9minaam2lq0451i0";
+    version = "2023.25.10292213";
+    sha256 = "09r82h3px2nlkyd3h5y8p6xcz9pccayvfnrnymlkiy9n2j2889sy";
  }
  {
    name = "vscode-pylance";
    publisher = "ms-python";
-    version = "2023.12.104";
-    sha256 = "07hh0x4z255xswcwd0dkyridpaxsbfnrna9hhbqiiz50vf4grzjx";
+    version = "2024.1.102";
+    sha256 = "05wikxrc7bw2m71gp2n4myfqdk7gk8y474v2fhg0qrxz5hafkyx6";
  }
  {
    name = "vscode-cljfmt";
@ -140,8 +140,8 @@
  {
    name = "rust-analyzer";
    publisher = "rust-lang";
-    version = "0.4.1817";
-    sha256 = "1nj3cw4nhan7gh04f91z09rh14l37zq6yjjvxqjw2ylvfjrz0klr";
+    version = "0.4.1825";
+    sha256 = "19yqnrxf5c8wm330g13i3vyjbabakw2ary4c6z0j74fh4f1xniz8";
  }
  {
    name = "just";