Skip to content

Commit

Permalink
dev: move doas-sudo-shim to non darwin optional
Browse files Browse the repository at this point in the history
Signed-off-by: aserowy <serowy@hotmail.com>
  • Loading branch information
aserowy committed Nov 26, 2024
1 parent 08e08f6 commit 5c29f8e
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 21 deletions.
39 changes: 21 additions & 18 deletions .dev/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
lib,
nixidy,
pkgs,
}:
Expand All @@ -19,24 +20,26 @@ let
};
};
in
with pkgs;
mkShell {
packages = [
doas-sudo-shim
kubectl
marksman
nixd
nixidy.packages.${pkgs.system}.default
nixfmt-rfc-style
nodejs_20
nodePackages.prettier
nodePackages.vscode-json-languageserver
nufmt
sops
stylua
sumneko-lua-language-server
taplo
];
pkgs.mkShell {
packages =
[
pkgs.kubectl
pkgs.marksman
pkgs.nixd
nixidy.packages.${pkgs.system}.default
pkgs.nixfmt-rfc-style
pkgs.nodejs_20
pkgs.nodePackages.prettier
pkgs.nodePackages.vscode-json-languageserver
pkgs.nufmt
pkgs.sops
pkgs.stylua
pkgs.sumneko-lua-language-server
pkgs.taplo
]
++ lib.optionals (!pkgs.stdenv.isDarwin) [
pkgs.doas-sudo-shim
];

shellHook = ''
echo "generate cilium"
Expand Down
2 changes: 2 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,12 @@
devShells = {
aarch64-darwin.default = import ./.dev {
inherit nixidy;
lib = nixpkgs.lib;
pkgs = nixpkgs.legacyPackages.aarch64-darwin;
};
x86_64-linux.default = import ./.dev {
inherit nixidy;
lib = nixpkgs.lib;
pkgs = nixpkgs.legacyPackages.x86_64-linux;
};
};
Expand Down
1 change: 0 additions & 1 deletion home/work-macos.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

".zshrc".source = builtins.toFile "user-zshrc" ''
export PATH=/run/current-system/sw/bin:/etc/profiles/per-user/alexander.serowy/bin:$PATH
nu; exit
'';
};
Expand Down
4 changes: 2 additions & 2 deletions systems/fr6np4lhy7/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ revision:
homebrew = {
enable = true;
casks = [
"google-chrome"
"drawio"
"logseq"
"google-chrome"
"karbiner-elements"
"microsoft-edge"
"obsidian"
"onedrive"
Expand Down

0 comments on commit 5c29f8e

Please sign in to comment.