Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add krall (Macbook Pro, x86) #276

Merged
merged 2 commits into from
Aug 1, 2024
Merged

feat: add krall (Macbook Pro, x86) #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b0a6c4
feat: add krall
flexiondotorg Aug 1, 2024
4fb8126
fix: do not install joplin cli on x86_64 darwin; it fails to build
flexiondotorg Aug 1, 2024
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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ These computers are managed by this Nix flake ❄️
| `sidious` | [ThinkPad P1 Gen 1] | [Intel Xeon E-2176M] | 64GB | [NVIDIA Quadro P2000 Max-Q] | Intel UHD Graphics P630 | 💻️🎭️ | ❄️ | ✅ |
| `tanis` | [ThinkPad Z13 Gen 1] | [AMD Ryzen 5 PRO 6650U] | 32GB | AMD Radeon 660M | | 💻️ | ❄️ | ✅ |
| `dooku` | [Macbook Air M2 15"] | Apple M2 8-core CPU | 24GB | Apple M2 10-core GPU | | 💻️ | 🍏 | ✅ |
| `krall` | [Macbook Pro (Mid 2015)] | Intel Core i7 | 16GB | Intel Iris Pro Graphics | | 💻️ | 🍏 | ✅ |
| `steamdeck` | [Steam Deck 64GB LCD] | Zen 2 4c/8t | 16GB | 8 RDNA 2 CUs | | 🎮️ | 🐧 | ✅ |
| `minimech` | [QEMU] | - | - | [VirGL] | | 🐄 | ❄️ | ✅ |
| `scrubber` | [QEMU] | - | - | [VirGL] | | 🐄 | ❄️ | ✅ |
Expand Down
1 change: 1 addition & 0 deletions darwin/krall/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_: { }
13 changes: 8 additions & 5 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,16 +97,15 @@
hostname = "tanis";
desktop = "gnome";
};
# dooku/tyranus are dual boot hosts, macOS and NixOS respectively.
"martin@dooku" = helper.mkHome {
hostname = "dooku";
platform = "aarch64-darwin";
desktop = "aqua";
};
"martin@tyranus" = helper.mkHome {
hostname = "tyranus";
platform = "aarch64-linux";
desktop = "gnome";
"martin@krall" = helper.mkHome {
hostname = "krall";
platform = "x86_64-darwin";
desktop = "aqua";
};
# palpatine/sidious are dual boot hosts, WSL2/Ubuntu and NixOS respectively.
"martin@palpatine" = helper.mkHome { hostname = "palpatine"; };
Expand Down Expand Up @@ -192,6 +191,10 @@
dooku = helper.mkDarwin {
hostname = "dooku";
};
krall = helper.mkDarwin {
hostname = "krall";
platform = "x86_64-darwin";
};
};

# Devshell for bootstrapping; acessible via 'nix develop' or 'nix-shell' (legacy)
Expand Down
3 changes: 3 additions & 0 deletions home-manager/_mixins/desktop/apps/joplin/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
lib,
pkgs,
platform,
username,
...
}:
Expand All @@ -9,9 +10,11 @@ let
inherit (pkgs.stdenv) isLinux;
in
lib.mkIf (lib.elem username installFor) {
# Jopin CLI fails to build on x86_64-darwin
home = {
packages = with pkgs; [
font-awesome_5
] ++ lib.optionals (platform != "x86_64-darwin") [
joplin
];
};
Expand Down