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.

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

slateport: use aly-nox hm cfg #96

Merged
merged 4 commits into from
Aug 22, 2024
Merged
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
3 changes: 2 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@

homeManagerModules = {
default = import ./homeManagerModules self;
aly = import ./homes/aly self;
aly = import ./homes/aly/gui.nix self;
aly-nox = import ./homes/aly/nox.nix self;
dustin = import ./homes/dustin self;
morgan = import ./homes/morgan self;
};
Expand Down
62 changes: 62 additions & 0 deletions homes/aly/common.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{
config,
pkgs,
...
}: {
home = {
homeDirectory = "/home/aly";

packages = with pkgs; [
browsh
curl
];

stateVersion = "24.05";
username = "aly";
};

programs = {
git = {
enable = true;
lfs.enable = true;
userName = "Aly Raffauf";
userEmail = "aly@raffauflabs.com";

extraConfig = {
color.ui = true;
github.user = "alyraffauf";
push.autoSetupRemote = true;
};
};

gitui.enable = true;
home-manager.enable = true;

rbw = {
enable = true;

settings = {
email = "alyraffauf@fastmail.com";
lock_timeout = 14400;
};
};
};

systemd.user.startServices = "legacy"; # Needed for auto-mounting agenix secrets.

ar.home = {
apps = {
backblaze = {
enable = true;
keyIdFile = config.age.secrets.backblazeKeyId.path;
keyFile = config.age.secrets.backblazeKey.path;
};

fastfetch.enable = true;
helix.enable = true;
shell.enable = true;
tmux.enable = true;
yazi.enable = true;
};
};
}
43 changes: 4 additions & 39 deletions homes/aly/default.nix → homes/aly/gui.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ self: {
...
}: {
imports = [
./common.nix
./firefox
./mail
./secrets.nix
Expand All @@ -19,8 +20,6 @@ self: {

packages = with pkgs; [
bitwarden-desktop
browsh
curl
fractal
nicotine-plus
obsidian
Expand All @@ -36,54 +35,20 @@ self: {
};

programs = {
git = {
enable = true;
lfs.enable = true;
userName = "Aly Raffauf";
userEmail = "aly@raffauflabs.com";

extraConfig = {
color.ui = true;
core.editor = "${lib.getExe config.ar.home.apps.zed.package} --wait";
github.user = "alyraffauf";
push.autoSetupRemote = true;
};
};

gitui.enable = true;
home-manager.enable = true;

rbw = {
enable = true;

settings = {
email = "alyraffauf@fastmail.com";
lock_timeout = 14400;
pinentry = pkgs.pinentry-gnome3;
};
};
git.extraConfig.core.editor = "${lib.getExe config.ar.home.apps.zed.package} --wait";
rbw.settings.pinentry = pkgs.pinentry-gnome3;
};

systemd.user.startServices = "legacy"; # Needed for auto-mounting agenix secrets.

ar.home = {
apps = {
backblaze = {
enable = true;
keyIdFile = config.age.secrets.backblazeKeyId.path;
keyFile = config.age.secrets.backblazeKey.path;
};

chromium.enable = true;
fastfetch.enable = true;
firefox.enable = true;
helix.enable = true;
kitty.enable = true;
shell.enable = true;
tmux.enable = true;
vsCodium.enable = true;
yazi.enable = true;
zed. enable = true;
zed.enable = true;
};

defaultApps = {
Expand Down
10 changes: 10 additions & 0 deletions homes/aly/nox.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
self: {
imports = [
./common.nix
./secrets.nix
self.homeManagerModules.default
self.inputs.agenix.homeManagerModules.default
];

programs.helix.defaultEditor = true;
}
3 changes: 0 additions & 3 deletions hosts/slateport/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
config,
lib,
pkgs,
self,
...
}: let
Expand All @@ -11,7 +9,6 @@ in {
./disko.nix
./home.nix
./secrets.nix
./stylix.nix
self.inputs.nixhw.nixosModules.common-intel-cpu
self.inputs.nixhw.nixosModules.common-intel-gpu
self.inputs.nixhw.nixosModules.common-bluetooth
Expand Down
12 changes: 5 additions & 7 deletions hosts/slateport/home.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{
home-manager = {
sharedModules = [
{
xdg.userDirs.music = "/mnt/Media/Music";
}
];
};
lib,
self,
...
}: {
home-manager.users.aly = lib.mkForce self.homeManagerModules.aly-nox;
}
54 changes: 0 additions & 54 deletions hosts/slateport/stylix.nix

This file was deleted.