diff --git a/de/bar/bar.bash b/de/bar/bar.bash index 6140d0f..8bb9396 100755 --- a/de/bar/bar.bash +++ b/de/bar/bar.bash @@ -1,6 +1,7 @@ #!/usr/bin/env bash export BAR_MONITOR="$(polybar --list-monitors | tail -n 1 | sed -n 's/^\s*\(.*\):.*$/\1/p')" +export BAR_MONITOR="$(polybar --list-monitors | tail -n 2 | head -n 1 | sed -n 's/^\s*\(.*\):.*$/\1/p')" export BAR_HEIGHT=40 export BAR_ON_TOP=0 export BAR_SIDE_MARGIN=200 diff --git a/de/bar/polybar-config b/de/bar/polybar-config index a0e949a..3d3d39f 100644 --- a/de/bar/polybar-config +++ b/de/bar/polybar-config @@ -251,7 +251,7 @@ format-prefix-foreground = ${colors.foreground-alt} label = %date%%time% [module/volume] -type = internal/volume +type = internal/alsa format-volume = label-volume =  @@ -326,13 +326,13 @@ label-foreground = ${xrdb:color2} format-prefix = format-prefix-foreground = ${colors.foreground-alt} -label = %temperature% -label-warn = %temperature% +label = %temperature-c% +label-warn = %temperature-c% label-warn-foreground = ${xrdb:color1} ramp-0 = " " ramp-1 = " " -ramp-2 = " " +ramp-2 = "t " ramp-foreground = ${colors.foreground-alt} [module/powermenu] diff --git a/de/gtk2rc b/de/gtk2rc index 54dd40d..76a4b49 100644 --- a/de/gtk2rc +++ b/de/gtk2rc @@ -1,3 +1,3 @@ gtk-icon-theme-name = "elementary" gtk-theme-name = "Arc-Dark" -gtk-font-name = "Monaco 9" +gtk-font-name = "Iosevka Nerd Font 9" diff --git a/de/gtk3settings.ini b/de/gtk3settings.ini index e1271f4..b257e99 100644 --- a/de/gtk3settings.ini +++ b/de/gtk3settings.ini @@ -1,5 +1,5 @@ [Settings] gtk-icon-theme-name = elementary gtk-theme-name = Arc-Dark -gtk-font-name = Monaco 9 +gtk-font-name = Iosevka Nerd Font 9 gtk-application-prefer-dark-theme = true diff --git a/de/xresources b/de/xresources index a9c61da..27038f9 100755 --- a/de/xresources +++ b/de/xresources @@ -15,28 +15,28 @@ # *letterSpace: 0 # Set fonts in "$HOME/.Xresources.env" -*font: xft:xos4 Terminus:pixelsize=14,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14 -*faceName: xft:xos4 Terminus:pixelsize=14,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14 -*boldFont: xft:xos4 Terminus:pixelsize=14,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14 -*letterSpace: 0 +URxvt*font: xft:Iosevka Nerd Font:pixelsize=14,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14 +URxvt*faceName: xft:Iosevka Nerd Font:pixelsize=14,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14 +URxvt*boldFont: xft:Iosevka Nerd Font:pixelsize=14:style=bold,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14 +URxvt*letterSpace: 0 # rxvt-unicode configuration -*termName: rxvt-unicode -*scrollBar: false -*cursorUnderline: true -*cursorBlink: true -*intensityStyles: true -*utf8: 1 -*scaleHeight: 1 -*depth: 32 -URxvt.internalBorder: 24 -URxvt.perl-ext-common: default,matcher,resize-font -URxvt.keysym.M-Escape: perl:keyboard-select:activate -URxvt.resize-font.smaller: C-Down -URxvt.resize-font.bigger: C-Up -URxvt.url-launcher: /usr/bin/xdg-open -URxvt.matcher.button: 1 -URxvt.depth: 0 +URxvt*termName: rxvt-unicode +URxvt*scrollBar: false +URxvt*cursorUnderline: true +URxvt*cursorBlink: true +URxvt*intensityStyles: true +URxvt*utf8: 1 +URxvt*scaleHeight: 1 +URxvt*depth: 32 +URxvt*internalBorder: 24 +URxvt*perl-ext-common: default,matcher,resize-font +URxvt*keysym.M-Escape: perl:keyboard-select:activate +URxvt*resize-font.smaller: C-Down +URxvt*resize-font.bigger: C-Up +URxvt*url-launcher: /usr/bin/xdg-open +URxvt*matcher.button: 1 +URxvt*depth: 0 URxvt*iso14755: False # Other Xorg configuration diff --git a/scripts/arch-linux/provisioning/2-essentials.bash b/scripts/arch-linux/provisioning/2-essentials.bash index 6ee5668..ccccd2e 100755 --- a/scripts/arch-linux/provisioning/2-essentials.bash +++ b/scripts/arch-linux/provisioning/2-essentials.bash @@ -35,8 +35,9 @@ pacaur -S \ unclutter-xfixes-git `# Hides cursor after no use for a time` \ gtk-engine-murrine xorg-server-devel `# GTK Theme Base and Headers?` \ bspwm-git sxhkd-git xdo-git `# Window Manager and Tools for its use` \ - terminus-font ttf-monaco `# Primary Fonts` \ + terminus-font ttf-iosevka-pack `# Primary Fonts` \ ttf-freefont `# Font` \ + ttd-monaco `# Font` \ ttf-font-awesome-4 ttf-font-awesome `# Icon Font` \ autocutsel `# Clipboard Helper` \ curl `# HTTP Utility` \ diff --git a/scripts/bin/app-launcher b/scripts/bin/app-launcher index b42eb78..2d323cb 100755 --- a/scripts/bin/app-launcher +++ b/scripts/bin/app-launcher @@ -17,4 +17,4 @@ done echo "$params" >> "$HOME/.sxhkd.log" -rofi -font "$LAUNCHER_FONT $LAUNCHER_FONT_SIZE" -padding $GAP -bw "$BORDER_WIDTH" -color-enabled -color-window "$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR" -color-normal "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -color-normal "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -color-active "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -color-urgent "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -monitor -4 $params +rofi -font "$LAUNCHER_FONT $LAUNCHER_FONT_SIZE" -padding $GAP -bw "$BORDER_WIDTH" -color-enabled -color-window "$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR" -color-normal "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -color-normal "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -color-active "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -color-urgent "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_FOREGROUND_COLOR" -monitor -4 -width 600 -location 3 $params diff --git a/scripts/colors/generator/schemes/donokai-black.yml b/scripts/colors/generator/schemes/donokai-black.yml new file mode 100644 index 0000000..cc56bb2 --- /dev/null +++ b/scripts/colors/generator/schemes/donokai-black.yml @@ -0,0 +1,18 @@ +scheme: "Donokai-BLACK" +author: "Daniel Flanagan(https://lytedev.io)" +base00: "000000" # background, dark grey +base01: "383830" # lighter grey +base02: "49483e" # lighter grey +base03: "75715e" # greyish yellow (peuce) +base04: "a59f85" # lighter peuce +base05: "f8f8f2" # foreground white +base06: "f5f4f1" # foreground 2 white +base07: "f9f8f5" # foreground 3 white +base08: "f92672" # magenta +base09: "fd971f" # orange +base0A: "f4bf75" # yellow +base0B: "a6e22e" # green +base0C: "a1efe4" # cyan +base0D: "66d9ef" # blue +base0E: "ae81ff" # purple +base0F: "cc6633" # pale orange diff --git a/scripts/colors/generator/schemes/donokai.yml b/scripts/colors/generator/schemes/donokai.yml index 7c0c4a8..26de2ec 100644 --- a/scripts/colors/generator/schemes/donokai.yml +++ b/scripts/colors/generator/schemes/donokai.yml @@ -1,5 +1,5 @@ scheme: "Donokai" -author: "Wimer Hazenberg (http://www.monokai.nl)" +author: "Daniel Flanagan(https://lytedev.io)" base00: "111111" # background, dark grey base01: "383830" # lighter grey base02: "49483e" # lighter grey diff --git a/scripts/colors/shell b/scripts/colors/shell index 42b57c5..f6e790b 100755 --- a/scripts/colors/shell +++ b/scripts/colors/shell @@ -1,13 +1,13 @@ #!/bin/sh -# Base16 Donokai - Shell color setup script -# Wimer Hazenberg (http://www.monokai.nl) +# Base16 Donokai-BLACK - Shell color setup script +# Daniel Flanagan(https://lytedev.io) if [ "${TERM%%-*}" = 'linux' ]; then # This script doesn't support linux console (use 'vconsole' template instead) return 2>/dev/null || exit 0 fi -color00="11/11/11" # Base 00 - Black +color00="00/00/00" # Base 00 - Black color01="f9/26/72" # Base 08 - Red color02="a6/e2/2e" # Base 0B - Green color03="f4/bf/75" # Base 0A - Yellow @@ -30,7 +30,7 @@ color19="49/48/3e" # Base 02 color20="a5/9f/85" # Base 04 color21="f5/f4/f1" # Base 06 color_foreground="f8/f8/f2" # Base 05 -color_background="11/11/11" # Base 00 +color_background="00/00/00" # Base 00 color_cursor="f8/f8/f2" # Base 05 if [ -n "$TMUX" ]; then @@ -83,12 +83,12 @@ printf $printf_template 21 $color21 if [ -n "$ITERM_SESSION_ID" ]; then # iTerm2 proprietary escape codes printf $printf_template_custom Pg f8f8f2 # forground - printf $printf_template_custom Ph 111111 # background + printf $printf_template_custom Ph 000000 # background printf $printf_template_custom Pi f8f8f2 # bold color printf $printf_template_custom Pj 49483e # selection color printf $printf_template_custom Pk f8f8f2 # selected text color printf $printf_template_custom Pl f8f8f2 # cursor - printf $printf_template_custom Pm 111111 # cursor text + printf $printf_template_custom Pm 000000 # cursor text else printf $printf_template_var 10 $color_foreground printf $printf_template_var 11 $color_background diff --git a/scripts/colors/vconsole b/scripts/colors/vconsole old mode 100644 new mode 100755 index 873f239..0f32b22 --- a/scripts/colors/vconsole +++ b/scripts/colors/vconsole @@ -1,8 +1,8 @@ #!/bin/sh -# Base16 Donokai - Virtual console color setup script -# Wimer Hazenberg (http://www.monokai.nl) +# Base16 Donokai-BLACK - Virtual console color setup script +# Daniel Flanagan(https://lytedev.io) -color00="111111" # Base 00 - Black +color00="000000" # Base 00 - Black color01="f92672" # Base 08 - Red color02="a6e22e" # Base 0B - Green color03="f4bf75" # Base 0A - Yellow diff --git a/scripts/colors/vim b/scripts/colors/vim index a1b330b..94491f5 100644 --- a/scripts/colors/vim +++ b/scripts/colors/vim @@ -1,5 +1,5 @@ -" Base16 Donokai (https://github.com/chriskempson/base16) -" Scheme: Wimer Hazenberg (http://www.monokai.nl) +" Base16 Donokai-BLACK (https://github.com/chriskempson/base16) +" Scheme: Daniel Flanagan(https://lytedev.io) " This enables the coresponding base16-shell script to run so that " :colorscheme works in terminals supported by base16-shell scripts @@ -7,12 +7,12 @@ " let g:base16_shell_path=base16-builder/output/shell/ if !has('gui_running') if exists("g:base16_shell_path") - execute "silent !/bin/sh ".g:base16_shell_path."/base16-donokai.".&background.".sh" + execute "silent !/bin/sh ".g:base16_shell_path."/base16-donokai-black.".&background.".sh" endif endif " GUI color definitions -let s:gui00 = "111111" +let s:gui00 = "000000" let s:gui01 = "383830" let s:gui02 = "49483e" let s:gui03 = "75715e" @@ -59,7 +59,7 @@ endif " Theme setup hi clear syntax reset -let g:colors_name = "base16-donokai" +let g:colors_name = "base16-donokai-black" " Highlighting function fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) diff --git a/scripts/colors/xresources b/scripts/colors/xresources index 2e09987..185421c 100644 --- a/scripts/colors/xresources +++ b/scripts/colors/xresources @@ -1,7 +1,7 @@ -! Base16 Donokai -! Scheme: Wimer Hazenberg (http://www.monokai.nl) +! Base16 Donokai-BLACK +! Scheme: Daniel Flanagan(https://lytedev.io) -#define base00 #111111 +#define base00 #000000 #define base01 #383830 #define base02 #49483e #define base03 #75715e diff --git a/shell/aliases b/shell/aliases index 03ec612..af36f83 100644 --- a/shell/aliases +++ b/shell/aliases @@ -100,6 +100,15 @@ alias btctl="sudo bluetoothctl" alias pt="htop -t" # experimental htop tree-view-by-default alias resrc="source \$HOME/.bashrc" alias redshift="redshift -l 39.0997:-94.5786" +alias gpmdpe="electron --app=/usr/share/gpmdp/resources/app.asar" + +export NOTES_DIR="$NICE_HOME" + +n() { + SUBDIR="${2:-}" + mkdir -p "$NICE_HOME/doc/notes/$SUBDIR" + "$EDITOR" "$NICE_HOME/doc/notes/$SUBDIR/$(date +%Y-%m-%d)_$1.md" +} # games aliases # this sometimes fixes steam dynamic library issues?