diff --git a/.gitignore b/.gitignore index 3afce4a..c391f20 100644 --- a/.gitignore +++ b/.gitignore @@ -255,3 +255,4 @@ heroic/ kwinoutputconfig.json plasmaparc bruno/ +beekeeper-studio/ diff --git a/calcurse/conf b/calcurse/conf index 4b9ae02..f512abf 100644 --- a/calcurse/conf +++ b/calcurse/conf @@ -3,7 +3,6 @@ general.firstdayofweek=sunday appearance.layout=5 appearance.compactpanels=yes appearance.defaultpanel=todo -appearance.sidebarwidth=30 appearance.notifybar=no appearance.headerline=no appearance.eventseparator=no @@ -12,3 +11,22 @@ appearance.emptyline=no appearance.emptyday= appearance.theme=blue on default format.inputdate=4 +appearance.calendarview=monthly +appearance.todoview=hide-completed +appearance.headingpos=right-justified +daemon.enable=no +daemon.log=no +format.notifydate=%a %F +format.notifytime=%T +format.appointmenttime=%H:%M +format.outputdate=%D +format.dayheading=%B %e, %Y +general.autogc=no +general.autosave=yes +general.confirmdelete=yes +general.multipledays=yes +general.periodicsave=0 +general.systemevents=yes +notification.command=printf '\a' +notification.notifyall=flagged-only +notification.warning=300 diff --git a/lvim/config.lua b/lvim/config.lua index df7736d..c769ca5 100644 --- a/lvim/config.lua +++ b/lvim/config.lua @@ -14,6 +14,13 @@ lvim.plugins = { lvim.colorscheme = "everforest" vim.g.everforest_background = "hard" +vim.api.nvim_create_autocmd({"BufRead", "BufNewFile"}, { + pattern = "calcurse*", + callback = function() + vim.bo.filetype = "markdown" + end, +}) + require("config.go") require("config.c") -- require("config.py") diff --git a/shell/profile.d/defaults.sh b/shell/profile.d/defaults.sh index 372b4af..a834ce5 100644 --- a/shell/profile.d/defaults.sh +++ b/shell/profile.d/defaults.sh @@ -1,5 +1,5 @@ export \ TERM="xterm-256color" \ BROWSER="firefox-hardened" \ - EDITOR="nvim" \ - VISUAL="nvim" + EDITOR="lvim" \ + VISUAL="lvim" diff --git a/shell/profile.d/xdgspec.sh b/shell/profile.d/xdgspec.sh index 3481bd9..38cb98a 100644 --- a/shell/profile.d/xdgspec.sh +++ b/shell/profile.d/xdgspec.sh @@ -28,4 +28,5 @@ export \ SSH_CONFIG="-F ${XDG_CONFIG_HOME}/ssh/config" \ GIT_SSH_COMMAND="ssh -F ${XDG_CONFIG_HOME}/ssh/config" \ ZDOTDIR="$XDG_CONFIG_HOME/shell" \ - NPM_CONFIG_USERCONFIG=$XDG_CONFIG_HOME/npm/npmrc + NPM_CONFIG_USERCONFIG=$XDG_CONFIG_HOME/npm/npmrc \ + IPYTHONDIR="$XDG_CONFIG_HOME/ipython" diff --git a/ssh/config b/ssh/config index df518cc..9c598db 100644 --- a/ssh/config +++ b/ssh/config @@ -4,8 +4,8 @@ Host * Host home AddressFamily inet - #HostName 192.168.100.83 - HostName tavo.one + HostName 192.168.100.83 + #HostName tavo.one port 22 Host tavo.one diff --git a/tmux/tmux.conf b/tmux/tmux.conf index 131b1f9..5bff64d 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -1,5 +1,13 @@ set -g base-index 1 -set -g pane-base-index 1 +setw -g pane-base-index 1 +set-option -g renumber-windows on + +set -g status-style bg=default +set -g status-right "" +set -g status-left "" +set -g window-status-format "#[fg=black]#I:#W" +set -g window-status-current-format "#[fg=cyan bold]#I:#W" +set-option -ga terminal-overrides ",xterm-256color:Tc" bind -n M-1 select-window -t 1 bind -n M-2 select-window -t 2 diff --git a/wrappers/pgsql-start b/wrappers/pgsql-start index 7afa997..3ac66ee 100755 --- a/wrappers/pgsql-start +++ b/wrappers/pgsql-start @@ -3,11 +3,11 @@ PODMAN_NAME="PostgreSQL" PGSQL_IMAGE="docker.io/library/postgres" -: "${HOST:=localhost}" -: "${PORT:=5455}" -: "${PASS:=1234}" -: "${USER:=postgres}" -: "${DB:=local}" +: "${DB_HOST:=localhost}" +: "${DB_PORT:=5455}" +: "${DB_PASS:=1234}" +: "${DB_USER:=postgres}" +: "${DB_NAME:=local}" if ! command -v podman >/dev/null 2>&1 ; then echo "podman not found in PATH" @@ -15,7 +15,7 @@ if ! command -v podman >/dev/null 2>&1 ; then fi if command -v fuser >/dev/null 2>&1 ; then - if fuser "$PORT"/tcp >/dev/null 2>&1 ; then + if fuser "$DB_PORT"/tcp >/dev/null 2>&1 ; then echo "Port already in use" exit 1 fi @@ -23,14 +23,14 @@ fi if ! podman run \ --name "$PODMAN_NAME" \ - -p "$PORT":5432 \ - -e POSTGRES_USER="$USER" \ - -e POSTGRES_PASSWORD="$PASS" \ - -e POSTGRES_DB="$DB" \ + -p "$DB_PORT":5432 \ + -e POSTGRES_USER="$DB_USER" \ + -e POSTGRES_PASSWORD="$DB_PASS" \ + -e POSTGRES_DB="$DB_NAME" \ --replace \ -d \ "$PGSQL_IMAGE" 1>&- ; then exit 1 fi -echo "postgresql://$USER:$PASS@$HOST:$PORT/$DB" +echo "postgresql://$DB_USER:$DB_PASS@$DB_HOST:$DB_PORT/$DB_NAME?sslmode=disable"