diff --git a/fish/settings.nix b/fish/settings.nix index 7ac9e3b..0a030f6 100644 --- a/fish/settings.nix +++ b/fish/settings.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { home-manager.users.zoe.programs.fish = { interactiveShellInit = '' - set pure_color_mute ${config.color.blue} + ''; enable = true; plugins = [{ diff --git a/home.nix b/home.nix index 8b629e1..858af29 100644 --- a/home.nix +++ b/home.nix @@ -1,22 +1,21 @@ { pkgs, config, ... }: let nvimCustom = import ./nvim/settings.nix; - rofiCustom = import ./rofi/settings.nix; dunstCustom = import ./dunst/settings.nix; helixCustom = import ./helix/settings.nix; in { imports = [ ./fish/settings.nix ./variables.nix - i3/settings.nix - kitty/settings.nix - i3/i3status-rust.nix + ./i3/settings.nix + ./kitty/settings.nix + ./rofi/settings.nix + ./i3/i3status-rust.nix ]; home-manager.users.zoe = { home.stateVersion = "22.11"; programs.neovim = nvimCustom pkgs; - programs.rofi = rofiCustom pkgs; programs.helix = helixCustom pkgs; services.dunst = dunstCustom pkgs; diff --git a/kitty/settings.nix b/kitty/settings.nix index aa9d86a..8f15d53 100644 --- a/kitty/settings.nix +++ b/kitty/settings.nix @@ -28,9 +28,7 @@ window_border_width = 0; window_margin_width = 0; window_padding_width = 0; - - background_opacity = "0.9"; - + color0 = config.color.black; color8 = config.color.black_dull; color1 = config.color.red; diff --git a/rofi/settings.nix b/rofi/settings.nix index f54329c..a67450a 100644 --- a/rofi/settings.nix +++ b/rofi/settings.nix @@ -1,13 +1,38 @@ -{ pkgs, ... }: -{ - enable = true; - plugins = with pkgs; [ - rofi-calc - rofi-power-menu - ]; - theme = "gruvbox-light-hard"; - font = "CaskaydiaCove Nerd Font 12"; - extraConfig = { - modi = "drun,ssh,calc,window"; +{ pkgs, config, ... }: +let + inherit (config.home-manager.users.zoe.lib.formats.rasi) mkLiteral; + rofi-theme = { + "*" = { + background-color = mkLiteral config.color.background; + text-color = mkLiteral config.color.foreground; + + margin = 4; + padding = 4; + spacing = 4; + }; + + "window" = { + width = mkLiteral "66%"; + height = mkLiteral "66%"; + border = mkLiteral "4px"; + border-color = mkLiteral config.color.green; + }; + + "element-text" = { + highlight = mkLiteral "underline ${config.color.green}"; + }; + + "element selected" = { + border = mkLiteral "4px"; + border-color = mkLiteral config.color.green; + }; + }; +in { + home-manager.users.zoe.programs.rofi = { + enable = true; + plugins = with pkgs; [ rofi-calc rofi-power-menu ]; + theme = rofi-theme; + font = "${config.font.regular} 16"; + extraConfig = { modi = "drun,ssh,calc,window"; }; }; }