From c718abaa7f15c735263cccd4acea1b54e3aa02dc Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Sat, 7 Nov 2020 14:52:30 -0600 Subject: [PATCH 1/3] let's make rofi work without needing two styles. --- rofi/config.rasi | 1 + rofi/launchers-git/launcher.sh | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/rofi/config.rasi b/rofi/config.rasi index e89fedd..9b46dc1 100644 --- a/rofi/config.rasi +++ b/rofi/config.rasi @@ -3,5 +3,6 @@ configuration { show-icons: true; icon-theme: "Papirus"; + dpi: 0; } @import "/home/chris/.dotfiles/rofi/launchers-git/blurry.rasi" diff --git a/rofi/launchers-git/launcher.sh b/rofi/launchers-git/launcher.sh index cff3cfa..406ccb3 100755 --- a/rofi/launchers-git/launcher.sh +++ b/rofi/launchers-git/launcher.sh @@ -13,12 +13,14 @@ # row row_center screen row_dock row_dropdown -if [ $(hostname) = "chris-linuxlaptop" ]; then - style="blurry-hidpi" - #echo "this is hidpi" -else - style="blurry" - #echo "this is not hidpi" -fi +# if [ $(hostname) = "chris-linuxlaptop" ]; then +# style="blurry-hidpi" +# #echo "this is hidpi" +# else +# style="blurry" +# #echo "this is not hidpi" +# fi + +style="blurry" rofi -no-lazy-grab -show drun -modi drun,window,calc,ssh,run,emoji -theme launchers-git/"$style".rasi From 54848029ba1700d1c7054483dadb533e28a12623 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Sat, 7 Nov 2020 14:56:35 -0600 Subject: [PATCH 2/3] Not using fish_variables in git --- fish/fish_variables | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 fish/fish_variables diff --git a/fish/fish_variables b/fish/fish_variables deleted file mode 100644 index 987e0d6..0000000 --- a/fish/fish_variables +++ /dev/null @@ -1,33 +0,0 @@ -# This file contains fish universal variable definitions. -# VERSION: 3.0 -SETUVAR __fish_initialized:3100 -SETUVAR fish_color_autosuggestion:555\x1ebrblack -SETUVAR fish_color_cancel:\x2dr -SETUVAR fish_color_command:005fd7 -SETUVAR fish_color_comment:990000 -SETUVAR fish_color_cwd:green -SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:009900 -SETUVAR fish_color_error:ff0000 -SETUVAR fish_color_escape:00a6b2 -SETUVAR fish_color_history_current:\x2d\x2dbold -SETUVAR fish_color_host:normal -SETUVAR fish_color_host_remote:yellow -SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue -SETUVAR fish_color_normal:normal -SETUVAR fish_color_operator:00a6b2 -SETUVAR fish_color_param:00afff -SETUVAR fish_color_quote:999900 -SETUVAR fish_color_redirection:00afff -SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_status:red -SETUVAR fish_color_user:brgreen -SETUVAR fish_color_valid_path:\x2d\x2dunderline -SETUVAR fish_greeting:Welcome\x20to\x20fish\x2c\x20the\x20friendly\x20interactive\x20shell\x0aType\x20\x60help\x60\x20for\x20instructions\x20on\x20how\x20to\x20use\x20fish -SETUVAR fish_key_bindings:fish_vi_key_bindings -SETUVAR fish_pager_color_completion:\x1d -SETUVAR fish_pager_color_description:B3A06D\x1eyellow -SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline -SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan -SETUVAR fish_user_paths:/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2elocal/bin\x1e/home/chris/scripts From 6925aafdf5cf456cfe14693696a52a97cf25f3fd Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Sat, 7 Nov 2020 15:19:32 -0600 Subject: [PATCH 3/3] Make rofi use different sizes for desktop and laptop --- rofi/config.rasi | 2 + rofi/launchers-git/blurry-hidpi.rasi | 155 +-------------------------- rofi/launchers-git/blurry.rasi | 1 - rofi/launchers-git/desktop.rasi | 15 +++ rofi/launchers-git/laptop.rasi | 15 +++ rofi/launchers-git/launcher.sh | 16 ++- 6 files changed, 42 insertions(+), 162 deletions(-) create mode 100644 rofi/launchers-git/desktop.rasi create mode 100644 rofi/launchers-git/laptop.rasi diff --git a/rofi/config.rasi b/rofi/config.rasi index 34ca67e..9dd5630 100644 --- a/rofi/config.rasi +++ b/rofi/config.rasi @@ -1,5 +1,7 @@ +/*-*- mode: css; -*-*/ /** Configured For Applets **/ + configuration { show-icons: true; icon-theme: "Papirus"; diff --git a/rofi/launchers-git/blurry-hidpi.rasi b/rofi/launchers-git/blurry-hidpi.rasi index bcb7962..061ca4b 100644 --- a/rofi/launchers-git/blurry-hidpi.rasi +++ b/rofi/launchers-git/blurry-hidpi.rasi @@ -8,157 +8,8 @@ * */ + configuration { - font: "VictorMono Nerd Font 28.0"; - show-icons: true; - icon-theme: "Papirus"; - display-drun: " "; - drun-display-format: "{name} {description}"; - threads: 0; - scroll-method: 0; - disable-history: false; - fullscreen: false; - hide-scrollbar: true; - sidebar-mode: false; -} - -* { - background: #12121222; - background-color: #00222b33; - background-entry: #000000; - background-alt: #323232; - foreground: #f2f2f2; - foreground-selected: #ffffff; - urgent: #E91E63; - urgent-selected: #E91E63; - transparent: #00000000; -} - -window { - background-color: #44444444; - text-color: @foreground; - border-radius: 0px; - border: 0px; -// height: 60%; - width: 50%; - location: center; - anchor: center; - x-offset: 0; - y-offset: 0; - margin: 0px; - padding: 0px; -} - -mainbox { - border-radius: 35px; - background-color: @background-color; - text-color: @foreground; - transparency: "real"; -} - -inputbar { - background-color: @background-alt; - text-color: @foreground; - expand: false; - border-radius: 36px; - margin: 0px 0px 0px 0px; - padding: 6px 6px 6px 6px; - position: north; -} - -prompt { - enabled: true; - padding: 0px 6px 0px 5px; - background-color: @transparent; - text-color: @foreground; - // font: "FantasqueSansMono Nerd Font 16"; - border: 0px; -} - -entry { - background-color: @transparent; - placeholder-color: @foreground; - text-color: @foreground; - expand: true; - horizontal-align: 0; - placeholder: "Search"; - blink: true; - border: 0px; - padding: 0px 0px 0px 6px; -} - -case-indicator { - background-color: @transparent; - text-color: @foreground; - spacing: 0; - border: 0px; -} - - -listview { - background-color: @background; - columns: 1; - spacing: 4px; - cycle: false; - dynamic: true; - layout: vertical; - lines: 10; - scrollbar: false; - border: 0px; - fixed-height: false; -} - -mainbox { - background-color: @transparent; - text-color: @transparent; - children: [ inputbar, listview ]; - spacing: 5px; - padding: 10px 10px 10px 10px; -} - -element { - background-color: @background; - text-color: @foreground; - orientation: horizontal; - border-radius: 6px; - padding: 5px 0px 5px 0px; -} - -element-icon { - size: 20px; - border: 0px; - padding: 0px 10px 0px; -} - -element-text { - expand: true; - vertical-align: 0.5; -} - -element normal.urgent, -element alternate.urgent { - background-color: @urgent; - text-color: @foreground; - border-radius: 9px; -} - -element normal.active, -element alternate.active { - background-color: @background-alt; - text-color: @foreground; -} - -element selected { - background-color: @background-alt; - text-color: @foreground-selected; -} - -element selected.urgent { - background-color: @urgent-selected; - text-color: @foreground; -} - -element selected.active { - background-color: @background-alt; - color: @foreground-selected; + font: "VictorMono Nerd Font 30.0"; } +@import "/home/chris/.dotfiles/rofi/launchers-git/blurry.rasi" diff --git a/rofi/launchers-git/blurry.rasi b/rofi/launchers-git/blurry.rasi index 4080741..4fa8859 100644 --- a/rofi/launchers-git/blurry.rasi +++ b/rofi/launchers-git/blurry.rasi @@ -9,7 +9,6 @@ */ configuration { - font: "VictorMono Nerd Font 14.0"; display-drun: " "; drun-display-format: "{name} {description} - {command}"; threads: 0; diff --git a/rofi/launchers-git/desktop.rasi b/rofi/launchers-git/desktop.rasi new file mode 100644 index 0000000..f3a05db --- /dev/null +++ b/rofi/launchers-git/desktop.rasi @@ -0,0 +1,15 @@ +/*-*- mode: css; -*-*/ +/* + * + * Author : Aditya Shakya (adi1090x) + * Mail : adi1090x@gmail.com + * Github : @adi1090x + * Reddit : @adi1090x + * + */ + + +configuration { + font: "VictorMono Nerd Font 14.0"; +} +@import "/home/chris/.dotfiles/rofi/launchers-git/blurry.rasi" diff --git a/rofi/launchers-git/laptop.rasi b/rofi/launchers-git/laptop.rasi new file mode 100644 index 0000000..061ca4b --- /dev/null +++ b/rofi/launchers-git/laptop.rasi @@ -0,0 +1,15 @@ +/*-*- mode: css; -*-*/ +/* + * + * Author : Aditya Shakya (adi1090x) + * Mail : adi1090x@gmail.com + * Github : @adi1090x + * Reddit : @adi1090x + * + */ + + +configuration { + font: "VictorMono Nerd Font 30.0"; +} +@import "/home/chris/.dotfiles/rofi/launchers-git/blurry.rasi" diff --git a/rofi/launchers-git/launcher.sh b/rofi/launchers-git/launcher.sh index 406ccb3..c112d9d 100755 --- a/rofi/launchers-git/launcher.sh +++ b/rofi/launchers-git/launcher.sh @@ -13,14 +13,12 @@ # row row_center screen row_dock row_dropdown -# if [ $(hostname) = "chris-linuxlaptop" ]; then -# style="blurry-hidpi" -# #echo "this is hidpi" -# else -# style="blurry" -# #echo "this is not hidpi" -# fi - -style="blurry" +if [ $(hostname) = "chris-linuxlaptop" ]; then + style="laptop" + #echo "this is hidpi" +else + style="desktop" + #echo "this is not hidpi" +fi rofi -no-lazy-grab -show drun -modi drun,window,calc,ssh,run,emoji -theme launchers-git/"$style".rasi