belongs here more

This commit is contained in:
Sridhar Ratnakumar 2022-12-03 15:00:43 -05:00
parent 027e07427b
commit 5e3f4fd77d
3 changed files with 61 additions and 55 deletions

View file

@ -1,34 +1,64 @@
{ self, inputs, ... }:
{ self, inputs, config, ... }:
{
flake.homeModules = {
common = {
home.stateVersion = "22.11";
imports = [
./tmux.nix
./neovim.nix
./emacs.nix
./starship.nix
./terminal.nix
./direnv.nix
];
};
common-linux = {
imports = [
self.homeModules.common
./vscode-server.nix
];
programs.bash.enable = true;
};
common-darwin = {
imports = [
self.homeModules.common
];
flake = {
homeModules = {
common = {
home.stateVersion = "22.11";
imports = [
./tmux.nix
./neovim.nix
./emacs.nix
./starship.nix
./terminal.nix
./direnv.nix
];
};
common-linux = {
imports = [
self.homeModules.common
./vscode-server.nix
];
programs.bash.enable = true;
};
common-darwin = {
imports = [
self.homeModules.common
];
programs.zsh.enable = true;
# To put nix and home-manager-installed packages in PATH.
home.sessionPath = [
"/etc/profiles/per-user/$USER/bin"
"/run/current-system/sw/bin"
programs.zsh.enable = true;
# To put nix and home-manager-installed packages in PATH.
home.sessionPath = [
"/etc/profiles/per-user/$USER/bin"
"/run/current-system/sw/bin"
];
};
};
nixosModules.home-manager = {
imports = [
inputs.home-manager.nixosModules.home-manager
({
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = {
inherit inputs;
system = "x86_64-linux";
flake = { inherit config; };
};
})
];
};
darwinModules.home-manager = {
imports = [
inputs.home-manager.darwinModules.home-manager
({
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = {
inherit inputs;
system = "aarch64-darwin";
flake = { inherit config; };
};
})
];
};
};

View file

@ -4,18 +4,6 @@
flake = {
darwinModules = {
common = self.nixosModules.common;
home.imports = [
inputs.home-manager.darwinModules.home-manager
({
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = {
inherit inputs;
system = "aarch64-darwin";
flake = { inherit config; };
};
})
];
myself = {
home-manager.users.${config.people.myself} = { pkgs, ... }: {
imports = [
@ -27,7 +15,7 @@
};
default.imports = [
self.darwinModules.common
self.darwinModules.home
self.darwinModules.home-manager
self.darwinModules.myself
];
};

View file

@ -7,18 +7,6 @@
common.imports = [
./caches
];
home.imports = [
inputs.home-manager.nixosModules.home-manager
({
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = {
inherit inputs;
system = "x86_64-linux";
flake = { inherit config; };
};
})
];
other-people = {
# Temporarily sharing with Uday.
users.users.uday.isNormalUser = true;
@ -40,7 +28,7 @@
};
default.imports = [
self.nixosModules.common
self.nixosModules.home
self.nixosModules.home-manager
self.nixosModules.myself
./self-ide.nix
./takemessh