nix: some darwin changes
Anirudh Oppiliappan x@icyphox.sh
Mon, 10 Feb 2025 14:01:23 +0200
7 files changed,
59 insertions(+),
126 deletions(-)
M
darwin/home.nix
→
darwin/home.nix
@@ -23,7 +23,7 @@ };
}; home.packages = with pkgs; [ - prompt + # prompt tmux git fzy
M
flake.lock
→
flake.lock
@@ -39,11 +39,11 @@ }
}, "crane_2": { "locked": { - "lastModified": 1734324364, - "narHash": "sha256-omYTR59TdH0AumP1cfh49fBnWZ52HjfdNfaLzCMZBx0=", + "lastModified": 1736898272, + "narHash": "sha256-D10wlrU/HCpSRcb3a7yk+bU3ggpMD1kGbseKtO+7teo=", "owner": "ipetkov", "repo": "crane", - "rev": "60d7623f1320470bf2fdb92fd2dca1e9a27b98ce", + "rev": "6a589f034202a7c6e10bce6c5d1d392d7bc0f340", "type": "github" }, "original": {@@ -59,11 +59,11 @@ "nixpkgs"
] }, "locked": { - "lastModified": 1736631212, - "narHash": "sha256-mG9lRZBcPiAGiVJ9B97BJoIGQcSBWIVlBiN30QYCtG0=", + "lastModified": 1738743987, + "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "6ace2f2d12bdf74235d5cbf9fbd34a71c9716685", + "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", "type": "github" }, "original": {@@ -74,7 +74,6 @@ "type": "github"
} }, "flake-compat": { - "flake": false, "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",@@ -89,63 +88,6 @@ "repo": "flake-compat",
"type": "github" } }, - "flake-compat_2": { - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "nix-snapshotter", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "globset": { - "inputs": { - "nixpkgs-lib": [ - "nix-snapshotter", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729844927, - "narHash": "sha256-nBkQx23jgpGPk3aU2KcqJCoYvzjsKEjWBePmc2z8N3k=", - "owner": "pdtpartners", - "repo": "globset", - "rev": "eb9d9e64b7ab0a64c34ba4a5a990b66506401c35", - "type": "github" - }, - "original": { - "owner": "pdtpartners", - "repo": "globset", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [@@ -153,11 +95,11 @@ "nixpkgs"
] }, "locked": { - "lastModified": 1736508663, - "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", + "lastModified": 1738841109, + "narHash": "sha256-sEgE3nifaRU5gfAx33ds0tx/j+qM0/5/bHopv/w6c0c=", "owner": "nix-community", "repo": "home-manager", - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", + "rev": "f99c704fe3a4cf8d72b2d568ec80bc38be1a9407", "type": "github" }, "original": {@@ -166,29 +108,6 @@ "repo": "home-manager",
"type": "github" } }, - "nix-snapshotter": { - "inputs": { - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "globset": "globset", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1734289443, - "narHash": "sha256-oU3AGvzByR7622kntPUPIHfAreOIktAsJav2ATHuc18=", - "owner": "pdtpartners", - "repo": "nix-snapshotter", - "rev": "387e220d369dfa0ad093035515e8757f83144be8", - "type": "github" - }, - "original": { - "owner": "pdtpartners", - "repo": "nix-snapshotter", - "type": "github" - } - }, "nix-your-shell": { "inputs": { "advisory-db": "advisory-db",@@ -214,11 +133,11 @@ }
}, "nixos-hardware": { "locked": { - "lastModified": 1736441705, - "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", + "lastModified": 1738816619, + "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", + "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", "type": "github" }, "original": {@@ -229,11 +148,11 @@ }
}, "nixpkgs": { "locked": { - "lastModified": 1736344531, - "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "lastModified": 1738680400, + "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "rev": "799ba5bffed04ced7067a91798353d360788b30d", "type": "github" }, "original": {@@ -245,11 +164,11 @@ }
}, "nixpkgs-master": { "locked": { - "lastModified": 1736670437, - "narHash": "sha256-h25ZrAPN/iDrc16r0nixXHO7nmWGr/vk83qZFTrQLJ8=", + "lastModified": 1738839627, + "narHash": "sha256-RerTWFfO7HJlDnxwJR+Wt9UWo8RYXisOUqHJyU1SdxM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d267b7cc835faca7872b58cff9e5cfb73419be", + "rev": "16c225539220d31bee2f5696b22853504452708f", "type": "github" }, "original": {@@ -268,13 +187,14 @@ },
"locked": { "lastModified": 1701510523, "narHash": "sha256-uf0JCa+PP/aM77icihT79hew1/TTcMJV6AoIfmuLABM=", - "ref": "refs/heads/master", + "ref": "master", "rev": "9450828084f42d3f1eb261c00820cfd2bf8b819b", "revCount": 7, "type": "git", "url": "https://git.peppe.rs/cli/prompt" }, "original": { + "ref": "master", "type": "git", "url": "https://git.peppe.rs/cli/prompt" }@@ -283,7 +203,6 @@ "root": {
"inputs": { "darwin": "darwin", "home-manager": "home-manager", - "nix-snapshotter": "nix-snapshotter", "nix-your-shell": "nix-your-shell", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs",@@ -300,11 +219,11 @@ "nixpkgs"
] }, "locked": { - "lastModified": 1734316514, - "narHash": "sha256-0aLx44yMblcOGpfFXKCzp2GhU5JaE6OTvdU+JYrXiUc=", + "lastModified": 1737166965, + "narHash": "sha256-vlDROBAgq+7PEVM0vaS2zboY6DXs3oKK0qW/1dVuFs4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "83ee8ff74d6294a7657320f16814754c4594127b", + "rev": "fc839c9d5d1ebc789b4657c43c4d54838c7c01de", "type": "github" }, "original": {@@ -331,18 +250,18 @@ },
"zed": { "inputs": { "crane": "crane_2", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "nixpkgs": [ "nixpkgs" ], "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1736649688, - "narHash": "sha256-uWgQQSACXQfOhW8wTMWLyVLWH3if2HjvMf+Al2MyuY4=", + "lastModified": 1738836742, + "narHash": "sha256-Ck3lkhPEsWo2HgNIiG26wTpY7NASwsufwT/Hr2i4Ax8=", "owner": "zed-industries", "repo": "zed", - "rev": "61115bd04792d87a540558753cd01a6368baba2a", + "rev": "b4d8b1be3f1eb2d1eea4bd9585affbd437986de8", "type": "github" }, "original": {
M
flake.nix
→
flake.nix
@@ -18,14 +18,10 @@ inputs.nixpkgs.follows = "nixpkgs";
}; prompt = { - url = "git+https://git.peppe.rs/cli/prompt"; + url = "git+https://git.peppe.rs/cli/prompt?ref=master"; inputs.nixpkgs.follows = "nixpkgs"; }; - nix-snapshotter = { - url = "github:pdtpartners/nix-snapshotter"; - inputs.nixpkgs.follows = "nixpkgs"; - }; nix-your-shell = { url = "github:MercuryTechnologies/nix-your-shell";
M
hosts/kvothe/configuration.nix
→
hosts/kvothe/configuration.nix
@@ -14,15 +14,35 @@ };
services.nix-daemon.enable = true; security.pam.enableSudoTouchIdAuth = true; + + system.stateVersion = 5; system.activationScripts.applications.text = pkgs.lib.mkForce ( + # '' + # echo "setting up ~/Applications..." >&2 + # rm -rf ~/Applications/Nix\ Apps + # mkdir -p ~/Applications/Nix\ Apps + # for app in $(find ${config.system.build.applications}/Applications -maxdepth 1 -type l); do + # src="$(/usr/bin/stat -f%Y "$app")" + # cp -r "$src" ~/Applications/Nix\ Apps + # done + # '' + '' - echo "setting up ~/Applications..." >&2 - rm -rf ~/Applications/Nix\ Apps - mkdir -p ~/Applications/Nix\ Apps - for app in $(find ${config.system.build.applications}/Applications -maxdepth 1 -type l); do - src="$(/usr/bin/stat -f%Y "$app")" - cp -r "$src" ~/Applications/Nix\ Apps + echo "setting up /Applications..." >&2 + rm -rf /Applications/Nix\ Apps + mkdir -p /Applications/Nix\ Apps + find ${ + pkgs.buildEnv { + name = "system-applications"; + paths = config.environment.systemPackages; + pathsToLink = "/Applications"; + } + }/Applications -maxdepth 1 -type l -exec readlink '{}' + | + while read -r src; do + app_name=$(basename "$src") + echo "copying $src" >&2 + ${pkgs.mkalias}/bin/mkalias "$src" "/Applications/Nix Apps/$app_name" done '' );
M
programs/common.nix
→
programs/common.nix
@@ -16,7 +16,7 @@ ./ssh.nix
./alacritty.nix ./fish.nix ./zed/default.nix - ./ghostty.nix +# ./ghostty.nix ]; programs = {
M
programs/fish.nix
→
programs/fish.nix
@@ -11,9 +11,9 @@ nix-your-shell fish | source
set fish_greeting # Disable greeting ''; functions = { - fish_prompt = '' - printf '\n\001\002▲\001\002 ' - ''; + # fish_prompt = '' + # printf '\n\001\002▲\001\002 ' + # ''; ggp = '' if test "$argv[1]" = "-f" git push (git remote show) -f (git branch --show-current)
M
programs/tmux.nix
→
programs/tmux.nix
@@ -86,8 +86,6 @@ set -g window-status-current-format "#[fg=colour15] #W"
set -g window-status-format "#[fg=colour8] #W" set -g status-left-length 100 - set -ag status-left "#[fg=colour8]cwd #[fg=colour15]#(${pkgs.prompt}/bin/prompt cwd #{pane_current_path}) " - set -ag status-left "#[fg=colour8]#(${pkgs.prompt}/bin/prompt vcs #{pane_current_path}) " # dim inactive pane set -g window-style 'fg=color8,bg=default'