5 Commits

Author SHA1 Message Date
Noah Masur
a978e67346 comment out spctl allow apps from anywhere
doesn't work when using nh because it requires a UI escalation when
run via indirectly
2025-12-26 10:31:31 -07:00
Noah Masur
a6915a6d2d try to fix nix-darwin breaking starship prompt on rebuild 2025-12-26 10:31:12 -07:00
Noah Masur
44c4034236 more fixes on warning for renamed system 2025-12-26 10:29:18 -07:00
Noah Masur
a99c14a8c2 use stable zed-editor to stop uncached builds 2025-12-26 10:28:31 -07:00
Noah Masur
f1c8e26044 comment out 1password extension while it doesn't work in firefox 2025-12-26 10:27:55 -07:00
7 changed files with 35 additions and 17 deletions

View File

@@ -4,7 +4,8 @@
inputs: _final: prev: { inputs: _final: prev: {
# Provides `pkgs.stable`. # Provides `pkgs.stable`.
stable = import inputs.nixpkgs-stable { stable = import inputs.nixpkgs-stable {
inherit (prev) system config; system = prev.stdenv.hostPlatform.system;
inherit (prev) config;
overlays = [ overlays = [
# inputs.self.overlays.vim-plugins # inputs.self.overlays.vim-plugins
]; ];

View File

@@ -4,7 +4,8 @@
inputs: _final: prev: { inputs: _final: prev: {
# Provides `pkgs.unstable`. # Provides `pkgs.unstable`.
unstable = import inputs.nixpkgs { unstable = import inputs.nixpkgs {
inherit (prev) system config; system = prev.stdenv.hostPlatform.system;
inherit (prev) config;
overlays = [ overlays = [
# inputs.self.overlays.vim-plugins # inputs.self.overlays.vim-plugins
]; ];

View File

@@ -18,16 +18,17 @@ in
"1password" "1password"
"_1password-gui" "_1password-gui"
"1password-cli" "1password-cli"
"onepassword-password-manager" # Firefox extension # "onepassword-password-manager" # Firefox extension
]; ];
home.packages = [ home.packages = [
pkgs._1password-cli pkgs._1password-cli
] ++ (if pkgs.stdenv.isLinux then [ pkgs._1password-gui ] else [ ]); ]
++ (if pkgs.stdenv.isLinux then [ pkgs._1password-gui ] else [ ]);
# Firefox extension # # Firefox extension
programs.firefox.profiles.default.extensions.packages = [ # programs.firefox.profiles.default.extensions.packages = [
pkgs.nur.repos.rycee.firefox-addons.onepassword-password-manager # pkgs.nur.repos.rycee.firefox-addons.onepassword-password-manager
]; # ];
}; };
# # https://1password.community/discussion/135462/firefox-extension-does-not-connect-to-linux-app # # https://1password.community/discussion/135462/firefox-extension-does-not-connect-to-linux-app

View File

@@ -16,6 +16,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
programs.zed-editor = { programs.zed-editor = {
enable = true; enable = true;
package = pkgs.stable.zed-editor;
extensions = [ extensions = [
"nix" "nix"

View File

@@ -26,7 +26,7 @@ in
obsidian = "${pkgs.obsidian}/Applications/Obsidian.app"; obsidian = "${pkgs.obsidian}/Applications/Obsidian.app";
slack = "${pkgs.slack}/Applications/Slack.app"; slack = "${pkgs.slack}/Applications/Slack.app";
wezterm = "${pkgs.wezterm}/Applications/WezTerm.app"; wezterm = "${pkgs.wezterm}/Applications/WezTerm.app";
zed = "${pkgs.zed-editor}/Applications/Zed.app"; zed = "${config.programs.zed-editor.package}/Applications/Zed.app";
}; };
xdg.configFile."hammerspoon/Spoons/MoveWindow.spoon".source = ./Spoons/MoveWindow.spoon; xdg.configFile."hammerspoon/Spoons/MoveWindow.spoon".source = ./Spoons/MoveWindow.spoon;

View File

@@ -23,5 +23,19 @@ in
# Speeds up fish launch time on macOS # Speeds up fish launch time on macOS
programs.fish.useBabelfish = true; programs.fish.useBabelfish = true;
programs.fish.shellInit = ''
set -g __nixos_path_original $PATH
function __nixos_path_fix -d "fix PATH value"
set -l result (string split ":" $__nixos_path_original)
for elt in $PATH
if not contains -- $elt $result
set -a result $elt
end
end
set -g PATH $result
end
__nixos_path_fix
'';
}; };
} }

View File

@@ -96,14 +96,14 @@ in
}; };
}; };
# Settings that don't have an option in nix-darwin # # Settings that don't have an option in nix-darwin
activationScripts.postActivation.text = '' # activationScripts.postActivation.text = ''
echo "Allow apps from anywhere" # echo "Allow apps from anywhere"
SPCTL=$(spctl --status) # SPCTL=$(spctl --status)
if ! [ "$SPCTL" = "assessments disabled" ]; then # if ! [ "$SPCTL" = "assessments disabled" ]; then
sudo spctl --master-disable # spctl --master-disable
fi # fi
''; # '';
}; };