diff options
| -rw-r--r-- | config/alacritty/alacritty.yml | 22 | ||||
| -rw-r--r-- | config/qutebrowser/config.py | 3 | ||||
| -rw-r--r-- | config/tmux/tmux.conf | 61 | ||||
| -rw-r--r-- | config/zsh/.zshrc | 7 | ||||
| -rw-r--r-- | config/zsh/aliases.zsh | 7 | ||||
| -rwxr-xr-x | config/zsh/zprofile | 20 | ||||
| -rwxr-xr-x | install | 24 |
7 files changed, 119 insertions, 25 deletions
diff --git a/config/alacritty/alacritty.yml b/config/alacritty/alacritty.yml index 419ec21..d05964a 100644 --- a/config/alacritty/alacritty.yml +++ b/config/alacritty/alacritty.yml @@ -4,13 +4,27 @@ # font font: - size: 9 - normal: - family: Fira Code - + size: 12 offset: x: 0 y: 0 + normal: + family: Fira Code + style: Regular + italic: + family: Fira Code + style: Italic + bold: + family: Fira Code + style: Bold + + +key_bindings: + - { key: J, mods: Command, chars: "\e[B" } + - { key: K, mods: Command, chars: "\e[A" } + - { key: J, mods: Command|Shift, action: ScrollHalfPageDown } + - { key: K, mods: Command|Shift, action: ScrollHalfPageUp } + - { key: Return, mods: Command, action: ToggleSimpleFullScreen } # gruvbox_dark: https://github.com/eendroroy/alacritty-theme/blob/master/schemes.yaml colors: diff --git a/config/qutebrowser/config.py b/config/qutebrowser/config.py index 3d20f10..d27a498 100644 --- a/config/qutebrowser/config.py +++ b/config/qutebrowser/config.py @@ -36,6 +36,9 @@ c.url.searchengines = { "dlende": "https://www.deepl.com/translator#en/de/{}", } +c.window.hide_decoration = False +config.bind("<Command-Return>", "config-cycle window.hide_decoration true false", mode="normal") + c.fonts.default_family = ["Fira Mono", "Baekmuk", "Symbola"] c.fonts.hints = "bold 11pt default_family" diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf index fc2fcb2..f7ef434 100644 --- a/config/tmux/tmux.conf +++ b/config/tmux/tmux.conf @@ -1,13 +1,58 @@ unbind C-b -set -g prefix C-f -bind C-f send-prefix +set -g prefix C-a +bind C-a send-prefix -set -g default-terminal "screen.xterm-256color" +set -g default-terminal "xterm-256color" set -g mouse on setw -g mode-keys vi -unbind l -bind k select-pane -U -bind j select-pane -D -bind l select-pane -R -bind h select-pane -L + +# from: https://github.com/egel/tmux-gruvbox +## COLORSCHEME: gruvbox dark (medium) +set-option -g status "on" + +# default statusbar color +set-option -g status-style bg=colour237,fg=colour223 # bg=bg1, fg=fg1 + +# default window title colors +set-window-option -g window-status-style bg=colour214,fg=colour237 # bg=yellow, fg=bg1 + +# default window with an activity alert +set-window-option -g window-status-activity-style bg=colour237,fg=colour248 # bg=bg1, fg=fg3 + +# active window title colors +set-window-option -g window-status-current-style bg=red,fg=colour237 # fg=bg1 + +# pane border +set-option -g pane-active-border-style fg=colour250 #fg2 +set-option -g pane-border-style fg=colour237 #bg1 + +# message infos +set-option -g message-style bg=colour239,fg=colour223 # bg=bg2, fg=fg1 + +# writing commands inactive +set-option -g message-command-style bg=colour239,fg=colour223 # bg=fg3, fg=bg1 + +# pane number display +set-option -g display-panes-active-colour colour250 #fg2 +set-option -g display-panes-colour colour237 #bg1 + +# clock +set-window-option -g clock-mode-colour colour109 #blue + +# bell +set-window-option -g window-status-bell-style bg=colour167,fg=colour235 # bg=red, fg=bg + +## Theme settings mixed with colors (unfortunately, but there is no cleaner way) +set-option -g status-justify "left" +set-option -g status-left-style none +set-option -g status-left-length "80" +set-option -g status-right-style none +set-option -g status-right-length "80" +set-window-option -g window-status-separator "" + +set-option -g status-left "#[bg=colour241,fg=colour248] #S #[bg=colour237,fg=colour241,nobold,noitalics,nounderscore]" +set-option -g status-right "#[bg=colour237,fg=colour239 nobold, nounderscore, noitalics]#[bg=colour239,fg=colour246] %Y-%m-%d %H:%M #[bg=colour239,fg=colour248,nobold,noitalics,nounderscore]#[bg=colour248,fg=colour237] #h " + +set-window-option -g window-status-current-format "#[bg=colour214,fg=colour237,nobold,noitalics,nounderscore]#[bg=colour214,fg=colour239] #I #[bg=colour214,fg=colour239,bold] #W#{?window_zoomed_flag,*Z,} #[bg=colour237,fg=colour214,nobold,noitalics,nounderscore]" +set-window-option -g window-status-format "#[bg=colour239,fg=colour237,noitalics]#[bg=colour239,fg=colour223] #I #[bg=colour239,fg=colour223] #W #[bg=colour237,fg=colour239,noitalics]" diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index 77ee41e..92c55c5 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -62,7 +62,7 @@ chpwd() { content="$(find . -maxdepth 1 | wc -l)" ([ "$content" -lt 20 ] && ls -l) || echo "$(pwd) contains $content entries" - [ "$(stat -c "%U" .)" = "$USER" ] && touch . # to sort by last cd + [ "$(uname)" = 'Linux' ] && [ "$(stat -c "%U" .)" = "$USER" ] && touch . # to sort by last cd } # https://wiki.archlinux.org/title/Zsh#Shortcut_to_exit_shell_on_partial_command_line @@ -92,4 +92,7 @@ export YSU_MESSAGE_POSITION="after" # you-should # install pkgfile package on Arch Linux # run `pkgfile --update` -. /usr/share/doc/pkgfile/command-not-found.zsh +if [ "$(uname)" = 'Linux' ] +then + . /usr/share/doc/pkgfile/command-not-found.zsh +fi diff --git a/config/zsh/aliases.zsh b/config/zsh/aliases.zsh index b2ca0a9..7957167 100644 --- a/config/zsh/aliases.zsh +++ b/config/zsh/aliases.zsh @@ -21,7 +21,12 @@ alias doas='doas ' # same for doas alias info='info --vi-keys' # ls -alias ls='ls --color=auto -Fh' +if [ "$(uname)" = 'Linux' ] +then + alias ls='ls --color=auto -Fh' +else + alias ls='ls -G -Fh' +fi alias ll="ls -l" alias la="ls -A" alias lla="ls -Al" diff --git a/config/zsh/zprofile b/config/zsh/zprofile index 5d5f01b..1388cd9 100755 --- a/config/zsh/zprofile +++ b/config/zsh/zprofile @@ -1,15 +1,25 @@ #!/bin/zsh -export PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:$HOME/.local/bin" +if [ "$(uname)" = 'Linux' ] +then + export PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:$HOME/.local/bin" + export TERM='st-256color' + export MAIL='me@cacharle.xyz' + export SUDO='doas' +elif [ "$(uname)" = 'Darwin' ] +then + export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" + export PATH="$PATH:$HOME/.brew/bin:$HOME/git/dotfiles/bin:$HOME/bin:/usr/local/anaconda3/bin" + export TERM='xterm-256color' + export MAIL='charles.cabergs@colruytgroup.com' + export SUDO='sudo' +fi # applications export EDITOR='vim' -export TERM='st-256color' export TERMINAL='st' -export MAIL='me@cacharle.xyz' export BROWSER='qutebrowser' export BROWSERCLI='w3m' -export SUDO='doas' # XDG all the things export XDG_CONFIG_HOME="$HOME/.config" @@ -68,7 +78,7 @@ export MINIKUBE_IN_STYLE=false # disable cringe minikube emojies export CLOUT_SYNC_DIR="clout-sync/" export CLOUT_SYNC_PATH="${XDG_DATA_HOME:-$HOME/.sync}/$CLOUT_SYNC_DIR" -if [ "$(tty)" = '/dev/tty1' ] +if [ "$(uname)" = 'Linux' ] && [ "$(tty)" = '/dev/tty1' ] then startx "$XDG_CONFIG_HOME/x11/xinitrc" poweroff @@ -27,9 +27,12 @@ mkdir -pv "$XDG_CONFIG_HOME" mkdir -pv "$XDG_DATA_HOME" mkdir -pv "$XDG_CACHE_HOME" # xmonad uses ~/.xmonad if those directories don't already exists -mkdir -pv "$XMONAD_CONFIG_HOME" -mkdir -pv "$XMONAD_DATA_HOME" -mkdir -pv "$XMONAD_CACHE_HOME" +if [ $(uname) = Linux ] +then + mkdir -pv "$XMONAD_CONFIG_HOME" + mkdir -pv "$XMONAD_DATA_HOME" + mkdir -pv "$XMONAD_CACHE_HOME" +fi echo '---------------------------- CONFIG FILE LINKS ---------------------------' @@ -71,6 +74,11 @@ PLUGURL='https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim' [ ! -f "$PLUGFILE" ] && curl -fLo "$PLUGFILE" --create-dirs "$PLUGURL" vim -c "PlugInstall" -c "qa" +PACKERDIR="$XDG_DATA_HOME/nvim/site/pack/packer/start/packer.nvim" +PACKERURL='https://github.com/wbthomason/packer.nvim' +[ ! -d "$PACKERDIR" ] && git clone --depth 1 "$PACKERURL" "$PACKERDIR" +vim -c "PackerInstall" -c "qa" + ############################################################################### # zsh pluggins ############################################################################### @@ -92,6 +100,12 @@ parallel_start update_zsh_plugin 'https://github.com/zsh-users/zsh-syntax-highli parallel_start update_zsh_plugin 'https://github.com/MichaelAquilina/zsh-you-should-use' parallel_wait +[ $(uname) = Darwin ] && exit + +############################################################################### +# Linux specific +############################################################################### + ############################################################################### # crontab ############################################################################### @@ -101,14 +115,14 @@ echo '---------------------------- INSTALL CRONTAB ----------------------------- if [ "$(cat /etc/hostname)" = 'charleslaptopcarbon' ] then cat crontab/user.crontab crontab/laptop.crontab | crontab - -else +elif [ "$(cat /etc/hostname)" = 'cacharle-main' ] crontab crontab/user.crontab fi echo 'INFO: Run this script as root if you want to install the root contab' ############################################################################### -# dictionaties +# dictionaries ############################################################################### echo '---------------------------- INSTALL DICTIONARY --------------------------' |