diff --git a/.dev/default.nix b/.dev/default.nix index 07502a96..e50b3389 100644 --- a/.dev/default.nix +++ b/.dev/default.nix @@ -1,4 +1,5 @@ { + lib, nixidy, pkgs, }: @@ -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" diff --git a/flake.nix b/flake.nix index a7d584c5..9b843e71 100644 --- a/flake.nix +++ b/flake.nix @@ -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; }; }; diff --git a/home/work-macos.nix b/home/work-macos.nix index a918ff78..83bedd6b 100644 --- a/home/work-macos.nix +++ b/home/work-macos.nix @@ -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 ''; }; diff --git a/systems/fr6np4lhy7/default.nix b/systems/fr6np4lhy7/default.nix index 369f678d..93269ba0 100644 --- a/systems/fr6np4lhy7/default.nix +++ b/systems/fr6np4lhy7/default.nix @@ -18,9 +18,9 @@ revision: homebrew = { enable = true; casks = [ - "google-chrome" "drawio" - "logseq" + "google-chrome" + "karbiner-elements" "microsoft-edge" "obsidian" "onedrive"