diff --git a/flake.nix b/flake.nix index a9317dbb4bc952f69ece364e28d9b22184513ae5..46386565e2b359f5630120d51a68f30d2d343549 100644 --- a/flake.nix +++ b/flake.nix @@ -67,13 +67,9 @@ }; }); }) - # https://github.com/NixOS/nixpkgs/issues/476669#issuecomment-3707850520 + # https://github.com/NixOS/nixpkgs/issues/484618#issuecomment-3827163603 (_: prev: { vesktop = prev.vesktop.overrideAttrs (_: { - preBuild = '' - cp -r ${prev.electron.dist} electron-dist - chmod -R u+w electron-dist - ''; buildPhase = '' runHook preBuild @@ -81,8 +77,9 @@ pnpm exec electron-builder \ --dir \ -c.asarUnpack="**/*.node" \ - -c.electronDist="electron-dist" \ - -c.electronVersion=${prev.electron.version} + -c.electronDist=${if prev.stdenv.hostPlatform.isDarwin then "." else "electron-dist"} \ + -c.electronVersion=${prev.electron.version} \ + ${prev.lib.optionalString prev.stdenv.hostPlatform.isDarwin "-c.mac.identity=null"} runHook postBuild ''; diff --git a/modules/macos/tiling/aerospace.nix b/modules/macos/tiling/aerospace.nix index b3acf3cd90601a1302a9a4a592abd653215d10e0..a18b269632c85ffed1cb14406c4c56406bd65a84 100644 --- a/modules/macos/tiling/aerospace.nix +++ b/modules/macos/tiling/aerospace.nix @@ -34,7 +34,7 @@ outer = { left = 0; bottom = 0; - top = 40; + top = 10; right = 0; }; }; diff --git a/users/natalie/home.nix b/users/natalie/home.nix index 1001ee382ad204cee304754fa57b626df11e4f0b..c59a8a0392a563ed6331e1976b54be3917bcfc32 100644 --- a/users/natalie/home.nix +++ b/users/natalie/home.nix @@ -31,10 +31,6 @@ }; }; # sort-lines:end - ghostty = { - enable = true; - settings.theme = "Catppuccin Mocha"; - }; fish = { shellAliases = diff --git a/users/natalie/home/vicinae.nix b/users/natalie/home/vicinae.nix index 132ed839a7ca552bb1923bc5f6dbbe537c05cf3e..6dc91ed649bd1df50ebf4148fb369670b2623108 100644 --- a/users/natalie/home/vicinae.nix +++ b/users/natalie/home/vicinae.nix @@ -1,7 +1,13 @@ -{ inputs, pkgs, ... }: +{ + inputs, + pkgs, + lib, + host, + ... +}: { services.vicinae = { - enable = true; + enable = host.linux; systemd = { enable = true; autoStart = true; diff --git a/users/natalie/laptop/configuration.nix b/users/natalie/laptop/configuration.nix index c124b21ea2b115f101a54a6271f2750b7e70344d..6ad204a544a8351c5c28abedb90b896f59f8f803 100644 --- a/users/natalie/laptop/configuration.nix +++ b/users/natalie/laptop/configuration.nix @@ -7,7 +7,7 @@ # Custom configuration modules in "modules" are shared between users, # and can be configured in this "shared" namespace shared.darwin = { - macAppStoreApps = [ "wireguard" ]; +# macAppStoreApps = [ "wireguard" ]; }; system.defaults.NSGlobalDomain."com.apple.trackpad.scaling" = 1.0; @@ -40,7 +40,7 @@ casks = [ "battle-net" "stremio" - "alt-tab" +# "alt-tab" "legcord" "zulip" "zen" diff --git a/users/natalie/laptop/home.nix b/users/natalie/laptop/home.nix index 6974967997ae41ad67f2d9f53fe434226411dae3..8b2dd291b777b872af4efea6573f247a89a1efb6 100644 --- a/users/natalie/laptop/home.nix +++ b/users/natalie/laptop/home.nix @@ -8,6 +8,9 @@ ... }@args: { + programs.atuin = { + settings.data_dir = "/Users/${user.username}/.local/share/atuin"; + }; home = { stateVersion = "23.05"; # Please read the comment before changing. # shell = pkgs.fish;