Skip to content

Commit

Permalink
Using in macOS is much pain
Browse files Browse the repository at this point in the history
Follow GH-911 and GH-913 with nix-init 0.3.2 failing in intel macOS
  • Loading branch information
kachick committed Nov 18, 2024
1 parent eb9d9de commit 9855e11
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 26 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/ci-nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,6 @@ jobs:
# https://github.com/kachick/dotfiles/pull/718#issuecomment-2266331003
if: runner.os == 'Linux'
- run: nix develop --command makers ci-dev
if: runner.os == 'Linux'
- run: nix develop --command makers ci-darwin
if: runner.os == 'macOS'
7 changes: 7 additions & 0 deletions Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,13 @@ dependencies = [
'fmt',
]

# Basically giveup to develop on macOS. However I need to use task-runner for minimum use.
[tasks.ci-darwin]
command = 'makers'
args = [
'--version',
]

[tasks.build-container]
command = './containers/build.bash'

Expand Down
59 changes: 33 additions & 26 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -106,36 +106,43 @@
(with pkgs; [
# https://github.com/NixOS/nix/issues/730#issuecomment-162323824
bashInteractive
nixfmt-rfc-style
nixpkgs-lint-community
nix-init
nurl
hydra-check # Background and how to use: https://github.com/kachick/dotfiles/pull/909#issuecomment-2453389909

shellcheck
shfmt
gitleaks
cargo-make
])
++ (
pkgs.lib.optionals pkgs.stdenv.isLinux (
with pkgs;
[
nixfmt-rfc-style
nixpkgs-lint-community
nix-init
nurl
hydra-check # Background and how to use: https://github.com/kachick/dotfiles/pull/909#issuecomment-2453389909

dprint
stylua
typos
typos-lsp # For zed-editor typos extension
go_1_23
goreleaser
trivy
shellcheck
shfmt

(ruby_3_3.withPackages (ps: with ps; [ rubocop ]))
])
++ (with edge-pkgs; [
nixd
# Don't use treefmt(treefmt1) that does not have crucial feature to cover hidden files
# https://github.com/numtide/treefmt/pull/250
treefmt2
markdownlint-cli2
])
++ (with homemade-pkgs; [ nix-hash-url ])
++ [ inputs.selfup.packages.${system}.default ];
dprint
stylua
typos
typos-lsp # For zed-editor typos extension
go_1_23
goreleaser
trivy

(ruby_3_3.withPackages (ps: with ps; [ rubocop ]))
]
)
++ (with edge-pkgs; [
nixd
# Don't use treefmt(treefmt1) that does not have crucial feature to cover hidden files
# https://github.com/numtide/treefmt/pull/250
treefmt2
markdownlint-cli2
])
++ (with homemade-pkgs; [ nix-hash-url ])
++ [ inputs.selfup.packages.${system}.default ]
);
};
}
);
Expand Down

0 comments on commit 9855e11

Please sign in to comment.