Compare commits

..

No commits in common. "900c080676a72531109d212896c19a9e5eac0c3e" and "e03ae84fdf1df3de902ceffe5b40c6550cd36d03" have entirely different histories.

39 changed files with 30 additions and 25 deletions

View file

@ -85,39 +85,39 @@ scrolling:
# Font configuration (changes require restart) # Font configuration (changes require restart)
font: font:
# Normal (roman) font face # Normal (roman) font face
normal: #normal:
# Font family # Font family
# #
# Default:monospace # Default:monospace
family: JetBrains Mono #family: monospace
# The `style` can be specified to pick a specific face. # The `style` can be specified to pick a specific face.
#style: Regular #style: Regular
# Bold font face # Bold font face
bold: #bold:
# Font family # Font family
# #
# If the bold family is not specified, it will fall back to the # If the bold family is not specified, it will fall back to the
# value specified for the normal font. # value specified for the normal font.
family: JetBrains Mono #family: monospace
# The `style` can be specified to pick a specific face. # The `style` can be specified to pick a specific face.
#style: Bold #style: Bold
# Italic font face # Italic font face
italic: #italic:
# Font family # Font family
# #
# If the italic family is not specified, it will fall back to the # If the italic family is not specified, it will fall back to the
# value specified for the normal font. # value specified for the normal font.
family: JetBrains Mono #family: monospace
# The `style` can be specified to pick a specific face. # The `style` can be specified to pick a specific face.
#style: Italic #style: Italic
# Point size # Point size
size: 13.0 size: 12.0
# Offset is the extra space around each character. `offset.y` can be thought of # Offset is the extra space around each character. `offset.y` can be thought of
# as modifying the line spacing, and `offset.x` as modifying the letter spacing. # as modifying the line spacing, and `offset.x` as modifying the letter spacing.

View file

@ -23,11 +23,11 @@
module-margin-right = 2 module-margin-right = 2
font-0 = fixed:pixelsize=10;1 font-0 = fixed:pixelsize=10;1
font-1 = Font Awesome 6 Pro Regular:size=12 font-1 = Font Awesome 5 Pro Regular:size=12
font-2 = Font Awesome 6 Pro Light:size=12 font-2 = Font Awesome 5 Pro Light:size=12
font-3 = Font Awesome 6 Pro Solid:size=12 font-3 = Font Awesome 5 Pro Solid:size=12
font-4 = Font Awesome 6 Brands:size=12 font-4 = Font Awesome 5 Brands:size=12
font-5 = Font Awesome 6 Duotone Solid:size=12 font-5 = Font Awesome 5 Duotone Solid:size=12
font-6 = PowerlineSymbols:size=12 font-6 = PowerlineSymbols:size=12
monitor = monitor =

View file

@ -1,6 +1,6 @@
configuration { configuration {
modi: "combi,ssh,run,window"; modi: "combi,ssh,run,window";
font: "JetBrains Mono 13"; font: "hack 10";
show-icons: true; show-icons: true;
ssh-command: "{terminal} -e bash -ic "ssh {host} [-p {port}]""; ssh-command: "{terminal} -e bash -ic "ssh {host} [-p {port}]"";
icon-theme: ""Papirus-Dark""; icon-theme: ""Papirus-Dark"";

View file

@ -1,6 +1,14 @@
set runtimepath+=~/.config/vim,~/.config/vim/after set runtimepath+=~/.config/vim,~/.config/vim/after
set packpath+=~/.config/vim set packpath+=~/.config/vim
if has('nvim')
" Neovim specific commands
set viminfo+=n~/.cache/nviminfo
else
" Standard vim specific commands
set viminfo+=n~/.cache/viminfo
endif
" Plug plugins using VimPlug " Plug plugins using VimPlug
call plug#begin('~/.config/vim/plugged') call plug#begin('~/.config/vim/plugged')
" Tools " Tools
@ -67,14 +75,6 @@ set hlsearch
set nowrap set nowrap
set nocompatible set nocompatible
if has('nvim')
" Neovim specific commands
set viminfo+=n~/.cache/nviminfo
else
" Standard vim specific commands
set viminfo+=n~/.cache/viminfo
endif
set wildmode=longest,list,full set wildmode=longest,list,full
set fillchars+=vert:\ set fillchars+=vert:\

View file

@ -5,7 +5,7 @@ ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✘ "
PROMPT='%(?, ,%{$fg[red]%}RETURN: $?%{$reset_color%} PROMPT='%(?, ,%{$fg[red]%}RETURN: $?%{$reset_color%}
) )
%{$fg[red]%}%* %{$fg[yellow]%}%n%{$reset_color%}@%{$fg[magenta]%}%M%{$reset_color%}: %{$fg_bold[blue]%}%~$(git_prompt_info) %{$fg[green]%}%* %{$fg[magenta]%}%n%{$reset_color%}@%{$fg[yellow]%}%M%{$reset_color%}: %{$fg_bold[blue]%}%~$(git_prompt_info)
%{$fg[green]%}$%{$reset_color%} ' %{$fg_bold[green]%}%{$reset_color%} '
#RPROMPT='%{$fg[green]%}[%*]%{$reset_color%}' #RPROMPT='%{$fg[green]%}[%*]%{$reset_color%}'

View file

@ -1,7 +1,12 @@
. "$HOME/.config/environment" export VIMINIT='source ~/.config/vim/vimrc'
. "$HOME/.config/aliasrc" export PASSWORD_STORE_GENERATED_LENGTH='64'
export ZDOTDIR="$HOME/.config/zsh"
source "$HOME/.config/environment"
if [ -x "$(command -v gpgconf)" ]; then if [ -x "$(command -v gpgconf)" ]; then
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
gpgconf --launch gpg-agent gpgconf --launch gpg-agent
fi fi
[ -x "$(command -v mpd)" ] && mpd