diff options
-rw-r--r-- | .bash_profile | 6 | ||||
-rw-r--r-- | .bashrc | 24 | ||||
-rw-r--r-- | .config/starship.toml | 201 | ||||
-rw-r--r-- | .screenrc | 2 | ||||
-rwxr-xr-x | .xinitrc | 12 |
5 files changed, 239 insertions, 6 deletions
diff --git a/.bash_profile b/.bash_profile index 3ce6850..e8b688e 100644 --- a/.bash_profile +++ b/.bash_profile @@ -9,8 +9,6 @@ source ~/perl5/perlbrew/etc/bashrc export PATH="${HOME}/bin:${HOME}/.raku/bin:${PATH}" export GPG_TTY="$(tty)" -eval "$(keychain --eval --inherit any-once --agents ssh id_rsa id_ed25519)" - function e() { emacsclient -n "$@" } @@ -58,3 +56,7 @@ if [[ -z "$DISPLAY" ]]; then exec startx >~/xsession-errors 2>&1 fi +if [[ -z "$DBUS_SESSION_BUS_ADDRESS" && -e .dbus.env ]]; then + source .dbus.env +fi + @@ -10,6 +10,9 @@ alias cp="cp -i" export history_control=ignoreboth export command_oriented_history export HISTIGNORE='&:[bf]g:exit:ls' + +export LESSCOLORIZER='pygmentize -O bg=dark,style=github-dark -f terminal16m' + shopt -s extglob shopt -s cmdhist shopt -s histappend @@ -26,4 +29,23 @@ if ! shopt -oq posix; then fi fi -. ~/src/git-prompt/git-prompt.sh +function xtitle() { + case $TERM in + xterm*|rxvt*|Eterm|eterm|alacritty) + echo -ne "\e]0;$1\007" + ;; + screen) + echo -ne "\e_$1\e\\" + ;; + esac +} + +function starship_set_win_title() { + local cwd="${PWD/$HOME/\~}" + cwd="${cwd##[/~]*/}/" + + xtitle "$USER@$(hostname):$cwd" +} +starship_precmd_user_func=starship_set_win_title +eval "$(starship init bash)" + diff --git a/.config/starship.toml b/.config/starship.toml new file mode 100644 index 0000000..8418b47 --- /dev/null +++ b/.config/starship.toml @@ -0,0 +1,201 @@ +# Get editor completions based on the config schema +"$schema" = 'https://starship.rs/config-schema.json' + +# Inserts a blank line between shell prompts +add_newline = true + +format = """ +[](fg:user)\ +$username[@](bg:user fg:user_fg)$hostname${custom.screen}\ +[](fg:user bg:dir)\ +$directory\ +[](bg:time fg:dir)\ +$time\ +[](fg:time)\n\ +([](fg:vcs)\ +$vcsh\ +$git_branch\ +$git_status\ +$git_state\ +$git_commit\ +[](fg:vcs bg:lang)\ +$c\ +$golang\ +$java\ +$nodejs\ +$perl\ +$raku\ +$ruby\ +$rust\ +$vagrant\ +[](fg:lang)\n)\ +[](fg:jobs)\ +$jobs\ +[](fg:jobs bg:status)\ +$status\ +[](fg:status) \ +""" + +continuation_prompt = '▶▶ ' + +palette = 'pastels' + +[palettes.pastels] +user = '#865e3c' +user_fg = 'white' +user_root = '#FF0000' +screen_fg = '#00FF00' +time = '#33658A' +time_fg = 'white' +dir = '#DA627D' +dir_fg = 'white' +dir_repo_fg='black' +dir_ro_fg='yellow' +vcs = '#FCA17D' +vcs_fg = 'black' +lang = '#86BBD8' +lang_fg = 'black' +jobs = '#DA627D' +jobs_fg = 'black' +status = '#33658A' +status_fg = 'white' + +[c] +symbol = " " +style = "bg:lang fg:lang_fg" +format = '[ $symbol ($version) ]($style)' + +[directory] +read_only = " " +style = 'bg:dir fg:dir_fg' +read_only_style = 'bg:dir fg:dir_ro_fg' +repo_root_style = 'bg:dir fg:dir_repo_fg' +format = "[ $path]($style)[$read_only ]($read_only_style)" +repo_root_format = "[$before_root_path]($before_repo_root_style)[$repo_root]($repo_root_style)[$path]($style)[$read_only ]($read_only_style)" +truncation_length = 3 +truncation_symbol = "…/" +truncate_to_repo = false + +[git_branch] +symbol = " " +style = "bg:vcs fg:vcs_fg" +format = '[ $symbol$branch]($style)' +only_attached = false + +[git_commit] +only_detached = false +tag_disabled = false +style = "bg:vcs fg:vcs_fg" +format = "[ $hash$tag]($style)" + +[git_status] +style = "bg:vcs fg:vcs_fg" +conflicted = "⚔️" +ahead = "⏫${count}" +behind = "⏬${count}" +diverged = "⏫${ahead_count}⏬${behind_count}" +untracked = "🤷${count}" +stashed = "📦${count}" +modified = "📝${count}" +staged = "🗃️ ${count}" +renamed = "📛${count}" +deleted = "🗑️${count}" +format = '[ $all_status$ahead_behind]($style)' + +[golang] +symbol = " " +style = "bg:lang fg:lang_fg" +format = '[ $symbol($version)]($style)' + +[hg_branch] +symbol = " " +style = "bg:vcs fg:vcs_fg" +format = '[ $symbol$branch]($style)' + +[hostname] +ssh_symbol = " " +ssh_only = false +style = "bg:user fg:user_fg" +format = '[$hostname$ssh_symbol]($style)' + +[java] +symbol = " " +style = "bg:lang fg:lang_fg" +format = '[ $symbol($version)]($style)' + +[jobs] +number_threshold = 0 +style = "bg:jobs fg:jobs_fg" +format = '[$symbol$number]($style)' + +[nodejs] +symbol = " " +style = "bg:lang fg:lang_fg" +format = '[ $symbol ($version) ]($style)' + +[package] +symbol = " " +style = "bg:lang fg:lang_fg" + +[perl] +symbol = "🐪" +style = "bg:lang fg:lang_fg" +format = '[ $symbol($version)]($style)' +detect_files = [ 'Makefile.PL', 'Build.PL', 'cpanfile', 'cpanfile.snapshot', 'META.json', 'META.yml', '.perl-version', 'dist.ini' ] + +[python] +symbol = " " +style = "bg:lang fg:lang_fg" +format = '[${symbol}${pyenv_prefix}(${version})(\($virtualenv\))]($style)' + +[raku] +symbol = "🦋" +style = "bg:lang fg:lang_fg" +format = '[ $symbol($version)]($style)' + +[ruby] +symbol = " " +style = "bg:lang fg:lang_fg" +format = '[ $symbol($version)]($style)' + +[rust] +symbol = " " +style = "bg:lang fg:lang_fg" +format = '[ $symbol($version)]($style)' + +[status] +disabled = false +style = 'bg:status fg:status_fg' +format = '[$symbol$maybe_int$signal_name]($style)' +success_symbol = '' + +[sudo] +disabled = true +format = '[as $symbol]($style)' + +[time] +disabled = false +time_format = "%F %T" +style = "bg:time fg:time_fg" +format = '[ 🕙 $time ]($style)' + +[username] +format = '[$user]($style)' +show_always = true +style_user = "bg:user fg:user_fg" +style_root = "bg:user_root fg:user_fg" +disabled = false + +[vagrant] +style = "bg:lang fg:lang_fg" +format = '[ $symbol($version)]($style)' + +[vcsh] +style = "bg:vcs fg:vcs_fg" +format = '[ $repo]($style)' + +[custom.screen] +style = "bg:user fg:screen_fg" +when = '[[ "$TERM" == screen ]]' +command = 'echo "$WINDOW(${STY#*.})"' +format = '[ $output]($style)' @@ -73,4 +73,4 @@ bind '}' history # caption always "%3n %t%? @%u%?%? [%h]%?" # hardstatus alwaysignore # hardstatus alwayslastline "%w" - +truecolor on @@ -1,15 +1,23 @@ -#!/bin/sh +#!/bin/bash if [[ -z "$DBUS_SESSION_BUS_ADDRESS" ]]; then eval $(dbus-launch --exit-with-x11 --sh-syntax) + declare -p DBUS_SESSION_BUS_ADDRESS > .dbus.env fi cd export LC_ALL=en_US.UTF-8 xset s off +xset -dpms gamma 1 xsetroot -solid black xrdb -load .Xdefaults start-pulseaudio-x11 -exec cvlc -f +/usr/bin/mpd /home/dakkar/mpd/mpd.conf + +cvlc -f &> vlc.log & + +hsetroot -center ~/DresdenCodak_Station_1920x1080.jpg + +exec fvwm |