Fix building of home and remove cursor

This commit is contained in:
Greg Hellings
2025-06-10 23:20:00 -05:00
parent f99751ecea
commit 10a0e1d3a9
3 changed files with 44 additions and 35 deletions
+8 -8
View File
@@ -13,10 +13,8 @@ let
allowUnfreePredicate = _: true;
};
});
ivr =
let
system = "aarch64-darwin";
in
user =
system: host: username:
top.hmunstable.lib.homeManagerConfiguration {
pkgs = pkgs system;
modules = [
@@ -24,15 +22,17 @@ let
./home.nix
];
extraSpecialArgs = {
inherit top;
inherit top host username;
nixvim = top.nixvimunstable;
gui = false;
gnome = false;
host = "ivr";
username = "gregory.hellings";
};
};
greg = host: (user "x86_64-linux" host "greg");
in
{
"MacBook-Pro.local" = ivr;
"MacBook-Pro.local" = user "aarch64-darwin" "ivr" "gregory.hellings";
exodus = greg "exodus";
jude = greg "jude";
isaiah = greg "isaiah";
}
+36 -24
View File
@@ -3,9 +3,18 @@
lib,
host ? "most",
top,
username,
...
}:
let
homeDirectory =
if pkgs.stdenv.hostPlatform.isDarwin then
"/Users/${username}"
else if username == "root" then
"/root"
else
"/home/${username}";
in
{
imports = [
top.nixvimunstable.homeManagerModules.nixvim
@@ -13,30 +22,33 @@
./baseline
] ++ lib.optionals (builtins.pathExists ./hosts/${host}) [ ./hosts/${host} ];
home.stateVersion = "25.05";
home = {
inherit homeDirectory username;
home.packages = with pkgs; [
copier
diffutils
findutils
gh
git
gnupatch
hms
btop
inetutils
jq
nano
nix-prefetch
nmap
openssl
setup-ssh
tmux
tree
unzip
wget
zip
];
packages = with pkgs; [
copier
diffutils
findutils
gh
git
gnupatch
hms
btop
inetutils
jq
nano
nix-prefetch
nmap
openssl
setup-ssh
tmux
tree
unzip
wget
zip
];
stateVersion = "25.05";
};
programs.tmux = {
enable = true;
-3
View File
@@ -1,7 +1,6 @@
{
config,
lib,
pkgs,
top,
...
}:
@@ -23,8 +22,6 @@
];
};
environment.defaultPackages = [ pkgs.code-cursor ];
greg = {
home = true;
gnome.enable = true;