Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ jobs:
- uses: cachix/cachix-action@v10
with:
name: mjlbach
# - name: Run Flake Checks
# if: ${{ matrix.os == 'ubuntu-latest' }}
# run: |
# nix flake check -v --show-trace --no-build
# timeout-minutes: 240
- name: Run Flake Checks
if: ${{ matrix.os == 'ubuntu-latest' }}
run: |
nix flake check -vv --show-trace --no-build
timeout-minutes: 240
- name: Run Flake show
run: |
nix flake show
Expand Down
39 changes: 24 additions & 15 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
(final: prev: { doomEmacsRevision = doom-emacs.rev; })
(final: prev: { home-manager = home-manager.packages.${system}.home-manager; })
(import ./nixpkgs/overlays/bins.nix)
(final: prev: {
awscli2 = prev.awscli2.overrideAttrs (oldAttrs: {
doCheck = false;
});
})
# (final: prev: {
# awscli2 = prev.awscli2.overrideAttrs (oldAttrs: {
# doCheck = false;
# });
# })
] ++ (if system == "aarch64-darwin" then [ M1Overlay ] else [ ]);
mkHomeConfig =
{ username
Expand All @@ -65,21 +65,30 @@
(system: {
name = system;
value = {
linux = self.homeConfigurations.chris-3900x.activationPackage;
linux = self.homeConfigurations.testConf.activationPackage;
};
})
[ "x86_64-linux" ]) ++
(map
(system: {
name = system;
value = {
mac = self.homeConfigurations.C02VJ07FHV2Jlocal.activationPackage;
};
})
nixpkgs.lib.platforms.darwin)
[ "x86_64-linux" ])
# ++
# (map
# (system: {
# name = system;
# value = {
# mac = self.homeConfigurations.C02VJ07FHV2Jlocal.activationPackage;
# };
# })
# nixpkgs.lib.platforms.darwin)
);

homeConfigurations = {
testConf = homeManagerConfiguration rec {
username = "test";
system = "x86_64-linux";
homeDirectory = "${homePrefix system}/${username}";
configuration = {
imports = [ ];
};
};
chris-3900x = mkHomeConfig {
username = "chris";
baseModules = [
Expand Down