refactor: wayland module, move emacs path to emacs.nix, neovim to base
This commit is contained in:
@@ -10,6 +10,8 @@
|
||||
./modules/starship.nix
|
||||
./modules/git.nix
|
||||
./modules/env.nix
|
||||
./modules/neovim.nix
|
||||
./modules/wayland.nix
|
||||
];
|
||||
home.packages = with pkgs; [
|
||||
ripgrep
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
home.sessionPath = [
|
||||
"$HOME/.config/emacs/bin"
|
||||
];
|
||||
home.packages = with pkgs; [
|
||||
ripgrep
|
||||
fd
|
||||
@@ -11,13 +13,11 @@
|
||||
shellcheck
|
||||
shfmt
|
||||
];
|
||||
|
||||
# Symlink doom config into place
|
||||
xdg.configFile."doom" = {
|
||||
source = ../../config/doom;
|
||||
recursive = true;
|
||||
};
|
||||
|
||||
# Emacs daemon service pointing directly to system Emacs
|
||||
systemd.user.services.emacs = {
|
||||
Unit = {
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
{ lib, config, ... }:
|
||||
{
|
||||
options.myConfig.wayland.enable = lib.mkEnableOption "Wayland desktop environment";
|
||||
|
||||
config = lib.mkIf config.myConfig.wayland.enable {
|
||||
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";
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,28 +1,7 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
../modules/kitty.nix
|
||||
../modules/neovim.nix
|
||||
../modules/emacs.nix
|
||||
../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";
|
||||
};
|
||||
myConfig.wayland.enable = true;
|
||||
home.packages = with pkgs; [
|
||||
# add desktop-specific packages here
|
||||
# desktop specific packages
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,27 +1,6 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
../modules/kitty.nix
|
||||
../modules/neovim.nix
|
||||
../modules/emacs.nix
|
||||
../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";
|
||||
};
|
||||
myConfig.wayland.enable = true;
|
||||
home.packages = with pkgs; [
|
||||
powertop
|
||||
acpi
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# Minimal — no GUI packages
|
||||
imports = [
|
||||
#
|
||||
];
|
||||
home.packages = with pkgs; [
|
||||
neovim
|
||||
# server specific packages
|
||||
];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user