diff --git a/apps/git/config b/apps/git/config index 911ca3f..be48971 100644 --- a/apps/git/config +++ b/apps/git/config @@ -3,7 +3,7 @@ [user] name = Daniel Flanagan - email = daniel@lytedev.io + email = daniel.flanagan@mixonhill.com [filter "lfs"] clean = git-lfs clean -- %f diff --git a/apps/neovim/ftplugin/typescript.vim b/apps/neovim/ftplugin/typescript.vim index 77fd7f5..5950abc 100644 --- a/apps/neovim/ftplugin/typescript.vim +++ b/apps/neovim/ftplugin/typescript.vim @@ -1 +1,2 @@ let b:ale_fixers = ['tslint'] +let b:ale_linters = ['tsserver'] diff --git a/apps/neovim/plugins.vim b/apps/neovim/plugins.vim index 67cbe51..b14cb03 100644 --- a/apps/neovim/plugins.vim +++ b/apps/neovim/plugins.vim @@ -59,6 +59,7 @@ let g:ale_fix_on_save = 1 " autocomplete let g:ale_completion_enabled = 1 +let g:ale_typescript_tslint_use_global = 1 let g:fzf_layout = { 'window': 'enew' } @@ -97,10 +98,12 @@ Plug 'wellle/targets.vim' " adds some more Plug 'dbakker/vim-projectroot' " adds helper functions for getting to a project's root directory Plug 'junegunn/goyo.vim' " better distraction-free editing Plug 'editorconfig/editorconfig-vim' " loads project-specific editor settings +Plug 'sheerun/vim-polyglot' " vim plugin loader for many languages Plug 'leafo/moonscript-vim', {'for': ['moon', 'moonscript']} " moonscript language Plug 'OmniSharp/omnisharp-vim', {'for': ['cs']} " C# language Plug 'junegunn/vim-peekaboo' " preview registers Plug 'scrooloose/nerdtree' " file browser Plug 'tpope/vim-eunuch' " unix helper commands Plug 'sheerun/vim-polyglot' " vim plugin loader for many languages - +Plug 'leafo/moonscript-vim', {'for': ['moon', 'moonscript']} " moonscript language +Plug 'OmniSharp/omnisharp-vim', {'for': ['cs']} " C# language diff --git a/apps/neovim/settings.vim b/apps/neovim/settings.vim index c3723e9..03f07c2 100644 --- a/apps/neovim/settings.vim +++ b/apps/neovim/settings.vim @@ -84,7 +84,7 @@ set isfname+=32 " allow filenames to show them 32s " no freakin' bell set visualbell t_vb= if has('autocmd') - augroup DisableVisualVell + augroup DisableVisualBell autocmd GUIEnter * set visualbell t_vb= augroup END endif diff --git a/de/bspwm/bspwmrc b/de/bspwm/bspwmrc index bc416f4..8f732a8 100755 --- a/de/bspwm/bspwmrc +++ b/de/bspwm/bspwmrc @@ -38,9 +38,9 @@ if command -v sxhkd >/dev/null 2>&1; then sxhkd -m -1 & fi -if [ -f "$DOTFILES_PATH/de/x/loadresources" ]; then - source "$DOTFILES_PATH/de/x/loadresources" -fi +# if [ -f "$DOTFILES_PATH/de/x/loadresources" ]; then +# source "$DOTFILES_PATH/de/x/loadresources" +# fi if [ -f "$HOME/.fehbg" ]; then "$HOME/.fehbg" & diff --git a/de/fontconfig/conf.d/01-emoji.conf b/de/fontconfig/conf.d/01-emoji.conf deleted file mode 100644 index 5867948..0000000 --- a/de/fontconfig/conf.d/01-emoji.conf +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - Segoe UI Emoji - Noto Color Emoji - - diff --git a/de/x/loadresources b/de/x/loadresources index d2b8540..a514108 100755 --- a/de/x/loadresources +++ b/de/x/loadresources @@ -4,6 +4,13 @@ echo "xloadresources" >> "$HOME/.xstartup_log" ENV_TYPE="${1}" +if [[ "$ENV_TYPE" = "auto" ]]; then + if [[ "$(xrandr --listmonitors | grep 'Monitors:' | awk '{print $2}')" -gt 1 ]]; then + ENV_TYPE="lodpi" + fi + echo "xloadresources auto env: $ENV_TYPE" >> "$HOME/.xstartup_log" +fi + if [[ -z "$ENV_TYPE" ]]; then ENV_TYPE="" else diff --git a/de/x/profile b/de/x/profile index 0fb66ca..0dbc983 100644 --- a/de/x/profile +++ b/de/x/profile @@ -7,10 +7,14 @@ if [[ -z "$DOTFILES_PATH" ]]; then export DOTFILES_PATH="$XDG_CONFIG_HOME/dotfiles" fi +if command -v autorandr >/dev/null 2>&1; then + autorandr -c +fi + echo "xprofile ($DOTFILES_PATH)" >> "$HOME/.xstartup_log" if [ -f "$DOTFILES_PATH/de/x/loadresources" ]; then - source "$DOTFILES_PATH/de/x/loadresources" + "$DOTFILES_PATH/de/x/loadresources" auto fi # keyrepeat settings diff --git a/de/x/resources b/de/x/resources index 61c0d21..25c2ed0 100755 --- a/de/x/resources +++ b/de/x/resources @@ -15,35 +15,36 @@ ## *letterSpace: 0 ## Set fonts in "$HOME/.Xresources.env" -URxvt*font: xft:Iosevka:pixelsize=14,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14 -URxvt*faceName: xft:Iosevka:pixelsize=14,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14 -URxvt*boldFont: xft:Iosevka:pixelsize=14:style=bold,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14 -URxvt*letterSpace: 0 +URxvt.font: xft:Iosevka:pixelsize=14,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14 +URxvt.faceName: xft:Iosevka:pixelsize=14,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14 +URxvt.boldFont: xft:Iosevka:pixelsize=14:style=bold,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14 +URxvt.letterSpace: 0 ## rxvt-unicode configuration -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 +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 Xcursor.theme: human ## DPI config -*dpi: 92 +dpi: 92 +.dpi: 92 Xft.dpi: 92 *autohint: 0 *lcdfilter: lcddefault diff --git a/readme.md b/readme.md index 4544b04..0ed7b2e 100644 --- a/readme.md +++ b/readme.md @@ -1,3 +1,9 @@ +# Note + +This is a Mixon Hill Inc. employee specific version of my dotfiles from here: + +* https://github.com/lytedev/dotfiles + # My Dotfiles This repository contains the majority of application or OS configuration files diff --git a/scripts/bin/bspwm_load_state b/scripts/bin/bspwm_load_state new file mode 100755 index 0000000..5a36b1c --- /dev/null +++ b/scripts/bin/bspwm_load_state @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +f="$DOTFILES_PATH/.bspwm-state.json.tmp" +c="$DOTFILES_PATH/.bspwm-canvas.json.tmp" +bspwm_load_state_canvas "$f" > "$c" +chmod 600 "$c" +bspc wm -l "$c" +rm "$c" +bspwm_load_state_rules "$f" | bash diff --git a/scripts/bin/bspwm_load_state_canvas b/scripts/bin/bspwm_load_state_canvas new file mode 100755 index 0000000..09e4902 --- /dev/null +++ b/scripts/bin/bspwm_load_state_canvas @@ -0,0 +1,27 @@ +#! /usr/bin/env python3 + +import sys +import json + +source = open(sys.argv[1]) if len(sys.argv) > 1 else sys.stdin +state = json.load(source) + +def nullify_clients(node): + if node is None: + return + elif node['client'] is None: + nullify_clients(node['firstChild']) + nullify_clients(node['secondChild']) + else: + node['client'] = None + +state['clientsCount'] = 0 +state['focusHistory'] = [] +state['stackingList'] = [] + +for monitor in state['monitors']: + for desktop in monitor['desktops']: + desktop['focusedNodeId'] = 0 + nullify_clients(desktop['root']) + +print(json.dumps(state)) diff --git a/scripts/bin/bspwm_load_state_rules b/scripts/bin/bspwm_load_state_rules new file mode 100755 index 0000000..f4f2f54 --- /dev/null +++ b/scripts/bin/bspwm_load_state_rules @@ -0,0 +1,26 @@ +#!/usr/bin/env python3 + +import sys +import json +import os + +file = os.environ['DOTFILES_PATH'] + '/.bspwm-state.json.tmp' + +source = open(sys.argv[1]) if len(sys.argv) > 1 else sys.stdin +state = json.load(source) + +def print_rules(prefix, node, path): + if node is None: + return + elif node['client'] is None: + print_rules(prefix, node['firstChild'], path+['1']) + print_rules(prefix, node['secondChild'], path+['2']) + else: + client = node['client'] + print('bspc rule -a {}:{} -o node={}{}'.format(client['className'], + client['instanceName'], + prefix, '/'.join(path))) + +for i, monitor in enumerate(state['monitors']): + for j, desktop in enumerate(monitor['desktops']): + print_rules('@^{}:^{}:/'.format(i+1, j+1), desktop['root'], []) diff --git a/scripts/bin/bspwm_save_state b/scripts/bin/bspwm_save_state new file mode 100755 index 0000000..595a119 --- /dev/null +++ b/scripts/bin/bspwm_save_state @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +f="$DOTFILES_PATH/.bspwm-state.json.tmp" +bspc wm -d > "$f" +chmod 600 "$f" diff --git a/scripts/colors/generator/schemes/holodized.yml b/scripts/colors/generator/schemes/holodized.yml index bdaded9..8d1ffa3 100644 --- a/scripts/colors/generator/schemes/holodized.yml +++ b/scripts/colors/generator/schemes/holodized.yml @@ -1,15 +1,15 @@ scheme: "Holodized" author: "Daniel Flanagan(https://lytedev.io)" -base00: "fdf6e3" # background, light cream +base00: "eeeeee" # background, light cream base01: "ddd6c3" # darker cream base02: "ada693" # darker cream base03: "8d8673" # greyish yellow (peuce) base04: "554f45" # darker peuce base05: "111111" # foreground dark grey -base06: "333333" # foreground 2 dark grey -base07: "555555" # foreground 3 dark grey +base06: "555555" # foreground 2 dark grey +base07: "888888" # foreground 3 dark grey base08: "990833" # magenta -base09: "fd971f" # orange +base09: "8d370f" # orange base0A: "947010" # yellow base0B: "06623e" # green base0C: "006677" # cyan diff --git a/shell/bash/bashrc b/shell/bash/bashrc index e63c597..edb546f 100644 --- a/shell/bash/bashrc +++ b/shell/bash/bashrc @@ -95,6 +95,9 @@ if [ "$PWD" = "$HOME" ]; then cd "$NICE_HOME" || cd || return fi +# TODO: check if fd command exists +export FZF_DEFAULT_COMMAND='fd --type f --hidden --follow --exclude .git' + _make_paths [ -f ~/.fzf.bash ] && source ~/.fzf.bash diff --git a/shell/bash/paths b/shell/bash/paths index b76200d..528bb40 100644 --- a/shell/bash/paths +++ b/shell/bash/paths @@ -7,6 +7,7 @@ export PATH=$PATH:"$GOPATH/bin" export PATH=$PATH:"$DOTFILES_PATH/scripts/bin" export PATH=$PATH:"$DOTFILES_PATH/scripts/env_bin" export PATH=$PATH:"$HOME/.cargo/bin" +export PATH=$PATH:"$HOME/.yarn/bin" if [ -d "$HOME/.local/bin" ]; then export PATH=$PATH:"$HOME/.local/bin"