diff --git a/files/i3/.config/alacritty.yml b/files/i3/.config/alacritty.yml index 42a3337..bfb0a1b 100644 --- a/files/i3/.config/alacritty.yml +++ b/files/i3/.config/alacritty.yml @@ -6,35 +6,38 @@ scrolling: font: normal: family: Input Mono -draw_bold_text_with_bright_colors: true +draw_bold_text_with_bright_colors: false dynamic_title: true -# Colors (Tomorrow Night Bright) +# Colors (Solarized Light) colors: # Default colors primary: - background: '#000000' - foreground: '#eaeaea' + background: '#fdf6e3' # base3 + foreground: '#657b83' # base00 + + # Cursor colors + cursor: + text: '#fdf6e3' # base3 + cursor: '#657b83' # base00 # Normal colors normal: - black: '#000000' - red: '#d54e53' - green: '#b9ca4a' - yellow: '#e6c547' - blue: '#7aa6da' - magenta: '#c397d8' - cyan: '#70c0ba' - white: '#424242' + black: '#073642' # base02 + red: '#dc322f' # red + green: '#859900' # green + yellow: '#b58900' # yellow + blue: '#268bd2' # blue + magenta: '#d33682' # magenta + cyan: '#2aa198' # cyan + white: '#eee8d5' # base2 # Bright colors bright: - black: '#666666' - red: '#ff3334' - green: '#9ec400' - yellow: '#e7c547' - blue: '#7aa6da' - magenta: '#b77ee0' - cyan: '#54ced6' - - - white: '#2a2a2a' + black: '#002b36' # base03 + red: '#cb4b16' # orange + green: '#586e75' # base01 + yellow: '#657b83' # base00 + blue: '#839496' # base0 + magenta: '#6c71c4' # violet + cyan: '#93a1a1' # base1 + white: '#fdf6e3' # base3 diff --git a/files/i3/.i3/config b/files/i3/.i3/config index c1d066b..b69c09b 100644 --- a/files/i3/.i3/config +++ b/files/i3/.i3/config @@ -14,7 +14,6 @@ set $WS4 4: # Startup items that don't have their windows exec --no-startup-id nitrogen --restore exec --no-startup-id redshift-gtk -# exec --no-startup-id compton --config ~/.compton.conf # For ArchLinux exec --no-startup-id connman-gtk @@ -24,9 +23,10 @@ exec --no-startup-id nm-applet exec --no-startup-id aa-notify -p -s 1 -w 60 -f /var/log/audit/audit.log exec --no-startup-id autorandr --change -# terminal -# https://www.systutorials.com/docs/linux/man/1-urxvtd/ -exec urxvtd --quiet --fork --opendisplay +# Caps Lock = Hyper_L +exec setxkbmap -option ctrl:nocaps +exec xmodmap -e 'clear lock' +exec xmodmap -e 'keycode 66 = Hyper_L' # Set default backlight exec xbacklight -set 15 @@ -35,8 +35,9 @@ exec xbacklight -set 15 exec i3-msg "workspace $WS1; exec subl" exec i3-msg "workspace $WS1; exec alacritty" -# Web workspace +# Web workspace (Run both, depending on the system I'm on) exec i3-msg "workspace $WS2; exec firefox-beta" +exec i3-msg "workspace $WS2; exec firefox" # Startup figure out monitors exec autorandr @@ -50,7 +51,7 @@ workspace_layout default hide_edge_borders both # Still playing around with this -font pango:Fira Sans 8,Dejavu Sans,Cantarell 10,FontAwesome 9 +font pango:Cantarell 10,Fira Sans 8,Dejavu Sans,FontAwesome 9 # Use Mouse+$mod to drag floating windows to their wanted position floating_modifier $mod @@ -59,11 +60,6 @@ floating_modifier $mod bindsym $mod+Return split v; exec alacritty bindsym $mod+Shift+Return split h; exec alacritty -# Split terminals using byobu shortcuts -#bindsym Shift+F2 split v; exec alacritty -#bindsym Ctrl+F2 split h; exec alacritty - - # Snippy for quick text # https://gist.github.com/coderofsalvation/46549e3788ade2f3a938 bindsym $mod+grave exec snippy.sh @@ -81,7 +77,6 @@ bindsym $mod+F8 exec pcmanfm --role=floating bindsym $mod+Shift+q kill # keyboard backlight, for Mac - # increase/decrease keyboard brightness bindsym XF86KbdBrightnessUp exec /home/nemo/projects/scripts/backlight up bindsym XF86KbdBrightnessDown exec /home/nemo/projects/scripts/backlight down @@ -176,7 +171,7 @@ bindsym $mod+Shift+9 move container to workspace 9 bindsym $mod+Shift+0 move container to workspace 10 # rename a workspace -# bindsym $mod+ctrl+r exec i3-input -F 'rename workspace to "%s"' -P 'New name: ' +bindsym $mod+ctrl+r exec i3-input -F 'rename workspace to "%s"' -P 'New name: ' # reload the configuration file bindsym $mod+Shift+c reload @@ -224,9 +219,8 @@ bindsym XF86AudioRaiseVolume exec amixer -q -D pulse sset Master 5%+ && pkill -R bindsym XF86AudioLowerVolume exec amixer -q -D pulse sset Master 5%- && pkill -RTMIN+10 i3blocks bindsym XF86AudioMute exec amixer -q -D pulse sset Master toggle && pkill -RTMIN+10 i3blocks - # Window assignments -for_window [class="Pcmanfm"] floating enable resuze 860 700 +for_window [class="Pcmanfm"] floating enable resize 860 800 for_window [class="Wine"] floating enable for_window [class="Blueberry.py"] floating enable for_window [class="Transmission-gtk"] floating enable @@ -267,6 +261,15 @@ smart_borders on bar { font xft:Cantarell, FontAwesome 11 status_command i3blocks + colors { + separator #657b83 + background #fdf6e3 + statusline #002b36 + focused_workspace #fdf6e3 #859900 #fdf6e3 + active_workspace #fdf6e3 #6c71c4 #fdf6e3 + inactive_workspace #586e75 #93a1a1 #002b36 + urgent_workspace #d33682 #d33682 #fdf6e3 + } } # Multi monitor @@ -280,4 +283,3 @@ client.focused #4E9C00 #4E9C00 #FFFFFF #FFFFFF client.focused_inactive #1B3600 #1B3600 #888888 #FFFFFF client.unfocused #333333 #333333 #888888 #FFFFFF client.urgent #C20000 #C20000 #FFFFFF #FFFFFF - diff --git a/files/x11/.Xresources b/files/x11/.Xresources index 088e72b..8cf5609 100644 --- a/files/x11/.Xresources +++ b/files/x11/.Xresources @@ -1,39 +1,81 @@ -! special -*.foreground: #c5c8c6 -*.background: #1d1f21 -*.cursorColor: #c5c8c6 +!! drop in Solarized colorscheme for Xresources/Xdefaults -! black -*.color0: #282a2e -*.color8: #373b41 +!!SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B RGB HSB +!!--------- ------- ---- ------- ----------- ---------- ----------- ----------- +!!base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21 +!!base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26 +!!base01 #586e75 10/7 brgreen 240 #585858 45 -07 -07 88 110 117 194 25 46 +!!base00 #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195 23 51 +!!base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59 +!!base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63 +!!base2 #eee8d5 7/7 white 254 #e4e4e4 92 -00 10 238 232 213 44 11 93 +!!base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99 +!!yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71 +!!orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80 +!!red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86 +!!magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83 +!!violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77 +!!blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82 +!!cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63 +!!green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60 -! red -*.color1: #a54242 -*.color9: #cc6666 +#define S_base03 #002b36 +#define S_base02 #073642 +#define S_base01 #586e75 +#define S_base00 #657b83 +#define S_base0 #839496 +#define S_base1 #93a1a1 +#define S_base2 #eee8d5 +#define S_base3 #fdf6e3 +#define S_yellow #b58900 +#define S_orange #cb4b16 +#define S_red #dc322f +#define S_magenta #d33682 +#define S_violet #6c71c4 +#define S_blue #268bd2 +#define S_cyan #2aa198 +#define S_green #859900 -! green -*.color2: #8c9440 -*.color10: #b5bd68 +*background: S_base03 +*foreground: S_base00 +*fading: 40 +*fadeColor: S_base03 +*cursorColor: S_base1 +*pointerColorBackground:S_base01 +*pointerColorForeground:S_base1 -! yellow -*.color3: #de935f -*.color11: #f0c674 +!! black dark/light +*color0: S_base02 +*color8: S_base03 -! blue -*.color4: #5f819d -*.color12: #81a2be +!! red dark/light +*color1: S_red +*color9: S_orange -! magenta -*.color5: #85678f -*.color13: #b294bb +!! green dark/light +*color2: S_green +*color10: S_base01 -! cyan -*.color6: #5e8d87 -*.color14: #8abeb7 +!! yellow dark/light +*color3: S_yellow +*color11: S_base00 + +!! blue dark/light +*color4: S_blue +*color12: S_base0 + +!! magenta dark/light +*color5: S_magenta +*color13: S_violet + +!! cyan dark/light +*color6: S_cyan +*color14: S_base1 + +!! white dark/light +*color7: S_base2 +*color15: S_base3 -! white -*.color7: #707880 -*.color15: #c5c8c6 @@ -87,4 +129,4 @@ URxvt.matcher.button: 1 URxvt.keysym.C-Delete: perl:matcher:last URxvt.keysym.M-Delete: perl:matcher:list -URxvt.imLocale: en_US.utf8 \ No newline at end of file +URxvt.imLocale: en_US.utf8