diff --git a/nixos/configuration.nix b/nixos/configuration.nix index da53c8d..0b0bbe2 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -30,7 +30,7 @@ environment.sessionVariables = { NIXPKGS_ALLOW_UNFREE = "1"; - GTK_THEME = "Lavanda-Dark"; + GTK_THEME = "Dracula"; QT_QPA_PLATFORMTHEME = "qt5ct"; QT_FONT_DPI = "125"; }; diff --git a/nixos/home/bashdots.nix b/nixos/home/bashdots.nix index a01b3d5..c3eddea 100644 --- a/nixos/home/bashdots.nix +++ b/nixos/home/bashdots.nix @@ -51,7 +51,6 @@ qbit = "mosh matt@10.0.0.121 -- ssh -t matt@10.0.0.128 'tmux -2u new -At laptop'"; }; sessionVariables = { # see configuration.nix - TERM = "xterm-color"; }; profileExtra = '' @@ -104,6 +103,40 @@ printf '\r\n' done } + + ### DRACULA + + export FZF_DEFAULT_OPTS='--color=fg:#f8f8f2,hl:#bd93f9 --color=fg+:#f8f8f2,hl+:#bd93f9 --color=info:#ffb86c,prompt:#50fa7b,pointer:#ff79c6 --color=marker:#ff79c6,spinner:#ffb86c,header:#6272a4' + + #man-page colors + export LESS_TERMCAP_mb=$'\e[1;31m' # begin bold + export LESS_TERMCAP_md=$'\e[1;34m' # begin blink + export LESS_TERMCAP_so=$'\e[01;45;37m' # begin reverse video + export LESS_TERMCAP_us=$'\e[01;36m' # begin underline + export LESS_TERMCAP_me=$'\e[0m' # reset bold/blink + export LESS_TERMCAP_se=$'\e[0m' # reset reverse video + export LESS_TERMCAP_ue=$'\e[0m' # reset underline + + if [ "$TERM" = "linux" ]; then + printf %b '\e[40m' '\e[8]' # set default background to color 0 'dracula-bg' + printf %b '\e[37m' '\e[8]' # set default foreground to color 7 'dracula-fg' + printf %b '\e]P0282a36' # redefine 'black' as 'dracula-bg' + printf %b '\e]P86272a4' # redefine 'bright-black' as 'dracula-comment' + printf %b '\e]P1ff5555' # redefine 'red' as 'dracula-red' + printf %b '\e]P9ff7777' # redefine 'bright-red' as '#ff7777' + printf %b '\e]P250fa7b' # redefine 'green' as 'dracula-green' + printf %b '\e]PA70fa9b' # redefine 'bright-green' as '#70fa9b' + printf %b '\e]P3f1fa8c' # redefine 'brown' as 'dracula-yellow' + printf %b '\e]PBffb86c' # redefine 'bright-brown' as 'dracula-orange' + printf %b '\e]P4bd93f9' # redefine 'blue' as 'dracula-purple' + printf %b '\e]PCcfa9ff' # redefine 'bright-blue' as '#cfa9ff' + printf %b '\e]P5ff79c6' # redefine 'magenta' as 'dracula-pink' + printf %b '\e]PDff88e8' # redefine 'bright-magenta' as '#ff88e8' + printf %b '\e]P68be9fd' # redefine 'cyan' as 'dracula-cyan' + printf %b '\e]PE97e2ff' # redefine 'bright-cyan' as '#97e2ff' + printf %b '\e]P7f8f8f2' # redefine 'white' as 'dracula-fg' + printf %b '\e]PFffffff' # redefine 'bright-white' as '#ffffff' + fi ''; #initExtra = '' #''; diff --git a/nixos/home/dotfiles.nix b/nixos/home/dotfiles.nix index fd519ab..0e500a1 100644 --- a/nixos/home/dotfiles.nix +++ b/nixos/home/dotfiles.nix @@ -14,9 +14,6 @@ in fzf = { enable = true; enableBashIntegration = true; - #colors = { - # not working ? - #}; }; eww = { @@ -38,7 +35,7 @@ in y = 10; }; - opacity = 0.6; + opacity = 0.8; }; # https://github.com/dracula/alacritty/blob/05faff15c0158712be87d200081633d9f4850a7d/dracula.yml diff --git a/nixos/home/hyprland.nix b/nixos/home/hyprland.nix index 866b42a..ab21cf2 100644 --- a/nixos/home/hyprland.nix +++ b/nixos/home/hyprland.nix @@ -43,6 +43,13 @@ in # https://www.reddit.com/r/NixOS/comments/vc3srj/comment/iccqxw1/?utm_source=share&utm_medium=web2x&context=3 xdg.configFile = { "share/icons/hicolor".source = "${pkgs.kora-icon-theme}/share/icons/kora-pgrey"; + "../.themes/Dracula".source = "${pkgs.dracula-theme}/share/themes/Dracula"; + + "Kvantum/Dracula".source = "${pkgs.dracula-theme}/share/Kvantum/Dracula"; + "Kvantum/Dracula-Solid".source = "${pkgs.dracula-theme}/share/Kvantum/Dracula-Solid"; + "Kvantum/Dracula-purple".source = "${pkgs.dracula-theme}/share/Kvantum/Dracula-purple"; + "Kvantum/Dracula-purple-solid".source = "${pkgs.dracula-theme}/share/Kvantum/Dracula-purple-solid"; + "hypr/main.conf".source = config.lib.file.mkOutOfStoreSymlink "${configDir}/hypr/main.conf"; "hypr/hyprpaper.conf".source = config.lib.file.mkOutOfStoreSymlink "${configDir}/hypr/hyprpaper.conf"; }; diff --git a/nixos/home/packages.nix b/nixos/home/packages.nix index 1cf68e0..81005e1 100644 --- a/nixos/home/packages.nix +++ b/nixos/home/packages.nix @@ -23,10 +23,6 @@ }; home.packages = with pkgs; - (with xorg; [ - xcursorthemes - - ]) ++ (with python311Packages; [ python pyclip @@ -35,7 +31,6 @@ (with plasma5Packages; [ polkit-kde-agent qtstyleplugin-kvantum - breeze-icons dolphin dolphin-plugins kdegraphics-thumbnailers @@ -76,10 +71,12 @@ swayosd blueberry libayatana-appindicator - papirus-icon-theme + dracula-theme + dracula-icon-theme steam-run qt5.qtwayland qt6.qtwayland + bottles-unwrapped httrack lisgd zeal