General updates

This commit is contained in:
Gene Liverman 2021-05-24 08:45:37 -04:00 committed by Gene Liverman
parent 668ceb06a4
commit 974ce7f7fc
No known key found for this signature in database
GPG key ID: 3AF83985B6C857C6
8 changed files with 323 additions and 86 deletions

View file

@ -1 +0,0 @@
2.4.1

View file

@ -4,17 +4,16 @@ GEM
CFPropertyList (2.3.6) CFPropertyList (2.3.6)
addressable (2.7.0) addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0) public_suffix (>= 2.0.2, < 5.0)
ast (2.4.1) ast (2.4.2)
colored2 (3.1.2) colored2 (3.1.2)
concurrent-ruby (1.1.6) concurrent-ruby (1.1.8)
cri (2.15.10) cri (2.15.10)
deep_merge (1.2.1) deep_merge (1.2.1)
diff-lcs (1.4.4) diff-lcs (1.4.4)
equatable (0.6.1) facter (4.1.1)
facter (4.0.29)
hocon (~> 1.3) hocon (~> 1.3)
thor (>= 1.0.1, < 2.0) thor (>= 1.0.1, < 2.0)
faraday (0.17.3) faraday (0.17.4)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
faraday_middleware (0.14.0) faraday_middleware (0.14.0)
faraday (>= 0.7.4, < 1.0) faraday (>= 0.7.4, < 1.0)
@ -26,10 +25,9 @@ GEM
fast_gettext (~> 1.1.0) fast_gettext (~> 1.1.0)
gettext (>= 3.0.2, < 3.3.0) gettext (>= 3.0.2, < 3.3.0)
locale locale
hiera (3.6.0) hiera (3.7.0)
hocon (1.3.1) hocon (1.3.1)
httpclient (2.8.3) json (2.5.1)
json (2.3.1)
json-schema (2.8.1) json-schema (2.8.1)
addressable (>= 2.4) addressable (>= 2.4)
locale (2.1.3) locale (2.1.3)
@ -38,41 +36,39 @@ GEM
json-schema (~> 2.8) json-schema (~> 2.8)
spdx-licenses (~> 1.0) spdx-licenses (~> 1.0)
minitar (0.9) minitar (0.9)
mocha (1.11.2) mocha (1.12.0)
multi_json (1.14.1) multi_json (1.15.0)
multipart-post (2.1.1) multipart-post (2.1.1)
necromancer (0.5.1) os (1.1.1)
os (1.1.0) parallel (1.20.1)
parallel (1.19.2) parser (3.0.1.1)
parser (2.7.1.4)
ast (~> 2.4.1) ast (~> 2.4.1)
pastel (0.7.4) pastel (0.8.0)
equatable (~> 0.6)
tty-color (~> 0.5) tty-color (~> 0.5)
pathspec (0.2.1) pathspec (1.0.0)
public_suffix (4.0.5) public_suffix (4.0.6)
puppet (6.16.0) puppet (7.6.1)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
deep_merge (~> 1.0) deep_merge (~> 1.0)
facter (> 2.0.1, < 5) facter (> 2.0.1, < 5)
fast_gettext (~> 1.1) fast_gettext (~> 1.1)
hiera (>= 3.2.1, < 4) hiera (>= 3.2.1, < 4)
httpclient (~> 2.8)
locale (~> 2.1) locale (~> 2.1)
multi_json (~> 1.10) multi_json (~> 1.10)
puppet-resource_api (~> 1.5) puppet-resource_api (~> 1.5)
scanf (~> 1.0)
semantic_puppet (~> 1.0) semantic_puppet (~> 1.0)
puppet (6.16.0-universal-darwin) puppet (7.6.1-universal-darwin)
CFPropertyList (~> 2.2) CFPropertyList (~> 2.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
deep_merge (~> 1.0) deep_merge (~> 1.0)
facter (> 2.0.1, < 5) facter (> 2.0.1, < 5)
fast_gettext (~> 1.1) fast_gettext (~> 1.1)
hiera (>= 3.2.1, < 4) hiera (>= 3.2.1, < 4)
httpclient (~> 2.8)
locale (~> 2.1) locale (~> 2.1)
multi_json (~> 1.10) multi_json (~> 1.10)
puppet-resource_api (~> 1.5) puppet-resource_api (~> 1.5)
scanf (~> 1.0)
semantic_puppet (~> 1.0) semantic_puppet (~> 1.0)
puppet-lint (2.4.2) puppet-lint (2.4.2)
puppet-lint-absolute_classname-check (2.0.0) puppet-lint-absolute_classname-check (2.0.0)
@ -106,15 +102,15 @@ GEM
gettext-setup (~> 0.11) gettext-setup (~> 0.11)
minitar minitar
semantic_puppet (~> 1.0) semantic_puppet (~> 1.0)
puppetlabs_spec_helper (2.15.0) puppetlabs_spec_helper (2.16.0)
mocha (~> 1.0) mocha (~> 1.0)
pathspec (~> 0.2.1) pathspec (>= 0.2.1, < 1.1.0)
puppet-lint (~> 2.0) puppet-lint (~> 2.0)
puppet-syntax (>= 2.0, < 4) puppet-syntax (>= 2.0, < 4)
rspec-puppet (~> 2.0) rspec-puppet (~> 2.0)
r10k (3.5.1) r10k (3.9.0)
colored2 (= 3.1.2) colored2 (= 3.1.2)
cri (>= 2.15.10, < 3.0.0) cri (= 2.15.10)
fast_gettext (~> 1.1.0) fast_gettext (~> 1.1.0)
gettext (>= 3.0.2, < 3.3.0) gettext (>= 3.0.2, < 3.3.0)
gettext-setup (~> 0.24) gettext-setup (~> 0.24)
@ -122,62 +118,64 @@ GEM
multi_json (~> 1.10) multi_json (~> 1.10)
puppet_forge (~> 2.3.0) puppet_forge (~> 2.3.0)
rainbow (3.0.0) rainbow (3.0.0)
rake (13.0.1) rake (13.0.3)
regexp_parser (1.7.1) regexp_parser (2.1.1)
rexml (3.2.4) rexml (3.2.5)
rspec (3.9.0) rspec (3.10.0)
rspec-core (~> 3.9.0) rspec-core (~> 3.10.0)
rspec-expectations (~> 3.9.0) rspec-expectations (~> 3.10.0)
rspec-mocks (~> 3.9.0) rspec-mocks (~> 3.10.0)
rspec-core (3.9.2) rspec-core (3.10.1)
rspec-support (~> 3.9.3) rspec-support (~> 3.10.0)
rspec-expectations (3.9.2) rspec-expectations (3.10.1)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0) rspec-support (~> 3.10.0)
rspec-mocks (3.9.1) rspec-mocks (3.10.2)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0) rspec-support (~> 3.10.0)
rspec-puppet (2.7.8) rspec-puppet (2.9.0)
rspec rspec
rspec-support (3.9.3) rspec-support (3.10.2)
rubocop (0.87.0) rubocop (0.93.1)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 2.7.1.1) parser (>= 2.7.1.5)
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.7) regexp_parser (>= 1.8)
rexml rexml
rubocop-ast (>= 0.1.0, < 1.0) rubocop-ast (>= 0.6.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0) unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.1.0) rubocop-ast (1.5.0)
parser (>= 2.7.0.1) parser (>= 3.0.1.1)
ruby-progressbar (1.10.1) ruby-progressbar (1.11.0)
rugged (1.0.1) rugged (1.1.0)
semantic_puppet (1.0.2) scanf (1.0.0)
spdx-licenses (1.2.0) semantic_puppet (1.0.3)
spdx-licenses (1.3.0)
text (1.3.1) text (1.3.1)
thor (1.0.1) thor (1.1.0)
trollop (2.9.10) trollop (2.9.10)
tty-color (0.5.1) tty-color (0.6.0)
tty-command (0.9.0) tty-command (0.10.1)
pastel (~> 0.7.0) pastel (~> 0.8)
tty-cursor (0.7.1) tty-cursor (0.7.1)
tty-file (0.9.0) tty-file (0.10.0)
diff-lcs (~> 1.3) diff-lcs (~> 1.3)
pastel (~> 0.7.2) pastel (~> 0.8)
tty-prompt (~> 0.20) tty-prompt (~> 0.22)
tty-prompt (0.21.0) tty-prompt (0.23.1)
necromancer (~> 0.5.0) pastel (~> 0.8)
pastel (~> 0.7.0) tty-reader (~> 0.8)
tty-reader (~> 0.7.0) tty-reader (0.9.0)
tty-reader (0.7.0)
tty-cursor (~> 0.7) tty-cursor (~> 0.7)
tty-screen (~> 0.7) tty-screen (~> 0.8)
wisper (~> 2.0.0) wisper (~> 2.0)
tty-screen (0.8.0) tty-screen (0.8.1)
unicode-display_width (1.7.0) unicode-display_width (1.7.0)
webrick (1.7.0)
wisper (2.0.1) wisper (2.0.1)
xmlrpc (0.3.0) xmlrpc (0.3.2)
webrick
yamllint (0.0.9) yamllint (0.0.9)
trollop (~> 2) trollop (~> 2)
@ -190,7 +188,7 @@ DEPENDENCIES
json (>= 2.0.2) json (>= 2.0.2)
metadata-json-lint (~> 2.4) metadata-json-lint (~> 2.4)
os (~> 1.1) os (~> 1.1)
puppet (>= 6, < 7) puppet (>= 7, < 8)
puppet-lint (~> 2.3) puppet-lint (~> 2.3)
puppet-lint-absolute_classname-check (~> 2.0) puppet-lint-absolute_classname-check (~> 2.0)
puppet-lint-absolute_template_path (~> 1.0) puppet-lint-absolute_template_path (~> 1.0)
@ -214,4 +212,4 @@ DEPENDENCIES
yamllint (~> 0.0.9) yamllint (~> 0.0.9)
BUNDLED WITH BUNDLED WITH
2.1.2 2.2.16

View file

@ -3,7 +3,7 @@
if [[ $1 == 'now' ]]; then if [[ $1 == 'now' ]]; then
# Install dot's dependencies # Install dot's dependencies
sudo yum install -y centos-release-scl-rh.noarch sudo yum install -y centos-release-scl-rh.noarch
sudo yum install rh-ruby24 rh-ruby24-ruby-devel rh-ruby24-rubygem-bundler rh-ruby24-rubygem-rake cmake gcc sudo yum install rh-ruby26 rh-ruby26-ruby-devel rh-ruby26-rubygem-bundler rh-ruby26-rubygem-rake cmake gcc
# Make dot usable # Make dot usable
cd ~/.dotfiles cd ~/.dotfiles

View file

@ -5,7 +5,7 @@ if [[ $1 == 'now' ]]; then
/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
# Install dot's dependencies # Install dot's dependencies
/usr/local/bin/brew install ruby cmake pkg-config /usr/local/bin/brew install ruby@2.7 cmake pkg-config
/usr/local/bin/gem install --no-ri --no-rdoc bundler /usr/local/bin/gem install --no-ri --no-rdoc bundler
# Make dot usable # Make dot usable

View file

@ -1 +1 @@
brew cask install adobe-acrobat-reader boinc virtualbox virtualbox-extension-pack vagrant brew install --cask adobe-acrobat-reader boinc virtualbox virtualbox-extension-pack vagrant

View file

@ -1,15 +1,21 @@
[core]
excludesfile = /Users/gliverma/.gitignore_global
[diff]
tool = araxis
[difftool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/araxiscompare-w.sh -2 \"$LOCAL\" \"$REMOTE\"
path =
[merge]
tool = araxis
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/araxisgitmerge-w.sh \"$REMOTE\" \"$BASE\" \"$LOCAL\" \"$MERGED\"
trustExitCode = true
[user] [user]
name = Gene Liverman name = Gene Liverman
email = gene@technicalissues.us email = gene@technicalissues.us
[commit]
gpgSign = true
[filter "lfs"]
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
[gpg]
program = gpg2
[init]
defaultBranch = main
[merge]
conflictStyle = diff3
[pull]
rebase = false
[alias]
kraken = !open "gitkraken://repo$(cd "${1:-.}" && git rev-parse --show-toplevel); :"

View file

@ -8,4 +8,4 @@ Import-Module posh-git
# Install-Module -Name oh-my-posh # Install-Module -Name oh-my-posh
Import-module oh-my-posh Import-module oh-my-posh
#Set-Theme Paradox #Set-Theme Paradox
Set-Theme beantest Set-PoshPrompt -Theme ~/.oh-my-posh.omp.json

View file

@ -0,0 +1,234 @@
{
"$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
"blocks": [
{
"alignment": "left",
"segments": [
{
"background": "#c386f1",
"foreground": "#ffffff",
"leading_diamond": "",
"properties": {
"display_host": false,
"postfix": " "
},
"style": "diamond",
"trailing_diamond": "",
"type": "session"
},
{
"background": "#ff479c",
"foreground": "#ffffff",
"powerline_symbol": "",
"properties": {
"folder_separator_icon": "  ",
"home_icon": "~",
"prefix": "  ",
"style": "folder"
},
"style": "powerline",
"type": "path"
},
{
"background": "#fffb38",
"foreground": "#193549",
"powerline_symbol": "",
"properties": {
"ahead_and_behind_color": "#f26d50",
"ahead_color": "#89d1dc",
"behind_color": "#f17c37",
"display_stash_count": true,
"display_upstream_icon": true,
"local_changes_color": "#ff9248",
"stash_count_icon": " ",
"status_colors_enabled": true
},
"style": "powerline",
"type": "git"
},
{
"background": "#6CA35E",
"foreground": "#ffffff",
"powerline_symbol": "",
"properties": {
"display_version": true,
"prefix": "  "
},
"style": "powerline",
"type": "node"
},
{
"background": "#8ED1F7",
"foreground": "#111111",
"powerline_symbol": "",
"properties": {
"display_version": true,
"prefix": "  "
},
"style": "powerline",
"type": "go"
},
{
"background": "#4063D8",
"foreground": "#111111",
"powerline_symbol": "",
"properties": {
"display_version": true,
"prefix": "  "
},
"style": "powerline",
"type": "julia"
},
{
"background": "#FFDE57",
"foreground": "#111111",
"powerline_symbol": "",
"properties": {
"display_mode": "files",
"display_version": true,
"display_virtual_env": false,
"prefix": "  "
},
"style": "powerline",
"type": "python"
},
{
"background": "#AE1401",
"foreground": "#ffffff",
"powerline_symbol": "",
"properties": {
"display_mode": "files",
"display_version": true,
"prefix": "  "
},
"style": "powerline",
"type": "ruby"
},
{
"background": "#FEAC19",
"foreground": "#ffffff",
"powerline_symbol": "",
"properties": {
"display_mode": "files",
"display_version": false,
"prefix": " "
},
"style": "powerline",
"type": "azfunc"
},
{
"background_templates": [
"{{if contains \"default\" .Profile}}#FFA400{{end}}",
"{{if contains \"jan\" .Profile}}#f1184c{{end}}"
],
"foreground": "#ffffff",
"powerline_symbol": "",
"properties": {
"display_default": false,
"prefix": "  "
},
"style": "powerline",
"type": "aws"
},
{
"background": "#ffff66",
"foreground": "#111111",
"powerline_symbol": "",
"properties": {
"root_icon": ""
},
"style": "powerline",
"type": "root"
},
{
"background": "#83769c",
"foreground": "#ffffff",
"leading_diamond": "",
"properties": {
"always_enabled": true,
"prefix": "<transparent></> 羽"
},
"style": "plain",
"trailing_diamond": "",
"type": "executiontime"
},
{
"background": "#2e9599",
"foreground": "#ffffff",
"leading_diamond": "",
"properties": {
"always_enabled": true,
"color_background": true,
"display_exit_code": false,
"error_color": "#f1184c",
"prefix": "<#83769c></> "
},
"style": "diamond",
"trailing_diamond": "",
"type": "exit"
}
],
"type": "prompt"
},
{
"segments": [
{
"background": "#0077c2",
"foreground": "#ffffff",
"properties": {
"postfix": " <transparent,#0077c2></>",
"prefix": "<#0077c2,transparent></>  "
},
"style": "plain",
"type": "shell"
},
{
"background": "#1BD760",
"foreground": "#111111",
"invert_powerline": true,
"powerline_symbol": "",
"properties": {
"paused_icon": " ",
"playing_icon": " ",
"prefix": "  "
},
"style": "powerline",
"type": "ytm"
},
{
"background": "#f36943",
"foreground": "#ffffff",
"invert_powerline": true,
"powerline_symbol": "",
"properties": {
"battery_icon": "",
"charged_color": "#4caf50",
"charged_icon": " ",
"charging_color": "#40c4ff",
"charging_icon": " ",
"color_background": true,
"discharging_color": "#ff5722",
"discharging_icon": " ",
"postfix": " "
},
"style": "powerline",
"type": "battery"
},
{
"background": "#2e9599",
"foreground": "#111111",
"invert_powerline": true,
"leading_diamond": "",
"style": "diamond",
"trailing_diamond": "",
"type": "time"
}
],
"type": "rprompt"
}
],
"console_title": true,
"console_title_style": "template",
"console_title_template": "{{ .Shell }} in {{ .Folder }}",
"final_space": true
}