From 7ed15206d0548d57a6be7d0a4cc3331830c9230a Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Wed, 4 Dec 2024 11:27:18 -0500 Subject: [PATCH] Getting this working on macos --- dot_config/flake/flake.lock | 24 ++++++++++++------------ dot_config/flake/home/fish.nix | 11 ++++++++--- dot_config/flake/home/hinge/hinge.nix | 8 +++++++- 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/dot_config/flake/flake.lock b/dot_config/flake/flake.lock index eb65265..d67a10b 100644 --- a/dot_config/flake/flake.lock +++ b/dot_config/flake/flake.lock @@ -56,11 +56,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1732284611, - "narHash": "sha256-SH7WRJnFSXDJ6f9UzMUdaa6cS5Fc2kACSW8wB9BA8WU=", + "lastModified": 1733238479, + "narHash": "sha256-o5BT2ziQJzoXrqBz/iOIOGoxDTXYd5KiNF/7ncN81ao=", "owner": "helix-editor", "repo": "helix", - "rev": "cbbeca6c5227e65bebdbe9abbadbd2202ffc1005", + "rev": "fa68bac391e576e659e306ce3fb2758d3ec68538", "type": "github" }, "original": { @@ -76,11 +76,11 @@ ] }, "locked": { - "lastModified": 1732482255, - "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", + "lastModified": 1733175814, + "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", + "rev": "bf23fe41082aa0289c209169302afd3397092f22", "type": "github" }, "original": { @@ -126,11 +126,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1733016324, + "narHash": "sha256-8qwPSE2g1othR1u4uP86NXxm6i7E9nHPyJX3m3lx7Q4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "7e1ca67996afd8233d9033edd26e442836cc2ad6", "type": "github" }, "original": { diff --git a/dot_config/flake/home/fish.nix b/dot_config/flake/home/fish.nix index 339a62e..cd68386 100644 --- a/dot_config/flake/home/fish.nix +++ b/dot_config/flake/home/fish.nix @@ -7,8 +7,11 @@ set -gx DEBEMAIL "tyler@tylermayoff.com" fish_add_path $HOME/.local/bin - - source $HOME/.config/fish/variables-$(hostname).fish + fish_add_path /opt/homebrew/bin + + if test -e $HOME/.config/fish/variables-$(hostname)fish + source $HOME/.config/fish/variables-$(hostname).fish + end bind \cz 'fg 2>/dev/null; commandline -f repaint' zoxide init fish | source @@ -22,7 +25,9 @@ set -xg XDG_DATA_DIRS "$HOME/.nix-profile/share:$XDG_DATA_DIRS" fish_add_path $HOME/.local/bin - source $HOME/.config/fish/variables-$(hostname).fish + if test -e $HOME/.config/fish/variables-$(hostname)fish + source $HOME/.config/fish/variables-$(hostname).fish + end ''; # functions = { diff --git a/dot_config/flake/home/hinge/hinge.nix b/dot_config/flake/home/hinge/hinge.nix index 4a283eb..a21a4d8 100644 --- a/dot_config/flake/home/hinge/hinge.nix +++ b/dot_config/flake/home/hinge/hinge.nix @@ -6,8 +6,14 @@ pkgs, ... }: { - # imports = [../common.nix]; + imports = [../common.nix]; + + home.username =lib.mkForce "tyler.mayoff"; + home.homeDirectory = lib.mkForce "/Users/tyler.mayoff"; home.packages = with pkgs; [ ]; + + # home.stateVersion = "23.11"; + }