my nix dotfiles

nix: some darwin changes

+59 -126
+1 -1
darwin/home.nix
··· 23 23 }; 24 24 25 25 home.packages = with pkgs; [ 26 - prompt 26 + # prompt 27 27 tmux 28 28 git 29 29 fzy
+27 -108
flake.lock
··· 39 39 }, 40 40 "crane_2": { 41 41 "locked": { 42 - "lastModified": 1734324364, 43 - "narHash": "sha256-omYTR59TdH0AumP1cfh49fBnWZ52HjfdNfaLzCMZBx0=", 42 + "lastModified": 1736898272, 43 + "narHash": "sha256-D10wlrU/HCpSRcb3a7yk+bU3ggpMD1kGbseKtO+7teo=", 44 44 "owner": "ipetkov", 45 45 "repo": "crane", 46 - "rev": "60d7623f1320470bf2fdb92fd2dca1e9a27b98ce", 46 + "rev": "6a589f034202a7c6e10bce6c5d1d392d7bc0f340", 47 47 "type": "github" 48 48 }, 49 49 "original": { ··· 59 59 ] 60 60 }, 61 61 "locked": { 62 - "lastModified": 1736631212, 63 - "narHash": "sha256-mG9lRZBcPiAGiVJ9B97BJoIGQcSBWIVlBiN30QYCtG0=", 62 + "lastModified": 1738743987, 63 + "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", 64 64 "owner": "lnl7", 65 65 "repo": "nix-darwin", 66 - "rev": "6ace2f2d12bdf74235d5cbf9fbd34a71c9716685", 66 + "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", 67 67 "type": "github" 68 68 }, 69 69 "original": { ··· 74 74 } 75 75 }, 76 76 "flake-compat": { 77 - "flake": false, 78 77 "locked": { 79 78 "lastModified": 1733328505, 80 79 "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", ··· 89 88 "type": "github" 90 89 } 91 90 }, 92 - "flake-compat_2": { 93 - "locked": { 94 - "lastModified": 1733328505, 95 - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", 96 - "owner": "edolstra", 97 - "repo": "flake-compat", 98 - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", 99 - "type": "github" 100 - }, 101 - "original": { 102 - "owner": "edolstra", 103 - "repo": "flake-compat", 104 - "type": "github" 105 - } 106 - }, 107 - "flake-parts": { 108 - "inputs": { 109 - "nixpkgs-lib": [ 110 - "nix-snapshotter", 111 - "nixpkgs" 112 - ] 113 - }, 114 - "locked": { 115 - "lastModified": 1733312601, 116 - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", 117 - "owner": "hercules-ci", 118 - "repo": "flake-parts", 119 - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", 120 - "type": "github" 121 - }, 122 - "original": { 123 - "owner": "hercules-ci", 124 - "repo": "flake-parts", 125 - "type": "github" 126 - } 127 - }, 128 - "globset": { 129 - "inputs": { 130 - "nixpkgs-lib": [ 131 - "nix-snapshotter", 132 - "nixpkgs" 133 - ] 134 - }, 135 - "locked": { 136 - "lastModified": 1729844927, 137 - "narHash": "sha256-nBkQx23jgpGPk3aU2KcqJCoYvzjsKEjWBePmc2z8N3k=", 138 - "owner": "pdtpartners", 139 - "repo": "globset", 140 - "rev": "eb9d9e64b7ab0a64c34ba4a5a990b66506401c35", 141 - "type": "github" 142 - }, 143 - "original": { 144 - "owner": "pdtpartners", 145 - "repo": "globset", 146 - "type": "github" 147 - } 148 - }, 149 91 "home-manager": { 150 92 "inputs": { 151 93 "nixpkgs": [ ··· 153 95 ] 154 96 }, 155 97 "locked": { 156 - "lastModified": 1736508663, 157 - "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", 98 + "lastModified": 1738841109, 99 + "narHash": "sha256-sEgE3nifaRU5gfAx33ds0tx/j+qM0/5/bHopv/w6c0c=", 158 100 "owner": "nix-community", 159 101 "repo": "home-manager", 160 - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", 102 + "rev": "f99c704fe3a4cf8d72b2d568ec80bc38be1a9407", 161 103 "type": "github" 162 104 }, 163 105 "original": { ··· 166 108 "type": "github" 167 109 } 168 110 }, 169 - "nix-snapshotter": { 170 - "inputs": { 171 - "flake-compat": "flake-compat", 172 - "flake-parts": "flake-parts", 173 - "globset": "globset", 174 - "nixpkgs": [ 175 - "nixpkgs" 176 - ] 177 - }, 178 - "locked": { 179 - "lastModified": 1734289443, 180 - "narHash": "sha256-oU3AGvzByR7622kntPUPIHfAreOIktAsJav2ATHuc18=", 181 - "owner": "pdtpartners", 182 - "repo": "nix-snapshotter", 183 - "rev": "387e220d369dfa0ad093035515e8757f83144be8", 184 - "type": "github" 185 - }, 186 - "original": { 187 - "owner": "pdtpartners", 188 - "repo": "nix-snapshotter", 189 - "type": "github" 190 - } 191 - }, 192 111 "nix-your-shell": { 193 112 "inputs": { 194 113 "advisory-db": "advisory-db", ··· 214 133 }, 215 134 "nixos-hardware": { 216 135 "locked": { 217 - "lastModified": 1736441705, 218 - "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", 136 + "lastModified": 1738816619, 137 + "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", 219 138 "owner": "nixos", 220 139 "repo": "nixos-hardware", 221 - "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", 140 + "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", 222 141 "type": "github" 223 142 }, 224 143 "original": { ··· 229 148 }, 230 149 "nixpkgs": { 231 150 "locked": { 232 - "lastModified": 1736344531, 233 - "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", 151 + "lastModified": 1738680400, 152 + "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", 234 153 "owner": "NixOS", 235 154 "repo": "nixpkgs", 236 - "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", 155 + "rev": "799ba5bffed04ced7067a91798353d360788b30d", 237 156 "type": "github" 238 157 }, 239 158 "original": { ··· 245 164 }, 246 165 "nixpkgs-master": { 247 166 "locked": { 248 - "lastModified": 1736670437, 249 - "narHash": "sha256-h25ZrAPN/iDrc16r0nixXHO7nmWGr/vk83qZFTrQLJ8=", 167 + "lastModified": 1738839627, 168 + "narHash": "sha256-RerTWFfO7HJlDnxwJR+Wt9UWo8RYXisOUqHJyU1SdxM=", 250 169 "owner": "NixOS", 251 170 "repo": "nixpkgs", 252 - "rev": "55d267b7cc835faca7872b58cff9e5cfb73419be", 171 + "rev": "16c225539220d31bee2f5696b22853504452708f", 253 172 "type": "github" 254 173 }, 255 174 "original": { ··· 268 187 "locked": { 269 188 "lastModified": 1701510523, 270 189 "narHash": "sha256-uf0JCa+PP/aM77icihT79hew1/TTcMJV6AoIfmuLABM=", 271 - "ref": "refs/heads/master", 190 + "ref": "master", 272 191 "rev": "9450828084f42d3f1eb261c00820cfd2bf8b819b", 273 192 "revCount": 7, 274 193 "type": "git", 275 194 "url": "https://git.peppe.rs/cli/prompt" 276 195 }, 277 196 "original": { 197 + "ref": "master", 278 198 "type": "git", 279 199 "url": "https://git.peppe.rs/cli/prompt" 280 200 } ··· 283 203 "inputs": { 284 204 "darwin": "darwin", 285 205 "home-manager": "home-manager", 286 - "nix-snapshotter": "nix-snapshotter", 287 206 "nix-your-shell": "nix-your-shell", 288 207 "nixos-hardware": "nixos-hardware", 289 208 "nixpkgs": "nixpkgs", ··· 300 219 ] 301 220 }, 302 221 "locked": { 303 - "lastModified": 1734316514, 304 - "narHash": "sha256-0aLx44yMblcOGpfFXKCzp2GhU5JaE6OTvdU+JYrXiUc=", 222 + "lastModified": 1737166965, 223 + "narHash": "sha256-vlDROBAgq+7PEVM0vaS2zboY6DXs3oKK0qW/1dVuFs4=", 305 224 "owner": "oxalica", 306 225 "repo": "rust-overlay", 307 - "rev": "83ee8ff74d6294a7657320f16814754c4594127b", 226 + "rev": "fc839c9d5d1ebc789b4657c43c4d54838c7c01de", 308 227 "type": "github" 309 228 }, 310 229 "original": { ··· 331 250 "zed": { 332 251 "inputs": { 333 252 "crane": "crane_2", 334 - "flake-compat": "flake-compat_2", 253 + "flake-compat": "flake-compat", 335 254 "nixpkgs": [ 336 255 "nixpkgs" 337 256 ], 338 257 "rust-overlay": "rust-overlay" 339 258 }, 340 259 "locked": { 341 - "lastModified": 1736649688, 342 - "narHash": "sha256-uWgQQSACXQfOhW8wTMWLyVLWH3if2HjvMf+Al2MyuY4=", 260 + "lastModified": 1738836742, 261 + "narHash": "sha256-Ck3lkhPEsWo2HgNIiG26wTpY7NASwsufwT/Hr2i4Ax8=", 343 262 "owner": "zed-industries", 344 263 "repo": "zed", 345 - "rev": "61115bd04792d87a540558753cd01a6368baba2a", 264 + "rev": "b4d8b1be3f1eb2d1eea4bd9585affbd437986de8", 346 265 "type": "github" 347 266 }, 348 267 "original": {
+1 -5
flake.nix
··· 18 18 }; 19 19 20 20 prompt = { 21 - url = "git+https://git.peppe.rs/cli/prompt"; 21 + url = "git+https://git.peppe.rs/cli/prompt?ref=master"; 22 22 inputs.nixpkgs.follows = "nixpkgs"; 23 23 }; 24 24 25 - nix-snapshotter = { 26 - url = "github:pdtpartners/nix-snapshotter"; 27 - inputs.nixpkgs.follows = "nixpkgs"; 28 - }; 29 25 30 26 nix-your-shell = { 31 27 url = "github:MercuryTechnologies/nix-your-shell";
+26 -6
hosts/kvothe/configuration.nix
··· 14 14 15 15 services.nix-daemon.enable = true; 16 16 security.pam.enableSudoTouchIdAuth = true; 17 + 18 + system.stateVersion = 5; 17 19 18 20 system.activationScripts.applications.text = pkgs.lib.mkForce ( 21 + # '' 22 + # echo "setting up ~/Applications..." >&2 23 + # rm -rf ~/Applications/Nix\ Apps 24 + # mkdir -p ~/Applications/Nix\ Apps 25 + # for app in $(find ${config.system.build.applications}/Applications -maxdepth 1 -type l); do 26 + # src="$(/usr/bin/stat -f%Y "$app")" 27 + # cp -r "$src" ~/Applications/Nix\ Apps 28 + # done 29 + # '' 30 + 19 31 '' 20 - echo "setting up ~/Applications..." >&2 21 - rm -rf ~/Applications/Nix\ Apps 22 - mkdir -p ~/Applications/Nix\ Apps 23 - for app in $(find ${config.system.build.applications}/Applications -maxdepth 1 -type l); do 24 - src="$(/usr/bin/stat -f%Y "$app")" 25 - cp -r "$src" ~/Applications/Nix\ Apps 32 + echo "setting up /Applications..." >&2 33 + rm -rf /Applications/Nix\ Apps 34 + mkdir -p /Applications/Nix\ Apps 35 + find ${ 36 + pkgs.buildEnv { 37 + name = "system-applications"; 38 + paths = config.environment.systemPackages; 39 + pathsToLink = "/Applications"; 40 + } 41 + }/Applications -maxdepth 1 -type l -exec readlink '{}' + | 42 + while read -r src; do 43 + app_name=$(basename "$src") 44 + echo "copying $src" >&2 45 + ${pkgs.mkalias}/bin/mkalias "$src" "/Applications/Nix Apps/$app_name" 26 46 done 27 47 '' 28 48 );
+1 -1
programs/common.nix
··· 16 16 ./alacritty.nix 17 17 ./fish.nix 18 18 ./zed/default.nix 19 - ./ghostty.nix 19 + # ./ghostty.nix 20 20 ]; 21 21 22 22 programs = {
+3 -3
programs/fish.nix
··· 11 11 set fish_greeting # Disable greeting 12 12 ''; 13 13 functions = { 14 - fish_prompt = '' 15 - printf '\n\001\002▲\001\002 ' 16 - ''; 14 + # fish_prompt = '' 15 + # printf '\n\001\002▲\001\002 ' 16 + # ''; 17 17 ggp = '' 18 18 if test "$argv[1]" = "-f" 19 19 git push (git remote show) -f (git branch --show-current)
-2
programs/tmux.nix
··· 86 86 set -g window-status-format "#[fg=colour8] #W" 87 87 88 88 set -g status-left-length 100 89 - set -ag status-left "#[fg=colour8]cwd #[fg=colour15]#(${pkgs.prompt}/bin/prompt cwd #{pane_current_path}) " 90 - set -ag status-left "#[fg=colour8]#(${pkgs.prompt}/bin/prompt vcs #{pane_current_path}) " 91 89 92 90 # dim inactive pane 93 91 set -g window-style 'fg=color8,bg=default'