From 8f2b1fa1378513dec8385621b436875f764d1cd9 Mon Sep 17 00:00:00 2001 From: AnthonyAxenov Date: Sun, 20 Nov 2022 21:37:11 +0800 Subject: [PATCH 1/3] lite-xl misc --- install/lite-xl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/lite-xl b/install/lite-xl index 15e9c75..09579b0 100755 --- a/install/lite-xl +++ b/install/lite-xl @@ -37,7 +37,7 @@ cat << EOF > "$dest_share_dir/applications/org.lite_xl.lite_xl.desktop" Type=Application Name=Lite XL Comment=A lightweight text editor written in Lua -Exec=env LITE_SCALE=1 lite-xl %F +Exec=env LITE_SCALE=1 ${dest_bin_dir}/lite-xl %F Icon=lite-xl Terminal=false StartupWMClass=lite-xl From 5f2d2e201186440bf064776924823b0c28a09436 Mon Sep 17 00:00:00 2001 From: AnthonyAxenov Date: Sun, 20 Nov 2022 21:38:40 +0800 Subject: [PATCH 2/3] apt misc --- install/apt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/install/apt b/install/apt index 6d327b4..54d0f16 100755 --- a/install/apt +++ b/install/apt @@ -49,7 +49,9 @@ sudo apt install -y \ vlc \ ffmpeg \ xclip \ - inotify-tools + inotify-tools \ + notify-osd \ + libnotify-bin # earlyoom \ # etckeeper \ # geoclue-2.0 \ From 04c74e1d002a0bf082c3ec58239e73d2f086cf65 Mon Sep 17 00:00:00 2001 From: AnthonyAxenov Date: Sun, 20 Nov 2022 21:38:49 +0800 Subject: [PATCH 3/3] dotfiles misc --- dotfiles/.bash_aliases | 5 ++ dotfiles/.bashrc | 108 +++++++++++++++++++++++++++++++++++++++ dotfiles/.zshrc | 112 +++++++++++++++++++++++++++++++++++++++++ install/dots | 2 + 4 files changed, 227 insertions(+) create mode 100644 dotfiles/.bashrc create mode 100644 dotfiles/.zshrc diff --git a/dotfiles/.bash_aliases b/dotfiles/.bash_aliases index 32fa80c..a4b5e37 100644 --- a/dotfiles/.bash_aliases +++ b/dotfiles/.bash_aliases @@ -43,9 +43,14 @@ alias gpg.new="gpg --full-generate-key" alias gpg.pub="gpg --armor --export $@" alias gpg.list='gpg --list-keys --keyid-format SHORT' +alias lite-xl="LITE_SCALE=1 lite-xl" alias wine='LANG=ru_RU.utf8 wine' alias docker.prune='docker image prune -f; docker network prune -f; docker container prune -f' +# Add an "alert" alias for long running commands. Use like so: +# sleep 10; alert +alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' + # https://obsproject.com/forum/threads/how-to-start-virtual-camera-without-sudo-privileges.139783/ alias obscam="sudo modprobe v4l2loopback video_nr=2 card_label='OBS Virtual Camera'" diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc new file mode 100644 index 0000000..206fb84 --- /dev/null +++ b/dotfiles/.bashrc @@ -0,0 +1,108 @@ +# ~/.bashrc: executed by bash(1) for non-login shells. +# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) +# for examples + +# If not running interactively, don't do anything +case $- in + *i*) ;; + *) return;; +esac + +# don't put duplicate lines or lines starting with space in the history. +# See bash(1) for more options +HISTCONTROL=ignoreboth + +# append to the history file, don't overwrite it +shopt -s histappend + +# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) +HISTSIZE=1000 +HISTFILESIZE=2000 + +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize + +# If set, the pattern "**" used in a pathname expansion context will +# match all files and zero or more directories and subdirectories. +#shopt -s globstar + +# make less more friendly for non-text input files, see lesspipe(1) +[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" + +# set variable identifying the chroot you work in (used in the prompt below) +if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then + debian_chroot=$(cat /etc/debian_chroot) +fi + +# set a fancy prompt (non-color, unless we know we "want" color) +case "$TERM" in + xterm-color|*-256color) color_prompt=yes;; +esac + +# uncomment for a colored prompt, if the terminal has the capability; turned +# off by default to not distract the user: the focus in a terminal window +# should be on the output of commands, not on the prompt +#force_color_prompt=yes + +if [ -n "$force_color_prompt" ]; then + if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then + # We have color support; assume it's compliant with Ecma-48 + # (ISO/IEC-6429). (Lack of such support is extremely rare, and such + # a case would tend to support setf rather than setaf.) + color_prompt=yes + else + color_prompt= + fi +fi + +if [ "$color_prompt" = yes ]; then + PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' +else + PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' +fi +unset color_prompt force_color_prompt + +# If this is an xterm set the title to user@host:dir +case "$TERM" in +xterm*|rxvt*) + PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" + ;; +*) + ;; +esac + +# enable color support of ls and also add handy aliases +if [ -x /usr/bin/dircolors ]; then + test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" + alias ls='ls --color=auto' + #alias dir='dir --color=auto' + #alias vdir='vdir --color=auto' + + alias grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' +fi + +# colored GCC warnings and errors +#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' + +# Alias definitions. +# You may want to put all your additions into a separate file like +# ~/.bash_aliases, instead of adding them here directly. +# See /usr/share/doc/bash-doc/examples in the bash-doc package. + +if [ -f ~/.bash_aliases ]; then + . ~/.bash_aliases +fi + +# enable programmable completion features (you don't need to enable +# this, if it's already enabled in /etc/bash.bashrc and /etc/profile +# sources /etc/bash.bashrc). +if ! shopt -oq posix; then + if [ -f /usr/share/bash-completion/bash_completion ]; then + . /usr/share/bash-completion/bash_completion + elif [ -f /etc/bash_completion ]; then + . /etc/bash_completion + fi +fi diff --git a/dotfiles/.zshrc b/dotfiles/.zshrc new file mode 100644 index 0000000..4be4f67 --- /dev/null +++ b/dotfiles/.zshrc @@ -0,0 +1,112 @@ +# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. +# Initialization code that may require console input (password prompts, [y/n] +# confirmations, etc.) must go above this block; everything else may go below. +if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then + source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" +fi + +# If you come from bash you might have to change your $PATH. +# export PATH=$HOME/bin:/usr/local/bin:$PATH + +# Path to your oh-my-zsh installation. +export ZSH="$HOME/.oh-my-zsh" + +# Set name of the theme to load --- if set to "random", it will +# load a random theme each time oh-my-zsh is loaded, in which case, +# to know which specific one was loaded, run: echo $RANDOM_THEME +# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes +ZSH_THEME="powerlevel10k/powerlevel10k" + +# Set list of themes to pick from when loading at random +# Setting this variable when ZSH_THEME=random will cause zsh to load +# a theme from this variable instead of looking in $ZSH/themes/ +# If set to an empty array, this variable will have no effect. +# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) + +# Uncomment the following line to use case-sensitive completion. +# CASE_SENSITIVE="true" + +# Uncomment the following line to use hyphen-insensitive completion. +# Case-sensitive completion must be off. _ and - will be interchangeable. +# HYPHEN_INSENSITIVE="true" + +# Uncomment one of the following lines to change the auto-update behavior +# zstyle ':omz:update' mode disabled # disable automatic updates +# zstyle ':omz:update' mode auto # update automatically without asking +# zstyle ':omz:update' mode reminder # just remind me to update when it's time + +# Uncomment the following line to change how often to auto-update (in days). +# zstyle ':omz:update' frequency 13 + +# Uncomment the following line if pasting URLs and other text is messed up. +# DISABLE_MAGIC_FUNCTIONS="true" + +# Uncomment the following line to disable colors in ls. +# DISABLE_LS_COLORS="true" + +# Uncomment the following line to disable auto-setting terminal title. +# DISABLE_AUTO_TITLE="true" + +# Uncomment the following line to enable command auto-correction. +# ENABLE_CORRECTION="true" + +# Uncomment the following line to display red dots whilst waiting for completion. +# You can also set it to another string to have that shown instead of the default red dots. +# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f" +# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765) +# COMPLETION_WAITING_DOTS="true" + +# Uncomment the following line if you want to disable marking untracked files +# under VCS as dirty. This makes repository status check for large repositories +# much, much faster. +# DISABLE_UNTRACKED_FILES_DIRTY="true" + +# Uncomment the following line if you want to change the command execution time +# stamp shown in the history command output. +# You can set one of the optional three formats: +# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" +# or set a custom format using the strftime function format specifications, +# see 'man strftime' for details. +# HIST_STAMPS="mm/dd/yyyy" + +# Would you like to use another custom folder than $ZSH/custom? +# ZSH_CUSTOM=/path/to/new-custom-folder + +# Which plugins would you like to load? +# Standard plugins can be found in $ZSH/plugins/ +# Custom plugins may be added to $ZSH_CUSTOM/plugins/ +# Example format: plugins=(rails git textmate ruby lighthouse) +# Add wisely, as too many plugins slow down shell startup. +plugins=(git docker docker-compose composer zsh-autosuggestions zsh-syntax-highlighting) +# plugins=(git zsh-autosuggestions zsh-syntax-highlighting) + +source $ZSH/oh-my-zsh.sh + +# User configuration + +# export MANPATH="/usr/local/man:$MANPATH" + +# You may need to manually set your language environment +# export LANG=en_US.UTF-8 + +# Preferred editor for local and remote sessions +# if [[ -n $SSH_CONNECTION ]]; then +# export EDITOR='vim' +# else +# export EDITOR='mvim' +# fi + +# Compilation flags +# export ARCHFLAGS="-arch x86_64" + +# Set personal aliases, overriding those provided by oh-my-zsh libs, +# plugins, and themes. Aliases can be placed here, though oh-my-zsh +# users are encouraged to define aliases within the ZSH_CUSTOM folder. +# For a full list of active aliases, run `alias`. +# +# Example aliases +# alias zshconfig="mate ~/.zshrc" +# alias ohmyzsh="mate ~/.oh-my-zsh" + +# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. +[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh diff --git a/install/dots b/install/dots index 40a2d3b..cf62448 100755 --- a/install/dots +++ b/install/dots @@ -19,6 +19,8 @@ install() { install .bash_aliases install .profile +install .bashrc install .gitconfig install .gitignore install .git_aliases +ln -s "$HOME/.profile" "$HOME/.zprofile"