faukah/nichts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactoring complete!

Browse source
This commit is contained in:
Charlie Root 2024-05-21 20:51:26 +02:00
commit d456d62999
9 changed files with 71 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/editors/helix.nix
View file

@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.modules.programs.helix;
cfg = config.modules.editors.helix;
username = config.modules.other.system.username;
in {
options.modules.programs.helix.enable = mkEnableOption "helix";
options.modules.editors.helix.enable = mkEnableOption "helix";
config = mkIf cfg.enable {
home-manager.users.${username} = {

4
modules/editors/kakoune.nix
View file

@ -1,11 +1,11 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.modules.programs.kakoune;
cfg = config.modules.editors.kakoune;
username = config.modules.other.system.username;
# inherit (inputs.kakoune.packages.${pkgs.system}) kakoun;
in {
options.modules.programs.kakoune.enable = mkEnableOption "kakoune";
options.modules.editors.kakoune.enable = mkEnableOption "kakoune";
config = mkIf cfg.enable {
home-manager.users.${username} = {

1
modules/gui/default.nix
View file

@ -13,7 +13,6 @@ _: {
./rofi.nix
./kitty.nix
./vivado.nix
./firefox.nix
./steam.nix
./waybar.nix
./schizofox.nix

9
modules/tui/default.nix
View file

@ -1,10 +1,3 @@
_: {
imports = [
./btop.nix
./helix.nix
./neovim.nix
./newsboat.nix
./ncmpcpp.nix
./yazi.nix
];
imports = [ ./btop.nix ./neovim.nix ./newsboat.nix ./ncmpcpp.nix ./yazi.nix ];
}

91
modules/wms/wayland/variables.nix
View file

@ -5,49 +5,50 @@ let
hyprland = config.modules.wms.wayland.hyprland;
in {
options.modules.wms.wayland.enable = mkEnableOption "wayland";
options.modules.wms.wayland.hyprland.enable = mkEnableOption "hyprland";
config = mkIf cfg.enable lib.mkMerge [
{
environment.variables = {
NIXOS_OZONE_WL = "1";
__GL_GSYNC_ALLOWED = "0";
__GL_VRR_ALLOWED = "0";
# _JAVA_AWT_WM_NONEREPARENTING = "1";
# SSH_AUTH_SOCK = "/run/user/1000/keyring/ssh";
DISABLE_QT5_COMPAT = "0";
GDK_BACKEND = "wayland,x11";
ANKI_WAYLAND = "1";
DIRENV_LOG_FORMAT = "";
WLR_DRM_NO_ATOMIC = "1";
QT_AUTO_SCREEN_SCALE_FACTOR = "1";
QT_QPA_PLATFORM = "wayland;xcb";
DISABLE_QT_COMPAT = "0";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
MOZ_ENABLE_WAYLAND = "1";
WLR_BACKEND = "vulkan";
WLR_RENDERER = "vulkan";
XDG_SESSION_TYPE = "wayland";
SDL_VIDEODRIVER = "wayland";
CLUTTER_BACKEND = "wayland";
# WLR_DRM_DEVICES = "/dev/dri/card1:/dev/dri/card0";
};
}
# Session variables for Hyprland
(lib.mkIf (hyprland.enable) {
environment.variables = {
LIBVA_DRIVER_NAME = "nvidia";
GTK_USE_PORTAL = "1";
NIXOS_XDG_OPEN_USE_PORTAL = "1";
XDG_CURRENT_DESKTOP = "Hyprland";
XDG_SESSION_DESKTOP = "Hyprland";
SDL_VIDEODRIVER = "wayland";
# GDK_BACKEND = "wayland";
WLR_RENDERER_ALLOW_SOFTWARE = "1";
QT_QPA_PLATFORM = "wayland";
# Needed anymore?
LIBSEAT_BACKEND = "logind";
# WLR_NO_HARDWARE_CURSORS = "1";
};
})
];
# options.modules.wms.wayland.hyprland.enable = mkEnableOption "hyprland";
config = mkIf cfg.enable {
# lib.mkMerge [
# {
environment.variables = {
NIXOS_OZONE_WL = "1";
__GL_GSYNC_ALLOWED = "0";
__GL_VRR_ALLOWED = "0";
# _JAVA_AWT_WM_NONEREPARENTING = "1";
# SSH_AUTH_SOCK = "/run/user/1000/keyring/ssh";
DISABLE_QT5_COMPAT = "0";
GDK_BACKEND = "wayland,x11";
ANKI_WAYLAND = "1";
DIRENV_LOG_FORMAT = "";
WLR_DRM_NO_ATOMIC = "1";
QT_AUTO_SCREEN_SCALE_FACTOR = "1";
QT_QPA_PLATFORM = "wayland;xcb";
DISABLE_QT_COMPAT = "0";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
MOZ_ENABLE_WAYLAND = "1";
WLR_BACKEND = "vulkan";
WLR_RENDERER = "vulkan";
XDG_SESSION_TYPE = "wayland";
SDL_VIDEODRIVER = "wayland";
CLUTTER_BACKEND = "wayland";
# WLR_DRM_DEVICES = "/dev/dri/card1:/dev/dri/card0";
# };
# }
# Session variables for Hyprland
# (lib.mkIf (hyprland.enable) {
# environment.variables = {
LIBVA_DRIVER_NAME = "nvidia";
GTK_USE_PORTAL = "1";
NIXOS_XDG_OPEN_USE_PORTAL = "1";
XDG_CURRENT_DESKTOP = "Hyprland";
XDG_SESSION_DESKTOP = "Hyprland";
# GDK_BACKEND = "wayland";
WLR_RENDERER_ALLOW_SOFTWARE = "1";
# QT_QPA_PLATFORM = "wayland";
# Needed anymore?
LIBSEAT_BACKEND = "logind";
# WLR_NO_HARDWARE_CURSORS = "1";
};
# })
# ];
};
}