Compare commits

...

5 Commits

5 changed files with 692 additions and 487 deletions

View File

@ -29,9 +29,9 @@ bind-key h quit
bind-key ESC quit bind-key ESC quit
highlight all "====.*====" yellow highlight all "====.*====" yellow
color listnormal cyan default color listnormal default default
color listfocus black yellow standout bold color listfocus black yellow standout bold
color listnormal_unread blue default color listnormal_unread cyan default
color listfocus_unread yellow default bold color listfocus_unread yellow default bold
color info red black bold color info red black bold
color article white default bold color article white default bold

View File

@ -185,7 +185,7 @@ local handlers = {
-- Use a loop to conveniently call 'setup' on multiple servers and -- Use a loop to conveniently call 'setup' on multiple servers and
-- map buffer local keybindings when the language server attaches -- map buffer local keybindings when the language server attaches
local servers = { 'pyright', 'bashls', 'ansiblels', 'gopls' } local servers = { 'pyright', 'bashls', 'ansiblels', 'gopls', 'solargraph'}
for _, lsp in pairs(servers) do for _, lsp in pairs(servers) do
require('lspconfig')[lsp].setup { require('lspconfig')[lsp].setup {
on_attach = on_attach, on_attach = on_attach,

File diff suppressed because it is too large Load Diff

View File

@ -1,17 +1,32 @@
#!/bin/bash #!/bin/bash
docker stop "$(docker ps --all | grep -i ubuntu | awk '{print $1}')" > /dev/null set -x
docker rm "$(docker ps --all | grep -i ubuntu | awk '{print $1}')" > /dev/null
docker pull jrei/systemd-ubuntu:latest # Resolving problem with systemd in mac
# # Stop running Docker
# test -z "$(docker ps -q 2>/dev/null)" && osascript -e 'quit app "Docker"'
# # Install jq and moreutils so we can merge into the existing json file
# brew install jq moreutils
# # Add the needed cgroup config to docker settings.json
# echo '{"deprecatedCgroupv1": true}' |
# jq -s '.[0] * .[1]' ~/Library/Group\ Containers/group.com.docker/settings.json - |
# sponge ~/Library/Group\ Containers/group.com.docker/settings.json
# # Restart docker desktop
# open --background -a Docker
docker stop "$(docker ps --all | grep -i ubuntu | awk '{print $1}')" >/dev/null
docker rm "$(docker ps --all | grep -i ubuntu | awk '{print $1}')" >/dev/null
docker pull jrei/systemd-ubuntu:22.04
docker run \ docker run \
-d \ -d \
-v $HOME/git/dev:/opt \ --name systemd-ubuntu \
--tmpfs /tmp \ -v "$HOME/git/dev":/opt \
--tmpfs /run \ --tmpfs /tmp \
--tmpfs /run/lock \ --tmpfs /run \
--privileged \ --tmpfs /run/lock \
-v /sys/fs/cgroup:/sys/fs/cgroup:ro \ --privileged \
jrei/systemd-ubuntu -v /sys/fs/cgroup:/sys/fs/cgroup:ro \
container="$(docker ps --all | grep -i ubuntu | awk '{print $1}')" jrei/systemd-ubuntu:22.04
sleep 15 && docker exec -it "$container" /bin/bash # container="$(docker ps --all | grep -i ubuntu | awk '{print $1}')"
docker stop "$container" > /dev/null # sleep 15 && docker exec -it "$container" /bin/bash
docker rm "$container" > /dev/null # docker stop "$container" >/dev/null
# docker rm "$container" >/dev/null

1
.zshrc
View File

@ -124,6 +124,7 @@ export GOPATH=$HOME/golang
export GOROOT=/usr/local/opt/go/libexec export GOROOT=/usr/local/opt/go/libexec
export PATH=$PATH:$GOPATH/bin export PATH=$PATH:$GOPATH/bin
export PATH=$PATH:$GOROOT/bin export PATH=$PATH:$GOROOT/bin
export PATH=$PATH:$HOME/.gem/ruby/2.6.0/bin
[ -d $HOME/repo/fortigate/bin ] && export PATH=$HOME/repo/fortigate/bin:$PATH [ -d $HOME/repo/fortigate/bin ] && export PATH=$HOME/repo/fortigate/bin:$PATH
export HISTTIMEFORMAT="%F %T " export HISTTIMEFORMAT="%F %T "