Skip to content

Commit

Permalink
🐛 Fix errors for darwin
Browse files Browse the repository at this point in the history
  • Loading branch information
turtton committed Jan 16, 2025
1 parent 46a1c56 commit 5f7f45e
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion darwin/nix.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
services.nix-daemon.enable = true;

nix = {
optimise.automatic = true;
gc = {
automatic = true;
options = "--delete-older-than 14d";
Expand All @@ -12,7 +13,6 @@
};
};
settings = {
auto-optimise-store = true;
experimental-features = [
"nix-command"
"flakes"
Expand Down
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
sudo nixos-rebuild switch --flake ".#$@" --show-trace
'')
(writeScriptBin "switch-darwin" ''
darwin-rebuild switch --flake ".#$@" --show-trace
nix run nix-darwin -- switch --flake ".#$@" --show-trace
'')
(writeScriptBin "gen-template" ''
nix run github:nix-community/nixos-generators -- -f proxmox-lxc --flake ".#$@" --show-trace
Expand Down
2 changes: 1 addition & 1 deletion home-manager/gui/dev/idea/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ let
in
{
home.packages = with pkgs; [
android-studio
# basically should not use toolbox because of issues(https://github.com/NixOS/nixpkgs/issues/240444) but useful to preview IDE
jetbrains-toolbox
]
++ lib.optionals hostPlatform.isLinux [ android-studio ]
++ (map (ide: (applyPlugins ide)) ides)
++ [ idea ];
home.file.".ideavimrc".source = ./ideavimrc;
Expand Down
5 changes: 2 additions & 3 deletions hosts/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ let
networking.hostName = hostname;
users.users."${username}".home = homeDirectory;
nixpkgs.hostPlatform = system;
system.statueVersion = 5;
system.stateVersion = 5;
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
Expand All @@ -121,9 +121,8 @@ let
inherit username stateVersion homeDirectory;
enableNixpkgsReleaseCheck = true;
};
development.enable = true;
};
specialArgs = {
extraSpecialArgs = {
inherit inputs system username;
};
};
Expand Down
1 change: 0 additions & 1 deletion hosts/dreamac/home-manager.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
./../../home-manager/cli/shell/zsh
./../../home-manager/gui/dev
./../../home-manager/gui/shared/browser.nix
./../../home-manager/gui/shared/keybase.nix
./../../home-manager/gui/shared/media.nix
./../../home-manager/gui/term/alacritty.nix
];
Expand Down

0 comments on commit 5f7f45e

Please sign in to comment.