diff --git a/users/blake/dots/default.nix b/users/blake/dots/default.nix index 4294a34..a935880 100644 --- a/users/blake/dots/default.nix +++ b/users/blake/dots/default.nix @@ -9,6 +9,7 @@ ./firefox ./kitty ./dunst + ./btop ./waybar ./stylix ./hypr diff --git a/users/blake/dots/hypr/default.nix b/users/blake/dots/hypr/default.nix index a325ba2..0f4c4bc 100644 --- a/users/blake/dots/hypr/default.nix +++ b/users/blake/dots/hypr/default.nix @@ -291,7 +291,7 @@ in { } ]; - input-field = lib.mkDefault [ + input-field = lib.mkForce [ { monitor = ""; size = "400, 70"; @@ -302,14 +302,14 @@ in { outer_color = lib.mkDefault "$accent"; inner_color = lib.mkDefault "$surface0"; font_color = lib.mkDefault "$text"; - fade_on_empty = false; + fade_on_empty = true; placeholder_text = "# 󰌾 Logged in as $USER"; hide_input = false; check_color = lib.mkDefault "rgb(0047ab)"; fail_color = lib.mkDefault "rgb(ff0000)"; fail_text = "$FAIL ($ATTEMPTS)"; - capslock_color = "rgb(ff0000)"; - position = "0, -185"; + capslock_color = lib.mkDefault "rgb(ff0000)"; + position = lib.mkForce "0, -185"; halign = "center"; valign = "center"; shadow_passes = 2; diff --git a/users/blake/dots/stylix/default.nix b/users/blake/dots/stylix/default.nix index 9695846..f45db57 100644 --- a/users/blake/dots/stylix/default.nix +++ b/users/blake/dots/stylix/default.nix @@ -19,7 +19,7 @@ in { config = lib.mkIf cfg.enable { stylix = { enable = true; - autoEnable = false; + #autoEnable = false; image = wallpaper; polarity = "dark"; cursor = { @@ -59,6 +59,7 @@ in { }; targets = { + waybar.enable = false; kitty.enable = true; btop.enable = true; hyprland.enable = true; diff --git a/users/blake/dots/tofi/default.nix b/users/blake/dots/tofi/default.nix index c488bc5..e14e71f 100644 --- a/users/blake/dots/tofi/default.nix +++ b/users/blake/dots/tofi/default.nix @@ -20,14 +20,14 @@ in { width = "100%"; height = 25; horizontal = true; - font-size = 12; + font-size = lib.mkDefault 12; prompt-text = " select: "; outline-width = 0; border-width = 0; corner-radius = 9; - background-color = "#2f1730"; - selection-color = "#ffffff"; - text-color = "#888888"; + background-color = lib.mkDefault "#2f1730"; + selection-color = lib.mkDefault "#ffffff"; + text-color = lib.mkDefault "#888888"; min-input-width = 120; result-spacing = 15; padding-top = 0; diff --git a/users/blake/home.nix b/users/blake/home.nix index e93f38b..fdee89b 100644 --- a/users/blake/home.nix +++ b/users/blake/home.nix @@ -38,7 +38,6 @@ in stateVersion = "25.05"; packages = with pkgs; [ ripgrep - btop p7zip imagemagick sops diff --git a/users/blake/hosts/yveltal.nix b/users/blake/hosts/yveltal.nix index 26ef4f3..0f7b352 100644 --- a/users/blake/hosts/yveltal.nix +++ b/users/blake/hosts/yveltal.nix @@ -21,6 +21,7 @@ dunst.enable = true; hypr.enable = true; tofi.enable = true; + btop.enable = true; nvf.enable = true; zsh.enable = true; ssh.enable = true;