diff --git a/apply.sh b/apply.sh index 9a90733..ad236c3 100755 --- a/apply.sh +++ b/apply.sh @@ -3,15 +3,19 @@ CONFIG_DIR="/home/alex/.config" echo "Copying hlwm config... $CONFIG_DIR/herbstluftwm" -cp herbstluftwm/* "$CONFIG_DIR/herbstluftwm" +rsync -a herbstluftwm/ "$CONFIG_DIR/herbstluftwm" if [ "$1" == "reload" ]; then herbstclient reload fi echo "Copying alacritty config..." -cp alacritty/* "$CONFIG_DIR/alacritty" +rsync -a alacritty/ "$CONFIG_DIR/alacritty" echo "Copying picom config..." -cp picom/* "$CONFIG_DIR/picom" +rsync -a picom/ "$CONFIG_DIR/picom" + +echo "Copying rofi config..." +cp rofi/config.rasi "$CONFIG_DIR/rofi" +cp rofi/theme.rasi "$CONFIG_DIR/rofi" echo "Done" diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart index aa08b2c..310edba 100755 --- a/herbstluftwm/autostart +++ b/herbstluftwm/autostart @@ -27,7 +27,7 @@ hc keybind $Mod-Shift-c close hc keybind $Mod-Return spawn alacritty # launch rofi -hc keybind $Mod-d spawn rofi -modi drun -show drun +hc keybind $Mod-d spawn rofi -modi combi,drun,window -show combi -show-icons # basic movement in tiling and floating mode # focusing clients diff --git a/rofi/config.rasi b/rofi/config.rasi index dcdb66b..5964097 100644 --- a/rofi/config.rasi +++ b/rofi/config.rasi @@ -1,12 +1,12 @@ configuration { -/* modi: "window,run,ssh";*/ + modi: "window,drun,ssh"; /* width: 50;*/ /* lines: 15;*/ /* columns: 1;*/ -/* font: "mono 12";*/ + font: "FantasqueSansMono Nerd Font 12"; /* bw: 1;*/ /* location: 0;*/ -/* padding: 5;*/ + padding: 55; /* yoffset: 0;*/ /* xoffset: 0;*/ /* fixed-num-lines: true;*/ @@ -34,7 +34,7 @@ configuration { /* auto-select: false;*/ /* parse-hosts: false;*/ /* parse-known-hosts: true;*/ -/* combi-modi: "window,run";*/ + combi-modi: "window,drun"; /* matching: "normal";*/ /* tokenize: true;*/ /* m: "-5";*/ @@ -44,7 +44,7 @@ configuration { /* separator-style: "dash";*/ /* hide-scrollbar: false;*/ /* fullscreen: false;*/ -/* fake-transparency: false;*/ +/* fake-transparency: true;*/ /* dpi: -1;*/ /* threads: 0;*/ /* scrollbar-width: 8;*/ @@ -53,7 +53,7 @@ configuration { /* window-format: "{w} {c} {t}";*/ /* click-to-exit: true;*/ /* show-match: true;*/ -/* theme: ;*/ +/* theme: "./theme.rasi";*/ /* color-normal: ;*/ /* color-urgent: ;*/ /* color-active: ;*/ @@ -143,3 +143,4 @@ configuration { /* me-accept-entry: "MouseDPrimary";*/ /* me-accept-custom: "Control+MouseDPrimary";*/ } +@import "theme.rasi" diff --git a/rofi/gruvbox-common.rasi b/rofi/gruvbox-common.rasi new file mode 100644 index 0000000..f9c7317 --- /dev/null +++ b/rofi/gruvbox-common.rasi @@ -0,0 +1,127 @@ +/* ========================================================================== + File: gruvbox-common.rasi + Desc: Shared rules between all gruvbox themes + Author: bardisty + Source: https://github.com/bardisty/gruvbox-rofi + Modified: Mon Feb 12 2018 06:06:47 PST -0800 + ========================================================================== */ + +window { + background-color: @background; + border: 2; + padding: 2; +} + +mainbox { + border: 0; + padding: 0; +} + +message { + border: 2px 0 0; + border-color: @separatorcolor; + padding: 1px; +} + +textbox { + highlight: @highlight; + text-color: @foreground; +} + +listview { + border: 2px solid 0 0; + padding: 2px 0 0; + border-color: @separatorcolor; + spacing: 2px; + scrollbar: @scrollbar; +} + +element { + border: 0; + padding: 2px; +} + +element.normal.normal { + background-color: @normal-background; + text-color: @normal-foreground; +} + +element.normal.urgent { + background-color: @urgent-background; + text-color: @urgent-foreground; +} + +element.normal.active { + background-color: @active-background; + text-color: @active-foreground; +} + +element.selected.normal { + background-color: @selected-normal-background; + text-color: @selected-normal-foreground; +} + +element.selected.urgent { + background-color: @selected-urgent-background; + text-color: @selected-urgent-foreground; +} + +element.selected.active { + background-color: @selected-active-background; + text-color: @selected-active-foreground; +} + +element.alternate.normal { + background-color: @alternate-normal-background; + text-color: @alternate-normal-foreground; +} + +element.alternate.urgent { + background-color: @alternate-urgent-background; + text-color: @alternate-urgent-foreground; +} + +element.alternate.active { + background-color: @alternate-active-background; + text-color: @alternate-active-foreground; +} + +scrollbar { + width: 4px; + border: 0; + handle-color: @scrollbar-handle; + handle-width: 8px; + padding: 0; +} + +mode-switcher { + border: 2px 0 0; + border-color: @separatorcolor; +} + +inputbar { + spacing: 0; + text-color: @normal-foreground; + padding: 2px; + children: [ prompt, textbox-prompt-sep, entry, case-indicator ]; +} + +case-indicator, +entry, +prompt, +button { + spacing: 0; + text-color: @normal-foreground; +} + +button.selected { + background-color: @selected-normal-background; + text-color: @selected-normal-foreground; +} + +textbox-prompt-sep { + expand: false; + str: ":"; + text-color: @normal-foreground; + margin: 0 0.3em 0 0; +} diff --git a/rofi/theme.rasi b/rofi/theme.rasi new file mode 100644 index 0000000..f09507e --- /dev/null +++ b/rofi/theme.rasi @@ -0,0 +1,62 @@ +/* ========================================================================== + Rofi color theme + + Based on the Gruvbox color scheme for Vim by morhetz + https://github.com/morhetz/gruvbox + + File: gruvbox-dark-hard.rasi + Desc: Gruvbox dark (hard contrast) color theme for Rofi + Author: bardisty + Source: https://github.com/bardisty/gruvbox-rofi + Modified: Mon Feb 12 2018 06:04:26 PST -0800 + ========================================================================== */ + +* { + /* Theme settings */ + highlight: bold italic; + scrollbar: true; + + /* Gruvbox dark colors */ + gruvbox-dark-bg0-hard: #1d2021; + gruvbox-dark-bg0: #282828; + gruvbox-dark-bg2: #504945; + gruvbox-dark-fg0: #fbf1c7; + gruvbox-dark-fg1: #ebdbb2; + gruvbox-dark-red-dark: #cc241d; + gruvbox-dark-red-light: #fb4934; + gruvbox-dark-yellow-dark: #d79921; + gruvbox-dark-yellow-light: #fabd2f; + gruvbox-dark-gray: #a89984; + + /* Theme colors */ + background: @gruvbox-dark-bg0-hard; + background-color: @background; + foreground: @gruvbox-dark-fg1; + border-color: @gruvbox-dark-gray; + separatorcolor: @border-color; + scrollbar-handle: @border-color; + + normal-background: @background; + normal-foreground: @foreground; + alternate-normal-background: @gruvbox-dark-bg0; + alternate-normal-foreground: @foreground; + selected-normal-background: @gruvbox-dark-bg2; + selected-normal-foreground: @gruvbox-dark-fg0; + + active-background: @gruvbox-dark-yellow-dark; + active-foreground: @background; + alternate-active-background: @active-background; + alternate-active-foreground: @active-foreground; + selected-active-background: @gruvbox-dark-yellow-light; + selected-active-foreground: @active-foreground; + + urgent-background: @gruvbox-dark-red-dark; + urgent-foreground: @background; + alternate-urgent-background: @urgent-background; + alternate-urgent-foreground: @urgent-foreground; + selected-urgent-background: @gruvbox-dark-red-light; + selected-urgent-foreground: @urgent-foreground; +} + +@import "gruvbox-common.rasi" + diff --git a/rofi/theme.wtf.rasi b/rofi/theme.wtf.rasi new file mode 100644 index 0000000..5b9c92e --- /dev/null +++ b/rofi/theme.wtf.rasi @@ -0,0 +1,7 @@ +* { + background-color: "blue"; +} + +window { + background-color: rgba ( 255, 0, 0, 100 % ); +}