From 4e31ec799f5efed6495ae7a85e4b5944d2c76abf Mon Sep 17 00:00:00 2001 From: Emmet Date: Mon, 14 Aug 2023 19:03:43 -0500 Subject: [PATCH] Moved some x11 programs out of wayland --- user/style/stylix.nix | 9 ++++----- user/wm/xmonad/xmonad.nix | 3 +++ user/wm/xmonad/xmonad.org | 3 +++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/user/style/stylix.nix b/user/style/stylix.nix index 8ea6316..8b6ed9e 100644 --- a/user/style/stylix.nix +++ b/user/style/stylix.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, theme, font, fontPkg, ... }: +{ config, lib, pkgs, theme, font, fontPkg, wmType, ... }: let themePath = "../../../themes"+("/"+theme+"/"+theme)+".yaml"; @@ -35,7 +35,7 @@ in }; sizes = { terminal = 18; - applications = 14; + applications = 12; popups = 12; desktop = 12; }; @@ -44,9 +44,8 @@ in stylix.targets.alacritty.enable = true; stylix.targets.kitty.enable = true; stylix.targets.gtk.enable = true; - stylix.targets.rofi.enable = true; - programs.rofi.enable = true; - stylix.targets.feh.enable = true; + stylix.targets.rofi.enable = if (wmType == "x11") then true else false; + stylix.targets.feh.enable = if (wmType == "x11") then true else false; programs.feh.enable = true; home.file.".fehbg-stylix".text = '' #!/bin/sh diff --git a/user/wm/xmonad/xmonad.nix b/user/wm/xmonad/xmonad.nix index 494f89a..9f54768 100644 --- a/user/wm/xmonad/xmonad.nix +++ b/user/wm/xmonad/xmonad.nix @@ -63,6 +63,9 @@ executable = true; }; + programs.feh.enable = true; + programs.rofi.enable = true; + services.autorandr.enable = true; programs.autorandr.enable = true; programs.autorandr.profiles = { diff --git a/user/wm/xmonad/xmonad.org b/user/wm/xmonad/xmonad.org index e26a164..4181998 100644 --- a/user/wm/xmonad/xmonad.org +++ b/user/wm/xmonad/xmonad.org @@ -844,6 +844,9 @@ In order to have Nix put my xmonad/xmobar configuration in the proper places, I executable = true; }; + programs.feh.enable = true; + programs.rofi.enable = true; + services.autorandr.enable = true; programs.autorandr.enable = true; programs.autorandr.profiles = {