fix: make inputs self-contained
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
# profiles/base/default.nix — Always loaded on every host.
|
||||
#
|
||||
# Provides:
|
||||
# - nix-colors and m3ta-nixpkgs HM module imports
|
||||
# - Shell (nushell, fish, starship) with enable options
|
||||
# - CLI tools (bat, carapace, direnv, eza, fzf, lf, nitch, television, zellij, zoxide)
|
||||
# - Secrets management (pass-wayland)
|
||||
@@ -9,21 +8,19 @@
|
||||
# - Base packages
|
||||
#
|
||||
# NOTE: Overlays are NOT set here. The consuming flake (nixos-config) handles
|
||||
# overlays at the NixOS level via nixpkgs.overlays. This module only imports
|
||||
# HM modules and sets user-level preferences.
|
||||
# overlays at the NixOS level via nixpkgs.overlays. External HM modules are
|
||||
# imported by mkHome/modules/default.nix. This module only imports base profile
|
||||
# submodules and sets user-level preferences.
|
||||
#
|
||||
# When used standalone (not through NixOS), overlays should be set by the
|
||||
# standalone HM configuration or by the consuming flake.
|
||||
{
|
||||
inputs,
|
||||
lib,
|
||||
m3taHomeInputs,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
inputs.nix-colors.homeManagerModules.default
|
||||
inputs.m3ta-nixpkgs.homeManagerModules.default
|
||||
|
||||
./shell
|
||||
./cli-tools
|
||||
./secrets
|
||||
@@ -44,7 +41,7 @@
|
||||
};
|
||||
|
||||
# ── Color scheme ──
|
||||
colorScheme = inputs.nix-colors.colorSchemes.dracula;
|
||||
colorScheme = m3taHomeInputs.nix-colors.colorSchemes.dracula;
|
||||
|
||||
# ── Base packages ──
|
||||
home.packages = with pkgs; [
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
# Desktop environment aggregator — only loaded when context=desktop.
|
||||
# Includes window manager, applications, theming, and desktop session config.
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
m3taHomeInputs,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
@@ -39,22 +38,55 @@
|
||||
};
|
||||
};
|
||||
|
||||
home.sessionVariables = {
|
||||
WEBKIT_DISABLE_COMPOSITING_MODE = "1";
|
||||
NIXOS_OZONE_WL = "1";
|
||||
TERMINAL = "ghostty";
|
||||
QT_QPA_PLATFORM = "wayland";
|
||||
XDG_CURRENT_DESKTOP = "Hyprland";
|
||||
XDG_SESSION_TYPE = "wayland";
|
||||
XDG_SESSION_DESKTOP = "Hyprland";
|
||||
};
|
||||
home = {
|
||||
sessionVariables = {
|
||||
WEBKIT_DISABLE_COMPOSITING_MODE = "1";
|
||||
NIXOS_OZONE_WL = "1";
|
||||
TERMINAL = "ghostty";
|
||||
QT_QPA_PLATFORM = "wayland";
|
||||
XDG_CURRENT_DESKTOP = "Hyprland";
|
||||
XDG_SESSION_TYPE = "wayland";
|
||||
XDG_SESSION_DESKTOP = "Hyprland";
|
||||
};
|
||||
|
||||
home.sessionPath = [
|
||||
"\${XDG_BIN_HOME}"
|
||||
"\${HOME}/.cargo/bin"
|
||||
"$HOME/.npm-global/bin"
|
||||
"$HOME/.cache/.bun/bin"
|
||||
];
|
||||
sessionPath = [
|
||||
"\${XDG_BIN_HOME}"
|
||||
"\${HOME}/.cargo/bin"
|
||||
"$HOME/.npm-global/bin"
|
||||
"$HOME/.cache/.bun/bin"
|
||||
];
|
||||
|
||||
pointerCursor = {
|
||||
gtk.enable = true;
|
||||
package = pkgs.bibata-cursors;
|
||||
name = "Bibata-Modern-Ice";
|
||||
size = 20;
|
||||
};
|
||||
|
||||
packages = with pkgs; [
|
||||
appimage-run
|
||||
bemoji
|
||||
dconf
|
||||
(element-desktop.override {
|
||||
commandLineArgs = "--password-store=gnome-libsecret";
|
||||
})
|
||||
m3taHomeInputs.hermes-agent.packages.${pkgs.system}.desktop
|
||||
launch-webapp
|
||||
file-roller
|
||||
gsettings-desktop-schemas
|
||||
seahorse
|
||||
sushi
|
||||
ksnip
|
||||
nwg-look
|
||||
qt6Packages.qt6ct
|
||||
rose-pine-hyprcursor
|
||||
remmina
|
||||
slack
|
||||
vivaldi
|
||||
vivaldi-ffmpeg-codecs
|
||||
vibetyper
|
||||
];
|
||||
};
|
||||
|
||||
fonts.fontconfig.enable = true;
|
||||
|
||||
@@ -91,35 +123,4 @@
|
||||
# ];
|
||||
};
|
||||
};
|
||||
|
||||
home.pointerCursor = {
|
||||
gtk.enable = true;
|
||||
package = pkgs.bibata-cursors;
|
||||
name = "Bibata-Modern-Ice";
|
||||
size = 20;
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
appimage-run
|
||||
bemoji
|
||||
dconf
|
||||
(element-desktop.override {
|
||||
commandLineArgs = "--password-store=gnome-libsecret";
|
||||
})
|
||||
inputs.hermes-agent.packages.${pkgs.system}.desktop
|
||||
launch-webapp
|
||||
file-roller
|
||||
gsettings-desktop-schemas
|
||||
seahorse
|
||||
sushi
|
||||
ksnip
|
||||
nwg-look
|
||||
qt6Packages.qt6ct
|
||||
rose-pine-hyprcursor
|
||||
remmina
|
||||
slack
|
||||
vivaldi
|
||||
vivaldi-ffmpeg-codecs
|
||||
vibetyper
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
# AI agent system — OpenCode, Pi, and MCP server configuration.
|
||||
# Relies on coding.agents options provided by home/common/default.nix
|
||||
# (inputs.m3ta-nixpkgs.homeManagerModules.default).
|
||||
# (m3taHomeInputs.m3ta-nixpkgs.homeManagerModules.default).
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
m3taHomeInputs,
|
||||
pkgs,
|
||||
videoDrivers ? [],
|
||||
...
|
||||
@@ -62,7 +60,7 @@
|
||||
home.packages = with pkgs; [
|
||||
agenix-cli
|
||||
agent-browser
|
||||
inputs.agent-lib.packages.${pkgs.system}.agent-lib-cli
|
||||
m3taHomeInputs.agent-lib.packages.${pkgs.system}.agent-lib-cli
|
||||
beads
|
||||
pi-coding-agent
|
||||
(qmd.override {
|
||||
|
||||
Reference in New Issue
Block a user