From d18ac6c1a71b77c983630b82b19c07fd08a942fe Mon Sep 17 00:00:00 2001 From: zackartz Date: Tue, 28 May 2024 11:09:07 -0400 Subject: [PATCH] 700 current 2024-05-28 11:09:06 24.11.20240524.bfb7a88 6.9.1-zen1 * --- flake.lock | 6 +++--- homes/x86_64-linux/zack@earth/default.nix | 2 +- modules/home/apps/tools/neovim/default.nix | 1 + modules/home/rice/gtk/default.nix | 8 ++++---- modules/home/services/hypridle/default.nix | 1 + modules/nixos/protocols/wayland/default.nix | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 69c5060..a96a476 100644 --- a/flake.lock +++ b/flake.lock @@ -560,11 +560,11 @@ ] }, "locked": { - "lastModified": 1716847642, - "narHash": "sha256-rjEswRV0o23eBBils8lJXyIGha+l/VjV73IPg+ztxgk=", + "lastModified": 1716908526, + "narHash": "sha256-Zl6e/sEVDh07K47XxDGPsXTYT4nI6llUDbQ4xMIwp7k=", "owner": "nix-community", "repo": "home-manager", - "rev": "10c7c219b7dae5795fb67f465a0d86cbe29f25fa", + "rev": "373ead20606efa9181cd15ba19a5deac7ead1492", "type": "github" }, "original": { diff --git a/homes/x86_64-linux/zack@earth/default.nix b/homes/x86_64-linux/zack@earth/default.nix index d1d2d87..b229e34 100644 --- a/homes/x86_64-linux/zack@earth/default.nix +++ b/homes/x86_64-linux/zack@earth/default.nix @@ -48,7 +48,7 @@ }; }; - # catppuccin.enable = true; + catppuccin.enable = true; home.packages = [ pkgs.gimp diff --git a/modules/home/apps/tools/neovim/default.nix b/modules/home/apps/tools/neovim/default.nix index 353b6a3..4858925 100644 --- a/modules/home/apps/tools/neovim/default.nix +++ b/modules/home/apps/tools/neovim/default.nix @@ -34,6 +34,7 @@ in { config = mkIf cfg.enable { programs.neovim = { + catppuccin.enable = false; enable = true; defaultEditor = true; extraPackages = with pkgs; [ diff --git a/modules/home/rice/gtk/default.nix b/modules/home/rice/gtk/default.nix index 20708de..56ac147 100644 --- a/modules/home/rice/gtk/default.nix +++ b/modules/home/rice/gtk/default.nix @@ -18,10 +18,10 @@ in { enable = true; catppuccin.enable = true; - iconTheme = { - package = pkgs.catppuccin-papirus-folders; - name = "Papirus"; - }; + # iconTheme = { + # package = pkgs.catppuccin-papirus-folders; + # name = "Papirus"; + # }; font = { name = "Iosevka"; size = 11; diff --git a/modules/home/services/hypridle/default.nix b/modules/home/services/hypridle/default.nix index 920f315..e2c70f7 100644 --- a/modules/home/services/hypridle/default.nix +++ b/modules/home/services/hypridle/default.nix @@ -17,6 +17,7 @@ in { config = mkIf cfg.enable { programs.swaylock = { enable = true; + catppuccin.enable = false; package = pkgs.swaylock-effects; settings = with colors; { clock = true; diff --git a/modules/nixos/protocols/wayland/default.nix b/modules/nixos/protocols/wayland/default.nix index 9825c86..b73aaa6 100644 --- a/modules/nixos/protocols/wayland/default.nix +++ b/modules/nixos/protocols/wayland/default.nix @@ -35,7 +35,7 @@ in { environment = { variables = { - NIXOS_OZONE_WL = "1"; + NIXOS_OZONE_WL = "0"; __GL_GSYNC_ALLOWED = "0"; __GL_VRR_ALLOWED = "0"; _JAVA_AWT_WM_NONEREPARENTING = "1";