| author | |
| committer | |
| log | 26468a201675fa97bc68e8ae64408e0321ba85c0 |
| tree | b538cac26c6d70dc8d5bc179f0630b49ce6e1236 |
| parent | 38ecddb9d7b4a813b0ddf5a81957800acb3d275c |
| signature | Commit is signed but in an unrecognized format. |
6 files changed, 18 insertions(+), 16 deletions(-)
flake.nix+4-7| ... | @@ -67,13 +67,9 @@ | ... | @@ -67,13 +67,9 @@ |
| 67 | }; | 67 | }; |
| 68 | }); | 68 | }); |
| 69 | }) | 69 | }) |
| 70 | # https://github.com/NixOS/nixpkgs/issues/476669#issuecomment-3707850520 | 70 | # https://github.com/NixOS/nixpkgs/issues/484618#issuecomment-3827163603 |
| 71 | (_: prev: { | 71 | (_: prev: { |
| 72 | vesktop = prev.vesktop.overrideAttrs (_: { | 72 | vesktop = prev.vesktop.overrideAttrs (_: { |
| 73 | preBuild = '' | ||
| 74 | cp -r ${prev.electron.dist} electron-dist | ||
| 75 | chmod -R u+w electron-dist | ||
| 76 | ''; | ||
| 77 | buildPhase = '' | 73 | buildPhase = '' |
| 78 | runHook preBuild | 74 | runHook preBuild |
| 79 | 75 | ||
| ... | @@ -81,8 +77,9 @@ | ... | @@ -81,8 +77,9 @@ |
| 81 | pnpm exec electron-builder \ | 77 | pnpm exec electron-builder \ |
| 82 | --dir \ | 78 | --dir \ |
| 83 | -c.asarUnpack="**/*.node" \ | 79 | -c.asarUnpack="**/*.node" \ |
| 84 | -c.electronDist="electron-dist" \ | 80 | -c.electronDist=${if prev.stdenv.hostPlatform.isDarwin then "." else "electron-dist"} \ |
| 85 | -c.electronVersion=${prev.electron.version} | 81 | -c.electronVersion=${prev.electron.version} \ |
| 82 | ${prev.lib.optionalString prev.stdenv.hostPlatform.isDarwin "-c.mac.identity=null"} | ||
| 86 | 83 | ||
| 87 | runHook postBuild | 84 | runHook postBuild |
| 88 | ''; | 85 | ''; |
modules/macos/tiling/aerospace.nix+1-1| ... | @@ -34,7 +34,7 @@ | ... | @@ -34,7 +34,7 @@ |
| 34 | outer = { | 34 | outer = { |
| 35 | left = 0; | 35 | left = 0; |
| 36 | bottom = 0; | 36 | bottom = 0; |
| 37 | top = 40; | 37 | top = 10; |
| 38 | right = 0; | 38 | right = 0; |
| 39 | }; | 39 | }; |
| 40 | }; | 40 | }; |
users/natalie/home.nix-4| ... | @@ -31,10 +31,6 @@ | ... | @@ -31,10 +31,6 @@ |
| 31 | }; | 31 | }; |
| 32 | }; | 32 | }; |
| 33 | # sort-lines:end | 33 | # sort-lines:end |
| 34 | ghostty = { | ||
| 35 | enable = true; | ||
| 36 | settings.theme = "Catppuccin Mocha"; | ||
| 37 | }; | ||
| 38 | 34 | ||
| 39 | fish = { | 35 | fish = { |
| 40 | shellAliases = | 36 | shellAliases = |
users/natalie/home/vicinae.nix+8-2| ... | @@ -1,7 +1,13 @@ | ... | @@ -1,7 +1,13 @@ |
| 1 | { inputs, pkgs, ... }: | 1 | { |
| 2 | inputs, | ||
| 3 | pkgs, | ||
| 4 | lib, | ||
| 5 | host, | ||
| 6 | ... | ||
| 7 | }: | ||
| 2 | { | 8 | { |
| 3 | services.vicinae = { | 9 | services.vicinae = { |
| 4 | enable = true; | 10 | enable = host.linux; |
| 5 | systemd = { | 11 | systemd = { |
| 6 | enable = true; | 12 | enable = true; |
| 7 | autoStart = true; | 13 | autoStart = true; |
users/natalie/laptop/configuration.nix+2-2| ... | @@ -7,7 +7,7 @@ | ... | @@ -7,7 +7,7 @@ |
| 7 | # Custom configuration modules in "modules" are shared between users, | 7 | # Custom configuration modules in "modules" are shared between users, |
| 8 | # and can be configured in this "shared" namespace | 8 | # and can be configured in this "shared" namespace |
| 9 | shared.darwin = { | 9 | shared.darwin = { |
| 10 | macAppStoreApps = [ "wireguard" ]; | 10 | # macAppStoreApps = [ "wireguard" ]; |
| 11 | }; | 11 | }; |
| 12 | 12 | ||
| 13 | system.defaults.NSGlobalDomain."com.apple.trackpad.scaling" = 1.0; | 13 | system.defaults.NSGlobalDomain."com.apple.trackpad.scaling" = 1.0; |
| ... | @@ -40,7 +40,7 @@ | ... | @@ -40,7 +40,7 @@ |
| 40 | casks = [ | 40 | casks = [ |
| 41 | "battle-net" | 41 | "battle-net" |
| 42 | "stremio" | 42 | "stremio" |
| 43 | "alt-tab" | 43 | # "alt-tab" |
| 44 | "legcord" | 44 | "legcord" |
| 45 | "zulip" | 45 | "zulip" |
| 46 | "zen" | 46 | "zen" |
users/natalie/laptop/home.nix+3| ... | @@ -8,6 +8,9 @@ | ... | @@ -8,6 +8,9 @@ |
| 8 | ... | 8 | ... |
| 9 | }@args: | 9 | }@args: |
| 10 | { | 10 | { |
| 11 | programs.atuin = { | ||
| 12 | settings.data_dir = "/Users/${user.username}/.local/share/atuin"; | ||
| 13 | }; | ||
| 11 | home = { | 14 | home = { |
| 12 | stateVersion = "23.05"; # Please read the comment before changing. | 15 | stateVersion = "23.05"; # Please read the comment before changing. |
| 13 | # shell = pkgs.fish; | 16 | # shell = pkgs.fish; |