From a68ad6f7a3153cc14a7003377780fc348110c02d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 9 Feb 2025 00:25:11 +0000 Subject: [PATCH 1/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'darwin': 'github:lnl7/nix-darwin/49b807fa7c37568d7fbe2aeaafb9255c185412f9?narHash=sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3%2B%2B0qN1rQBg8FW0%3D' (2025-01-30) → 'github:lnl7/nix-darwin/cae8d1c4a3bd37be5887203fe3b0c3a860c53a07?narHash=sha256-/hgw8fDKDpko0XqOw1e9tX8lS2Hqecg7W/JsONun6Qc%3D' (2025-01-21) • Updated input 'darwin/nixpkgs': 'github:NixOS/nixpkgs/8c9fd3e564728e90829ee7dbac6edc972971cd0f?narHash=sha256-CHd7yhaDigUuJyDeX0SADbTM9FXfiWaeNyY34FL1wQU%3D' (2025-01-07) → follows 'nixpkgs' • Updated input 'home-manager': 'github:nix-community/home-manager/18fa9f323d8adbb0b7b8b98a8488db308210ed93?narHash=sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg%3D' (2025-02-01) → 'github:nix-community/home-manager/5af1b9a0f193ab6138b89a8e0af8763c21bbf491?narHash=sha256-p1QSLO8DJnANY%2BppK7fjD8GqfCrEIDjso1CSRHsXL7Y%3D' (2025-02-08) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/666e1b3f09c267afd66addebe80fb05a5ef2b554?narHash=sha256-6L%2BWXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk%3D' (2025-01-30) → 'github:nixos/nixpkgs/f5a32fa27df91dfc4b762671a0e0a859a8a0058f?narHash=sha256-7x%2BQ4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i%2BjBHE%3D' (2025-02-06) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/3a228057f5b619feb3186e986dbe76278d707b6e?narHash=sha256-xvTo0Aw0%2Bveek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc%3D' (2025-02-01) → 'github:nixos/nixpkgs/a79cfe0ebd24952b580b1cf08cd906354996d547?narHash=sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y%3D' (2025-02-08) --- dot_config/flake/flake.lock | 81 ++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 47 deletions(-) diff --git a/dot_config/flake/flake.lock b/dot_config/flake/flake.lock index b19afe7..14ec683 100644 --- a/dot_config/flake/flake.lock +++ b/dot_config/flake/flake.lock @@ -17,18 +17,21 @@ }, "darwin": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1738277753, - "narHash": "sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3++0qN1rQBg8FW0=", + "lastModified": 1737421067, + "narHash": "sha256-/hgw8fDKDpko0XqOw1e9tX8lS2Hqecg7W/JsONun6Qc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "49b807fa7c37568d7fbe2aeaafb9255c185412f9", + "rev": "cae8d1c4a3bd37be5887203fe3b0c3a860c53a07", "type": "github" }, "original": { "owner": "lnl7", + "ref": "nix-darwin-24.11", "repo": "nix-darwin", "type": "github" } @@ -70,7 +73,7 @@ "inputs": { "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay" }, "locked": { @@ -95,11 +98,11 @@ ] }, "locked": { - "lastModified": 1738448366, - "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=", + "lastModified": 1739051380, + "narHash": "sha256-p1QSLO8DJnANY+ppK7fjD8GqfCrEIDjso1CSRHsXL7Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93", + "rev": "5af1b9a0f193ab6138b89a8e0af8763c21bbf491", "type": "github" }, "original": { @@ -111,7 +114,7 @@ "nixgl": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1713543440, @@ -128,38 +131,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1736241350, - "narHash": "sha256-CHd7yhaDigUuJyDeX0SADbTM9FXfiWaeNyY34FL1wQU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8c9fd3e564728e90829ee7dbac6edc972971cd0f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1728018373, "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", @@ -175,7 +146,23 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs-unstable": { + "locked": { + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1660551188, "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=", @@ -190,13 +177,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1738277201, - "narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=", + "lastModified": 1738843498, + "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554", + "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f", "type": "github" }, "original": { @@ -212,7 +199,7 @@ "helix": "helix", "home-manager": "home-manager", "nixgl": "nixgl", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable" } }, From 9aae46a78f76944a827178e840039eb94fb5c852 Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Wed, 12 Feb 2025 15:34:33 -0500 Subject: [PATCH 2/4] Updated macos settings --- dot_config/aerospace/aerospace.toml | 4 ++-- dot_config/flake/flake.nix | 5 ++--- dot_config/flake/home/common.nix | 2 ++ dot_config/flake/home/fish.nix | 4 ++-- dot_config/flake/home/hinge/darwin.nix | 27 +++++++++++++++++++++++--- dot_config/flake/home/hinge/hinge.nix | 6 ++++-- 6 files changed, 36 insertions(+), 12 deletions(-) diff --git a/dot_config/aerospace/aerospace.toml b/dot_config/aerospace/aerospace.toml index db3e92c..f7beebe 100644 --- a/dot_config/aerospace/aerospace.toml +++ b/dot_config/aerospace/aerospace.toml @@ -211,5 +211,5 @@ shift-down = ['volume set 0', 'mode main'] [workspace-to-monitor-force-assignment] 1 = 'built-in' -2 = ['^DELL U2723QE \(1\)$'] -3 = ['^DELL U2723QE \(2\)$', '3'] +2 = ['^DELL U2723QE \(1\)$', 'BenQ EX2710 \(2\)$'] +3 = ['^DELL U2723QE \(2\)$', 'BenQ EX2710 \(1\)$'] diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix index d2a8afa..348c2d9 100644 --- a/dot_config/flake/flake.nix +++ b/dot_config/flake/flake.nix @@ -55,9 +55,8 @@ ./home/hinge/darwin.nix home-manager.darwinModules.home-manager { - # pkgs = allPkgs."aarch64-darwin"; - #home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; + home-manager.useGlobalPkgs = false; + home-manager.useUserPackages = false; home-manager.extraSpecialArgs = {inherit inputs outputs;}; home-manager.users."tyler.mayoff" = import ./home/hinge/hinge.nix; diff --git a/dot_config/flake/home/common.nix b/dot_config/flake/home/common.nix index 2f2d9e5..b848516 100644 --- a/dot_config/flake/home/common.nix +++ b/dot_config/flake/home/common.nix @@ -77,6 +77,8 @@ programs.zellij = { enable = true; + enableFishIntegration = false; + enableZshIntegration = false; }; programs.starship = { diff --git a/dot_config/flake/home/fish.nix b/dot_config/flake/home/fish.nix index b765c69..d8d837a 100644 --- a/dot_config/flake/home/fish.nix +++ b/dot_config/flake/home/fish.nix @@ -7,8 +7,8 @@ set -gx DEBEMAIL "tyler@tylermayoff.com" fish_add_path $HOME/.local/bin - fish_add_path /opt/homebrew/bin - fish_add_path /opt/homebrew/opt/llvm@18/bin + # fish_add_path /opt/homebrew/bin + # fish_add_path /opt/homebrew/opt/llvm@18/bin if test -e $HOME/.config/fish/variables-$(hostname)fish source $HOME/.config/fish/variables-$(hostname).fish diff --git a/dot_config/flake/home/hinge/darwin.nix b/dot_config/flake/home/hinge/darwin.nix index aab833a..efe0685 100644 --- a/dot_config/flake/home/hinge/darwin.nix +++ b/dot_config/flake/home/hinge/darwin.nix @@ -1,11 +1,28 @@ -{pkgs, ...}: { +{ + pkgs, + lib, + ... +}: { # services.aerospace.enable = true; imports = [ # ../fish.nix ]; - users.users."tyler.mayoff".shell = pkgs.fish; + nix.extraOptions = + '' + auto-optimise-store = true + experimental-features = nix-command flakes + '' + + lib.optionalString (pkgs.system == "aarch64-darwin") '' + extra-platforms = x86_64-darwin aarch64-darwin + ''; + + users.knownUsers = ["tyler.mayoff"]; + users.users."tyler.mayoff" = { + uid = 502; + shell = pkgs.fish; + }; services.sketchybar.enable = true; @@ -13,7 +30,11 @@ environment.systemPackages = with pkgs; [ pinentry_mac - ]; + llvmPackages_19.clang-tools + # android-tools + jdk17 + ]; programs.fish.enable = true; + programs.zsh.enable = true; } diff --git a/dot_config/flake/home/hinge/hinge.nix b/dot_config/flake/home/hinge/hinge.nix index e402083..3392259 100644 --- a/dot_config/flake/home/hinge/hinge.nix +++ b/dot_config/flake/home/hinge/hinge.nix @@ -29,14 +29,16 @@ just yarn cocoapods - # android-tools - jdk17 ]; sessionVariables = { ANDROID_HOME = "/Users/tyler.mayoff/Library/Android/sdk"; PATH = "$PATH:/Users/tyler.mayoff/Library/Android/sdk/platform-tools"; }; + + file.".gnupg/gpg-agent.conf".text = '' + pinentry-program ${pkgs.pinentry_mac}/Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac + ''; }; home.stateVersion = "24.11"; From e8da1b6614752930bdd1078fa72e5db96d68c953 Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Wed, 12 Feb 2025 15:35:01 -0500 Subject: [PATCH 3/4] nushell --- dot_config/flake/home/nushell.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dot_config/flake/home/nushell.nix b/dot_config/flake/home/nushell.nix index 1c77f13..103e616 100644 --- a/dot_config/flake/home/nushell.nix +++ b/dot_config/flake/home/nushell.nix @@ -18,6 +18,8 @@ def gac [] { git add .; git commit } def gacp [] { gac; git push } + use ${pkgs.nu_scripts}/share/nu_scripts/nu-hooks/direnv/direnv.nu * + use ${pkgs.nu_scripts}/share/nu_scripts/aliases/git/git-aliases.nu * use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/git/git-completions.nu * use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/just/just-completions.nu * From fcd07a2c280e823554f8c7ebd0678e8659730004 Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Wed, 12 Feb 2025 15:38:25 -0500 Subject: [PATCH 4/4] fixed nushell --- dot_config/flake/home/nushell.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/flake/home/nushell.nix b/dot_config/flake/home/nushell.nix index 103e616..48936f4 100644 --- a/dot_config/flake/home/nushell.nix +++ b/dot_config/flake/home/nushell.nix @@ -18,7 +18,7 @@ def gac [] { git add .; git commit } def gacp [] { gac; git push } - use ${pkgs.nu_scripts}/share/nu_scripts/nu-hooks/direnv/direnv.nu * + use ${pkgs.nu_scripts}/share/nu_scripts/nu-hooks/nu-hooks/direnv/direnv.nu * use ${pkgs.nu_scripts}/share/nu_scripts/aliases/git/git-aliases.nu * use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/git/git-completions.nu *