From 3591ebbdbf4068e5882ec8ec8119de489e1e9ec7 Mon Sep 17 00:00:00 2001 From: Ray Andrew Date: Sat, 2 Nov 2024 23:54:22 -0500 Subject: [PATCH] update i3 --- src/home/gui/default.nix | 3 +++ src/home/wm/{common_i3.nix => common-i3.nix} | 0 src/home/wm/i3.nix | 5 ++++- src/home/wm/sway.nix | 2 +- src/nixos/stylix.nix | 1 + 5 files changed, 9 insertions(+), 2 deletions(-) rename src/home/wm/{common_i3.nix => common-i3.nix} (100%) diff --git a/src/home/gui/default.nix b/src/home/gui/default.nix index 66ecaca..a356ea1 100644 --- a/src/home/gui/default.nix +++ b/src/home/gui/default.nix @@ -39,10 +39,13 @@ }; }; + qt = { enable = true; # platformTheme.name = "adwaita"; # style.name = "adwaita-dark"; }; + + stylix.targets.gtk.enable = true; }; } diff --git a/src/home/wm/common_i3.nix b/src/home/wm/common-i3.nix similarity index 100% rename from src/home/wm/common_i3.nix rename to src/home/wm/common-i3.nix diff --git a/src/home/wm/i3.nix b/src/home/wm/i3.nix index a60a956..ca8fcbc 100644 --- a/src/home/wm/i3.nix +++ b/src/home/wm/i3.nix @@ -5,7 +5,7 @@ let pactl = lib.getExe' pkgs.pulseaudio "pactl"; maim = lib.getExe' pkgs.maim "maim"; clipboard-copy = lib.getExe' pkgs.xclip "xclip"; - commonOptions = import ./common_i3.nix rec { + commonOptions = import ./common-i3.nix rec { inherit config lib pkgs; light = lib.getExe' pkgs.light "light"; menu = lib.getExe' pkgs.dmenu "dmenu_run"; @@ -26,6 +26,9 @@ in }; config = lib.mkIf config.custom.wm.i3.enable { + services.picom = { + enable = true; + }; xsession.windowManager.i3 = { enable = true; extraConfig = commonOptions.extraConfig; diff --git a/src/home/wm/sway.nix b/src/home/wm/sway.nix index 2631a68..704d7ad 100644 --- a/src/home/wm/sway.nix +++ b/src/home/wm/sway.nix @@ -6,7 +6,7 @@ let grim = lib.getExe' pkgs.grim "grim"; slurp = lib.getExe' pkgs.slurp "slurp"; clipboard-copy = lib.getExe' pkgs.wl-clipboard "wl-copy"; - commonOptions = import ./common_i3.nix rec { + commonOptions = import ./common-i3.nix rec { inherit config lib pkgs; light = lib.getExe' pkgs.light "light"; menu = lib.getExe' pkgs.bemenu "bemenu-run"; diff --git a/src/nixos/stylix.nix b/src/nixos/stylix.nix index b874018..de24f6f 100644 --- a/src/nixos/stylix.nix +++ b/src/nixos/stylix.nix @@ -27,5 +27,6 @@ name = "Noto Color Emoji"; }; }; + targets.gtk.enable = true; }; }