refactor more

This commit is contained in:
2025-12-11 20:07:46 +00:00
parent b85728470c
commit 07c39081bb
15 changed files with 190 additions and 195 deletions

View File

@@ -1,10 +1,20 @@
{
inputs,
pkgs,
user,
constants,
...
}: {
imports = [
../../modules/core.nix
../../modules/darwin.nix
../../modules/darwin-syncthing.nix
../../modules/darwin-system.nix
../../modules/dock.nix
../../modules/homebrew.nix
../../modules/syncthing.nix
../../modules/tailscale.nix
inputs.sops-nix.darwinModules.sops
];
networking.hostName = "chidi";
@@ -18,6 +28,38 @@
};
home-manager.users.${user} = {
pkgs,
lib,
...
}: {
_module.args = {inherit user constants inputs;};
imports = [
inputs.nixvim.homeModules.nixvim
../../modules/atuin.nix
../../modules/bash.nix
../../modules/bat.nix
../../modules/direnv.nix
../../modules/eza.nix
../../modules/fish.nix
../../modules/fzf.nix
../../modules/ghostty.nix
../../modules/git.nix
../../modules/home.nix
../../modules/jjui.nix
../../modules/jujutsu.nix
../../modules/lazygit.nix
../../modules/mise.nix
../../modules/neovim
../../modules/opencode.nix
../../modules/ripgrep.nix
../../modules/ssh.nix
../../modules/starship.nix
../../modules/zellij.nix
../../modules/zk.nix
../../modules/zoxide.nix
../../modules/zsh.nix
];
fonts.fontconfig.enable = true;
programs.git.settings.user.email = "christoph@tuist.dev";
};

View File

@@ -1,6 +1,18 @@
{user, ...}: {
{
inputs,
user,
...
}: {
imports = [
../../modules/core.nix
../../modules/darwin.nix
../../modules/darwin-syncthing.nix
../../modules/darwin-system.nix
../../modules/dock.nix
../../modules/homebrew.nix
../../modules/syncthing.nix
../../modules/tailscale.nix
inputs.sops-nix.darwinModules.sops
];
networking.hostName = "jason";
@@ -31,6 +43,39 @@
};
home-manager.users.${user} = {
pkgs,
lib,
constants,
...
}: {
_module.args = {inherit user constants inputs;};
imports = [
inputs.nixvim.homeModules.nixvim
../../modules/atuin.nix
../../modules/bash.nix
../../modules/bat.nix
../../modules/direnv.nix
../../modules/eza.nix
../../modules/fish.nix
../../modules/fzf.nix
../../modules/ghostty.nix
../../modules/git.nix
../../modules/home.nix
../../modules/jjui.nix
../../modules/jujutsu.nix
../../modules/lazygit.nix
../../modules/mise.nix
../../modules/neovim
../../modules/opencode.nix
../../modules/ripgrep.nix
../../modules/ssh.nix
../../modules/starship.nix
../../modules/zellij.nix
../../modules/zk.nix
../../modules/zoxide.nix
../../modules/zsh.nix
];
fonts.fontconfig.enable = true;
programs.git.settings.user.email = "christoph@schmatzler.com";
};
}

View File

@@ -12,12 +12,19 @@
(modulesPath + "/profiles/qemu-guest.nix")
./disk-config.nix
./hardware-configuration.nix
../../modules/core.nix
../../modules/nixos.nix
inputs.disko.nixosModules.disko
];
home-manager.users.${user} = {
pkgs,
lib,
...
}: {
_module.args = {inherit user constants inputs;};
imports = [
inputs.nixvim.homeModules.nixvim
../../modules/bash.nix
../../modules/bat.nix
../../modules/direnv.nix
@@ -25,6 +32,7 @@
../../modules/fish.nix
../../modules/fzf.nix
../../modules/git.nix
../../modules/home.nix
../../modules/jjui.nix
../../modules/jujutsu.nix
../../modules/lazygit.nix
@@ -34,15 +42,6 @@
../../modules/starship.nix
../../modules/zoxide.nix
];
programs.home-manager.enable = true;
home = {
packages =
(pkgs.callPackage ../../modules/packages.nix {inherit inputs;})
++ (pkgs.callPackage ../../modules/nixos-packages.nix {});
stateVersion = constants.stateVersions.homeManager;
};
};
networking.firewall.allowedTCPPorts = [80 443];

View File

@@ -8,12 +8,21 @@
...
}: {
imports = [
../../modules/core.nix
../../modules/nixos.nix
../../modules/syncthing.nix
../../modules/tailscale.nix
inputs.sops-nix.nixosModules.sops
];
home-manager.users.${user} = {
pkgs,
lib,
...
}: {
_module.args = {inherit user constants inputs;};
imports = [
inputs.nixvim.homeModules.nixvim
../../modules/atuin.nix
../../modules/bash.nix
../../modules/bat.nix
@@ -22,6 +31,7 @@
../../modules/fish.nix
../../modules/fzf.nix
../../modules/git.nix
../../modules/home.nix
../../modules/jjui.nix
../../modules/jujutsu.nix
../../modules/lazygit.nix
@@ -37,18 +47,10 @@
../../modules/zsh.nix
];
programs.home-manager.enable = true;
home = {
packages =
(pkgs.callPackage ../../modules/packages.nix {inherit inputs;})
++ (pkgs.callPackage ../../modules/nixos-packages.nix {})
++ [
inputs.beads.packages.${pkgs.system}.default
inputs.nix-ai-tools.packages.${pkgs.system}.amp
];
stateVersion = constants.stateVersions.homeManager;
};
home.packages = [
inputs.beads.packages.${pkgs.system}.default
inputs.nix-ai-tools.packages.${pkgs.system}.amp
];
programs.git.settings.user.email = "christoph@schmatzler.com";
};