refactor: split env vars by profile, move compositor modules out of base

This commit is contained in:
2026-03-04 20:07:15 +01:00
parent 1c15dc043d
commit 9cfbe1a050
4 changed files with 37 additions and 30 deletions
-4
View File
@@ -1,12 +1,9 @@
{ pkgs, ... }:
{
home.username = "ayman";
home.homeDirectory = "/home/ayman";
home.stateVersion = "24.11";
programs.home-manager.enable = true;
imports = [
./modules/theme.nix
./modules/zsh.nix
@@ -14,7 +11,6 @@
./modules/git.nix
./modules/env.nix
];
home.packages = with pkgs; [
ripgrep
fd
+6 -24
View File
@@ -1,31 +1,13 @@
{ ... }:
{ lib, ... }:
{
home.sessionPath = [
"$HOME/.local/bin"
"$HOME/.config/emacs/bin"
];
systemd.user.sessionVariables = {
# Terminal
TERMINAL = "kitty";
# Wayland
ELECTRON_OZONE_PLATFORM_HINT = "auto";
NIXOS_OZONE_WL = "1";
MOZ_ENABLE_WAYLAND = "1";
QT_QPA_PLATFORM = "wayland";
GDK_BACKEND = "wayland";
SDL_VIDEODRIVER = "wayland";
_JAVA_AWT_WM_NONREPARENTING = "1";
# Editor
EDITOR = "emacsclient -c -a nvim";
VISUAL = "emacsclient -c -a nvim";
SUDO_EDITOR = "nvim";
# Pager
PAGER = "bat --color auto";
MANPAGER = "bat -plman";
EDITOR = lib.mkDefault "nvim";
VISUAL = lib.mkDefault "nvim";
SUDO_EDITOR = "nvim";
PAGER = "bat --color auto";
MANPAGER = "bat -plman";
};
}
+16 -1
View File
@@ -7,7 +7,22 @@
../modules/niri.nix
../modules/dms.nix
];
home.sessionPath = [
"$HOME/.config/emacs/bin"
];
systemd.user.sessionVariables = {
TERMINAL = "kitty";
EDITOR = "emacsclient -c -a nvim";
VISUAL = "emacsclient -c -a nvim";
ELECTRON_OZONE_PLATFORM_HINT = "auto";
NIXOS_OZONE_WL = "1";
MOZ_ENABLE_WAYLAND = "1";
QT_QPA_PLATFORM = "wayland";
GDK_BACKEND = "wayland";
SDL_VIDEODRIVER = "wayland";
_JAVA_AWT_WM_NONREPARENTING = "1";
};
home.packages = with pkgs; [
#desktop specific
# add desktop-specific packages here
];
}
+15 -1
View File
@@ -1,5 +1,4 @@
{ pkgs, ... }:
{
imports = [
../modules/kitty.nix
@@ -8,6 +7,21 @@
../modules/niri.nix
../modules/dms.nix
];
home.sessionPath = [
"$HOME/.config/emacs/bin"
];
systemd.user.sessionVariables = {
TERMINAL = "kitty";
EDITOR = "emacsclient -c -a nvim";
VISUAL = "emacsclient -c -a nvim";
ELECTRON_OZONE_PLATFORM_HINT = "auto";
NIXOS_OZONE_WL = "1";
MOZ_ENABLE_WAYLAND = "1";
QT_QPA_PLATFORM = "wayland";
GDK_BACKEND = "wayland";
SDL_VIDEODRIVER = "wayland";
_JAVA_AWT_WM_NONREPARENTING = "1";
};
home.packages = with pkgs; [
powertop
acpi