From 06c3be93189aa5c945a08f9f640356e173a875ab Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Fri, 22 Feb 2019 09:27:43 -0600 Subject: [PATCH 1/5] Add notes tmux alias --- shell/bash/aliases | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shell/bash/aliases b/shell/bash/aliases index 8b56b17..3d1f6a2 100644 --- a/shell/bash/aliases +++ b/shell/bash/aliases @@ -50,6 +50,7 @@ alias tu="tmux attach -t utils || tmux new -s utils" alias tdf="tmux attach -t dotfiles || tmux new -s dotfiles -c \"\$DOTFILES_PATH\"" alias tmon="tmux attach -t monitoring || tmux new -s monitoring" alias tcom="tmux attach -t comms || tmux new -s comms" +alias tn="tmux attach -t notes || tmux new -s notes" # git aliases # TODO: make these git aliases in the gitconfig? @@ -75,6 +76,7 @@ alias ctop="docker run --rm -ti -v /var/run/docker.sock:/var/run/docker.sock qua alias p="ping 8.8.8.8" alias C="clear && clear" alias r="ranger" +alias rn="/usr/bin/watch -n 1" alias sctl="sudo systemctl" alias btctl="sudo bluetoothctl" alias pt="htop -t" # experimental htop tree-view-by-default From 2830ab6f11833a1550d75384a8ddec32b799a3fd Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 27 Feb 2019 23:29:49 -0600 Subject: [PATCH 2/5] sc-im config for spreadsheets --- apps/scim/lua/dice.lua | 90 ++++++++++++++++++++++++++++++++++++++++++ apps/scim/lua/h.lua | 0 apps/scim/rc | 13 ++++++ scripts/bin/scn | 5 +++ setup | 4 ++ shell/bash/aliases | 2 + 6 files changed, 114 insertions(+) create mode 100644 apps/scim/lua/dice.lua create mode 100644 apps/scim/lua/h.lua create mode 100644 apps/scim/rc create mode 100755 scripts/bin/scn diff --git a/apps/scim/lua/dice.lua b/apps/scim/lua/dice.lua new file mode 100644 index 0000000..d31bd30 --- /dev/null +++ b/apps/scim/lua/dice.lua @@ -0,0 +1,90 @@ +local os = require "os" +local math = require "math" + +math.randomseed(os.clock()) + +function table.tostring(self, indent, done) + local result = "" + done = done or {} + indent = indent or 0 + if type(self) == "table" then + for key, value in pairs(self) do + result = result .. string.rep(" ", indent) + if type(value) == "table" and not done[value] then + done[value] = true + result = result .. + string.format( + "[%s] => table\n", + tostring(key) + ) .. + "{\n" .. + table.tostring(value, indent + 2, done) .. + "}\n" + else + result = result .. + string.format("[%s] => %s\n", + tostring(key), + tostring(value) + ) + end + end + else + result = result .. self .. "\n" + end + return result +end + +function log(s) + s = "[timestamp: " .. tostring(os.time()) .. "]\n" .. s + local out = s:gsub("\n", "\n ") + print(out) + local file = io.open("/tmp/sc-im-dice.log", "a+") + file:write("\n") + file:write(out) + io.close(file) +end + +local dstr_matcher = "(%d*)d(%d+)" + +function dstr(n, s, fl) + n = tonumber(n) or 1 + local sum = 0 + for di = 1, n do + sum = sum + math.random(1, tonumber(s)) + end + return sum +end + +function rolls(s) + local pieces = {} + for nd, ds in s:gmatch(dstr_matcher) do + local sum = dstr(tonumber(nd), tonumber(ds)) + pieces[#pieces+1] = { + tostring(nd) .. "d" .. tostring(ds), + tostring(sum) + } + end + return pieces +end + +function replacerolls(s, rolls) + local result = s + for k, n in ipairs(rolls) do + result = result:gsub(n[1], n[2], 1) + end + return result +end + +function evalreturn(s) + local f = loadstring("return " .. s) + return f() +end + +function parserollstr(s) + return evalreturn(replacerolls(s, rolls(s))) +end + +function sc_rollres(c, r) + local sum = parserollstr(sc.lgetstr(c, r)) + sc.lsetnum(c + 1, r, sum) +end diff --git a/apps/scim/lua/h.lua b/apps/scim/lua/h.lua new file mode 100644 index 0000000..e69de29 diff --git a/apps/scim/rc b/apps/scim/rc new file mode 100644 index 0000000..adc8594 --- /dev/null +++ b/apps/scim/rc @@ -0,0 +1,13 @@ +set autocalc +set numeric +set numeric_decimal=0 +set overlap +set xlsx_readformulas + +color "type=HEADINGS fg=WHITE bg=BLACK bold=0 dim=0 standout=0 reverse=0" +color "type=CELL_SELECTION_SC fg=WHITE bg=BLACK bold=1 dim=0 standout=1" +color "type=CELL_SELECTION fg=WHITE bg=BLACK bold=1 dim=0 standout=1" +color "type=STRG fg=WHITE bg=BLACK bold=0 dim=1" +color "type=NUMB fg=YELLOW bg=BLACK bold=0 dim=1" + +nmap "J" "" diff --git a/scripts/bin/scn b/scripts/bin/scn new file mode 100755 index 0000000..83b140c --- /dev/null +++ b/scripts/bin/scn @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +SUBDIR="${2:-}" +mkdir -p "$NOTES_PATH/$SUBDIR" +sc-im "$NOTES_PATH/$SUBDIR/$(date +%Y-%m-%d)_$1.sc" diff --git a/setup b/setup index e5ba9b2..40dc6b0 100755 --- a/setup +++ b/setup @@ -44,6 +44,10 @@ links=( "$dfp/apps/qutebrowser/qutebrowser.conf" "$XDG_CONFIG_HOME/qutebrowser/qutebrowser.conf" "$dfp/apps/qutebrowser/keys.conf" "$XDG_CONFIG_HOME/qutebrowser/keys.conf" + # sc-im config files and scripts + "$dfp/apps/scim/rc" "$HOME/.scimrc" + "$dfp/apps/scim/lua" "$HOME/.scim/lua" + # document viewer "$dfp/apps/zathura/" "$XDG_CONFIG_HOME/zathura" diff --git a/shell/bash/aliases b/shell/bash/aliases index 3d1f6a2..5767423 100644 --- a/shell/bash/aliases +++ b/shell/bash/aliases @@ -84,6 +84,8 @@ alias resrc="source \$HOME/.bashrc" alias redshift="redshift -r -l 39.0997:-94.5786 -t 6500K:2500K" alias gpmdpe="electron --app=/usr/share/gpmdp/resources/app.asar" alias t="task" +alias sc="sc-im" +alias scs="sc-im \"\$NOTES_PATH/_scratch.sc\"" # games aliases # this sometimes fixes steam dynamic library issues? From 188644cd3b0f51ab4690ab11c5a82666832ccace Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 27 Feb 2019 23:37:09 -0600 Subject: [PATCH 3/5] Better seeding method --- apps/scim/lua/dice.lua | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/apps/scim/lua/dice.lua b/apps/scim/lua/dice.lua index d31bd30..7c2fafa 100644 --- a/apps/scim/lua/dice.lua +++ b/apps/scim/lua/dice.lua @@ -37,7 +37,6 @@ end function log(s) s = "[timestamp: " .. tostring(os.time()) .. "]\n" .. s local out = s:gsub("\n", "\n ") - print(out) local file = io.open("/tmp/sc-im-dice.log", "a+") file:write("\n") file:write(out) @@ -80,11 +79,17 @@ function evalreturn(s) return f() end -function parserollstr(s) - return evalreturn(replacerolls(s, rolls(s))) +function sc_parserollstr(s) + local r = rolls(s) + log(table.tostring(r)) + return evalreturn(replacerolls(s, r)) end function sc_rollres(c, r) - local sum = parserollstr(sc.lgetstr(c, r)) + local os = require "os" + local seed = (os.time() + os.clock()) * 10000000 + math.randomseed(seed) + log("Setting Seed: " .. tostring(seed)) + local sum = sc_parserollstr(sc.lgetstr(c, r)) sc.lsetnum(c + 1, r, sum) end From c889188d70787d5353a03ca990a11cea2dd1beb6 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 6 Mar 2019 12:20:34 -0600 Subject: [PATCH 4/5] Kitty! --- apps/alacritty/alacritty.yml | 254 ----------------------------------- apps/kitty/kitty.conf | 13 ++ apps/neovim/commands.vim | 2 + apps/ranger/rc.conf | 2 +- de/sxhkd/sxhkdrc | 2 +- scripts/bin/app-launcher | 24 ++-- scripts/bin/b | 14 ++ setup | 5 +- shell/bash/aliases | 2 +- 9 files changed, 51 insertions(+), 267 deletions(-) delete mode 100644 apps/alacritty/alacritty.yml create mode 100644 apps/kitty/kitty.conf create mode 100755 scripts/bin/b diff --git a/apps/alacritty/alacritty.yml b/apps/alacritty/alacritty.yml deleted file mode 100644 index 6314d65..0000000 --- a/apps/alacritty/alacritty.yml +++ /dev/null @@ -1,254 +0,0 @@ -# Configuration for Alacritty, the GPU enhanced terminal emulator - -# Any items in the `env` entry below will be added as -# environment variables. Some entries may override variables -# set by alacritty it self. -env: - # TERM env customization. - # - # If this property is not set, alacritty will set it to xterm-256color. - # - # Note that some xterm terminfo databases don't declare support for italics. - # You can verify this by checking for the presence of `smso` and `sitm` in - # `infocmp xterm-256color`. - TERM: xterm-256color - -# Window dimensions in character columns and lines -# (changes require restart) -dimensions: - columns: 80 - lines: 24 - -# The FreeType rasterizer needs to know the device DPI for best results -# (changes require restart) -dpi: - x: 180.0 - y: 180.0 - -padding: - x: 24.0 - y: 24.0 - -# Display tabs using this many cells (changes require restart) -tabspaces: 2 - -# When true, bold text is drawn using the bright variant of colors. -draw_bold_text_with_bright_colors: true - -# Font configuration (changes require restart) -font: - # The normal (roman) font face to use. - normal: - family: Iosevka # should be "Menlo" or something on macOS. - # Style can be specified to pick a specific face. - # style: Regular - - # The bold font face - bold: - family: Iosevka # should be "Menlo" or something on macOS. - # Style can be specified to pick a specific face. - # style: Bold - - # The italic font face - italic: - family: Iosevka # should be "Menlo" or something on macOS. - # Style can be specified to pick a specific face. - # style: Italic - - # Point size of the font - size: 10.0 - # Offset is the extra space around each character. offset.y can be thought of - # as modifying the linespacing, and offset.x as modifying the letter spacing. - offset: - x: -37.0 - y: 0.0 - - # OS X only: use thin stroke font rendering. Thin strokes are suitable - # for retina displays, but for non-retina you probably want this set to - # false. - use_thin_strokes: true - -# Should display the render timer -render_timer: false - -# Use custom cursor colors. If true, display the cursor in the cursor.foreground -# and cursor.background colors, otherwise invert the colors of the cursor. -custom_cursor_colors: false - -# Colors (Tomorrow Night Bright) -colors: - # Default colors - primary: - background: '0x111111' - foreground: '0xeaeaea' - - # Colors the cursor will use if `custom_cursor_colors` is true - cursor: - text: '0x000000' - cursor: '0xffffff' - - # Normal colors - normal: - black: '0x000000' - red: '0xd54e53' - green: '0xb9ca4a' - yellow: '0xe6c547' - blue: '0x7aa6da' - magenta: '0xc397d8' - cyan: '0x70c0ba' - white: '0x424242' - - # Bright colors - bright: - black: '0x666666' - red: '0xff3334' - green: '0x9ec400' - yellow: '0xe7c547' - blue: '0x7aa6da' - magenta: '0xb77ee0' - cyan: '0x54ced6' - white: '0x2a2a2a' - -# Visual Bell -# -# Any time the BEL code is received, Alacritty "rings" the visual bell. Once -# rung, the terminal background will be set to white and transition back to the -# default background color. You can control the rate of this transition by -# setting the `duration` property (represented in milliseconds). You can also -# configure the transition function by setting the `animation` property. -# -# Possible values for `animation` -# `Ease` -# `EaseOut` -# `EaseOutSine` -# `EaseOutQuad` -# `EaseOutCubic` -# `EaseOutQuart` -# `EaseOutQuint` -# `EaseOutExpo` -# `EaseOutCirc` -# `Linear` -# -# To completely disable the visual bell, set its duration to 0. -# -visual_bell: - animation: EaseOutExpo - duration: 0 - -# Key bindings -# -# Each binding is defined as an object with some properties. Most of the -# properties are optional. All of the alphabetical keys should have a letter for -# the `key` value such as `V`. Function keys are probably what you would expect -# as well (F1, F2, ..). The number keys above the main keyboard are encoded as -# `Key1`, `Key2`, etc. Keys on the number pad are encoded `Number1`, `Number2`, -# etc. These all match the glutin::VirtualKeyCode variants. -# -# Possible values for `mods` -# `Command`, `Super` refer to the super/command/windows key -# `Control` for the control key -# `Shift` for the Shift key -# `Alt` and `Option` refer to alt/option -# -# mods may be combined with a `|`. For example, requiring control and shift -# looks like: -# -# mods: Control|Shift -# -# The parser is currently quite sensitive to whitespace and capitalization - -# capitalization must match exactly, and piped items must not have whitespace -# around them. -# -# Either an `action` or `chars` field must be present. `chars` writes the -# specified string every time that binding is activated. These should generally -# be escape sequences, but they can be configured to send arbitrary strings of -# bytes. Possible values of `action` include `Paste` and `PasteSelection`. -# -# Want to add a binding (e.g. "PageUp") but are unsure what the X sequence -# (e.g. "\x1b[5~") is? Open another terminal (like xterm) without tmux, -# then run `showkey -a` to get the sequence associated to a key combination. -key_bindings: - - { key: V, mods: Control|Shift, action: Paste } - - { key: C, mods: Control|Shift, action: Copy } - - { key: Q, mods: Command, action: Quit } - - { key: W, mods: Command, action: Quit } - - { key: Insert, mods: Shift, action: PasteSelection } - - { key: Home, chars: "\x1bOH", mode: AppCursor } - - { key: Home, chars: "\x1b[1~", mode: ~AppCursor } - - { key: End, chars: "\x1bOF", mode: AppCursor } - - { key: End, chars: "\x1b[4~", mode: ~AppCursor } - - { key: PageUp, chars: "\x1b[5~" } - - { key: PageDown, chars: "\x1b[6~" } - - { key: Left, mods: Shift, chars: "\x1b[1;2D" } - - { key: Left, mods: Control, chars: "\x1b[1;5D" } - - { key: Left, mods: Alt, chars: "\x1b[1;3D" } - - { key: Left, chars: "\x1b[D", mode: ~AppCursor } - - { key: Left, chars: "\x1bOD", mode: AppCursor } - - { key: Right, mods: Shift, chars: "\x1b[1;2C" } - - { key: Right, mods: Control, chars: "\x1b[1;5C" } - - { key: Right, mods: Alt, chars: "\x1b[1;3C" } - - { key: Right, chars: "\x1b[C", mode: ~AppCursor } - - { key: Right, chars: "\x1bOC", mode: AppCursor } - - { key: Up, mods: Shift, chars: "\x1b[1;2A" } - - { key: Up, mods: Control, chars: "\x1b[1;5A" } - - { key: Up, mods: Alt, chars: "\x1b[1;3A" } - - { key: Up, chars: "\x1b[A", mode: ~AppCursor } - - { key: Up, chars: "\x1bOA", mode: AppCursor } - - { key: Down, mods: Shift, chars: "\x1b[1;2B" } - - { key: Down, mods: Control, chars: "\x1b[1;5B" } - - { key: Down, mods: Alt, chars: "\x1b[1;3B" } - - { key: Down, chars: "\x1b[B", mode: ~AppCursor } - - { key: Down, chars: "\x1bOB", mode: AppCursor } - - { key: Tab, mods: Shift, chars: "\x1b[Z" } - - { key: F1, chars: "\x1bOP" } - - { key: F2, chars: "\x1bOQ" } - - { key: F3, chars: "\x1bOR" } - - { key: F4, chars: "\x1bOS" } - - { key: F5, chars: "\x1b[15~" } - - { key: F6, chars: "\x1b[17~" } - - { key: F7, chars: "\x1b[18~" } - - { key: F8, chars: "\x1b[19~" } - - { key: F9, chars: "\x1b[20~" } - - { key: F10, chars: "\x1b[21~" } - - { key: F11, chars: "\x1b[23~" } - - { key: F12, chars: "\x1b[24~" } - - { key: Back, chars: "\x7f" } - - { key: Back, mods: Alt, chars: "\x1b\x7f" } - - { key: Insert, chars: "\x1b[2~" } - - { key: Delete, chars: "\x1b[3~" } - -# Mouse bindings -# -# Currently doesn't support modifiers. Both the `mouse` and `action` fields must -# be specified. -# -# Values for `mouse`: -# - Middle -# - Left -# - Right -# - Numeric identifier such as `5` -# -# Values for `action`: -# - Paste -# - PasteSelection -# - Copy (TODO) -mouse_bindings: - - { mouse: Middle, action: PasteSelection } - -mouse: - double_click: { threshold: 300 } - triple_click: { threshold: 300 } - -selection: - semantic_escape_chars: ",│`|:\"' ()[]{}<>" - -hide_cursor_when_typing: false - -# Shell -# -# You can set shell.program to the path of your favorite shell, e.g. /bin/fish. -# Entries in shell.args are passed unmodified as arguments to the shell. -#shell: -# program: /bin/bash -# args: -# - --login diff --git a/apps/kitty/kitty.conf b/apps/kitty/kitty.conf new file mode 100644 index 0000000..e5d7077 --- /dev/null +++ b/apps/kitty/kitty.conf @@ -0,0 +1,13 @@ +font_family Iosevka Term +bold_font Iosevka Term Bold +italic_font Iosevka Term Italic +bold_italic_font Iosevka Term Bold Italic +# font_family Iosevka Medium Nerd Font Complete Mono +# bold_font Iosevka Bold Nerd Font Complete Mono +# italic_font Iosevka Italic Nerd Font Complete Mono +# bold_italic_font Iosevka Bold Italic Nerd Font Complete Mono +font_size 10.0 +adjust_line_height 0 +window_padding_width 8.0 +window_margin_width 0.0 + diff --git a/apps/neovim/commands.vim b/apps/neovim/commands.vim index 4804b61..7adb371 100644 --- a/apps/neovim/commands.vim +++ b/apps/neovim/commands.vim @@ -95,4 +95,6 @@ if has('autocmd') " autocmd WinLeave * call CheckCloseDistractionFreeMode() endif +" AddTabularPattern! ssv /\s/r0c0l0 + command! DistractionFreeMode call DistractionFreeModeFunc() diff --git a/apps/ranger/rc.conf b/apps/ranger/rc.conf index 91cf36c..5d88e29 100644 --- a/apps/ranger/rc.conf +++ b/apps/ranger/rc.conf @@ -1,2 +1,2 @@ set preview_images true -set preview_images_method urxvt +set preview_images_method kitty diff --git a/de/sxhkd/sxhkdrc b/de/sxhkd/sxhkdrc index aa0a187..12ca556 100755 --- a/de/sxhkd/sxhkdrc +++ b/de/sxhkd/sxhkdrc @@ -164,7 +164,7 @@ super + shift + t # spawn a terminal super + Return - urxvtc + kitty # spawn a floating terminal super + shift + Return diff --git a/scripts/bin/app-launcher b/scripts/bin/app-launcher index 31bbfe6..532e015 100755 --- a/scripts/bin/app-launcher +++ b/scripts/bin/app-launcher @@ -10,11 +10,19 @@ BACKGROUND_COLOR=$(xrdb -query | sed -ne 's/.*background:\s*\(.*\)$/\1 FOREGROUND_COLOR=$(xrdb -query | sed -ne 's/.*foreground:\s*\(.*\)$/\1/p' | head -n 1) GAP=$(xrdb -query | sed -ne 's/.*internalBorder:\s*\(.*\)$/\1/p' | head -n 1) -for i in "$@"; -do - params=" $params $i" -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 -width 600 $params +rofi \ + -combi-modi run,window \ + -show combi \ + -modi combi \ + -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 \ + "$@" diff --git a/scripts/bin/b b/scripts/bin/b new file mode 100755 index 0000000..fc848b1 --- /dev/null +++ b/scripts/bin/b @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +bbin="bible" # npm i -g bible +pbin="less" + +# bible args +bargs="" + +# pager args +pargs="-R" + +[ $1 = "s" ] && bargs="$bargs --search" && shift + +"${bbin}" $bargs "$*" | "${pbin}" $pargs diff --git a/setup b/setup index 40dc6b0..6b49d43 100755 --- a/setup +++ b/setup @@ -54,6 +54,9 @@ links=( # terminal emulator "$dfp/apps/alacritty/" "$XDG_CONFIG_HOME/alacritty" + # kitty config + "$dfp/apps/kitty/" "$XDG_CONFIG_HOME/kitty" + # rofi config "$dfp/apps/rofi/config" "$XDG_CONFIG_HOME/rofi/config" @@ -88,8 +91,6 @@ read -r -p " [y/N] " response response=${response,,} # to lower case if [[ $response =~ ^(yes|y)$ ]]; then "$dfp/sudo_setup" -else - :: fi echo -e "Dotfiles Installed! Running 'exec bash'...\n" diff --git a/shell/bash/aliases b/shell/bash/aliases index 5767423..8b96a74 100644 --- a/shell/bash/aliases +++ b/shell/bash/aliases @@ -65,7 +65,7 @@ alias grbpf="git push --force-with-lease" alias gac="git add -A && git commit" alias gsur="git submodule update --remote" alias glf="git ls-files" -alias gl="git log --graph --pretty=oneline --abbrev-commit --decorate" +alias gl="git log --pretty=format:\"%h %ad%x09%an%x09%s\" --date=short" # docker aliases alias dlf="docker logs --tail=500 -f" From ecb7fc25ec4f7311b90ecf9824232cca63ab9610 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 6 Mar 2019 12:34:21 -0600 Subject: [PATCH 5/5] Update readme --- readme.md | 83 +++++++++++++++++++++---------------------------------- 1 file changed, 32 insertions(+), 51 deletions(-) diff --git a/readme.md b/readme.md index 459db14..4544b04 100644 --- a/readme.md +++ b/readme.md @@ -1,7 +1,5 @@ # My Dotfiles -**NOTE**: Readme needs updating!! - This repository contains the majority of application or OS configuration files I use on a daily basis. I keep the here and public in an effort to inform others who may not know either how to go about organizing such files or to learn how to @@ -13,7 +11,7 @@ myself when setting up a new machine. * Clone the repo into `~/.config/dotfiles` * Run `~/.config/dotfiles/setup` * Read the warning, obey it, backup your files, *then* agree -* Reboot once the script finishes. +* **Optional**: Reboot once the script finishes ## Priorities @@ -22,74 +20,57 @@ out in order of priority here: * These files are primarily configured for Linux, (specifically, Arch Linux) but I try to keep the OS-specific stuff in the `os-specific` directory. -* I am also primarily a Web Developer, so my configuration will reflect that. -* I rely heavily on Google's products and services. I know some are eager to - avoid that. * I also prefer apps in my terminal. If I could, I would do everything that makes sense to do so in a terminal using only my keyboard. **So if you know about really cool and usable terminal-based software, let me know!** -* I prefer keeping my dotfiles as portable as possible (within reason). -* These dotfiles should be very quick to setup and get going. +* I prefer keeping my dotfiles as portable as possible (within reason) though + this is obviously very difficult since I only run one OS. +* Setup should be very quick (downloading and installing packages aside). * I aim to keep the dotfiles flexible and extendible, as I usually use them on multiple machines with specific use-cases. For example, a shared laptop should allow for other non-technical users ease-of-access, while my workstation should focus on being quick, powerful, and highly usable for me alone. -* The only dependencies should be `git` and `bash` for the very basics. ## Applications There are several types of applications I use every day, some more than others, and sometimes different applications that have the same purpose. Here are the -applications I use (the primary one is *italicized*, the one I would like to -become my primary or am very interested in using in more depth is in **bold**) -for various tasks: +applications I use: -* **Terminal Emulators**: *rxvt-unicode* -* **Text Editors**: **vim/Neovim**, Sublime Text -* **Terminal Multiplexers**: *tmux* -* **Web Browser**: *Google Chrome*, **qutebrowser**, luakit -* **Music**: *Google Play Music* -* **Email**: *Google Inbox*, Gmail, **mutt** -* **Image Editing**: *GIMP*, *Inkscape*, **Krita** -* **Documents**: *Google Drive*, though Dropbox's Paper looks neat and I've - heard too many good things about LaTeX. -* **Gaming**: *Steam*, *various emulators* +* **Terminal Emulator**: Kitty +* **Text Editor**: Neovim +* **Terminal Multiplexers**: tmux +* **Web Browser**: Firefox +* **Music**: Google Play Music +* **Email**: Google Inbox, mutt +* **Image Editing**: GIMP, Inkscape, Krita, Aseprite +* **Documents**: Neovim + Markdown, sc-im, LibreOffice +* **Gaming**: Steam, various emulators ## Workflow -Here are some bullet points on my workflow as a Web Developer: +Here are some bullet points on my workflow: -* **Text Editing**: I use `vim`/`Neovim` in my terminal as my primary text - editor. I usually run it in a `tmux` session alongside a few terminals to have - a very flexible IDE-like development environment. More on that in other bullet - points. -* **Version Control**: I use `git` in the terminal (sometimes I pop into - GitKraken if I need to do anything crazy) and commit often. I work in a branch - named "dev" until it's time to go live, then I merge into master. Other - branches beyond "dev" are used for trying crazy things or during large - refactors so I can very quickly jump back if needed. +* **Text Editing**: I use `Neovim` in my terminal as my primary text + editor. I usually run it in a `tmux` session alongside a few terminals to + have a very flexible IDE-like development environment. More on that in other + bullet points. I keep a `tmux` session for each project or group of + terminals concerning a similar mind-space. +* **Version Control**: I use `git` in the terminal and commit often. I work in + feature branches that go to a `dev` branch as sort of a staging area for + testing until it's time to go live, then I merge into master. * **Compiler/Debugging**: I rely heavily on auto-reloading and - watch-and-test-and-compile features during development to iterate quickly. - Tools such as `webpack` and `webpack-dev-server` are amazing. If you try to do - anything to weird or crazy, though, configuring webpack properly can be - hazardous to the mind. Or I'm just doing things very wrong. Chrome's dev tools - are also killer in this department. -* **Testing**: I don't do much testing. This is bad and I'm working on it! + watch-and-test-and-compile features during development to iterate quickly. + Language servers, linters, and simple file watches to trigger your tests are + amazing tools to take care of the cruft of writing code and integrating them + heavily into Neovim is my current top need/priority. ## To Do and Improvements * Add vim in the terminal as the handler for many MIME types (xdg-open and such) + for the rare time I'm in a file manager or for opening easily from + the browser. * Unify all the common variables... somehow? (and use templates and `envsubst`?) -* Makefile as setup script -* Vim `m` binding should be able to run arbitrary commands, not just - `make` -* Dunst and notifications -* Vimux? -* terminal on-the-fly font resizing? -* terminal fontawesome/icons? -* Alacritty as terminal? -* Cloud IRC -* Some kind of notes wiki? (vimwiki with perfect markdown support?) - - -[xdg-user-dirs]: https://wiki.archlinux.org/index.php/XDG_user_directories +* Makefile instead of setup script +* [Vimux](https://github.com/benmills/vimux)? +* Nerd Fonts with ligatures and icons for Kitty