From a9c6df6dd534a916b2ab1a489ac7cb10ea45d8a7 Mon Sep 17 00:00:00 2001 From: Henrik Bakken Date: Sat, 5 Jun 2021 21:27:53 +0200 Subject: [PATCH] updates post mothership reset --- HOME/.Xresources | 45 ----------- HOME/.bashrc | 141 ----------------------------------- HOME/.xprofile | 1 + HOME/.zshrc | 44 ----------- fish/config.fish | 1 - hjalmar-mothership/i3/config | 4 +- manjaro.md | 23 +++--- mimeapps.list | 16 ++-- old/.zprofile | 14 ---- 9 files changed, 21 insertions(+), 268 deletions(-) delete mode 100644 HOME/.Xresources delete mode 100644 HOME/.bashrc delete mode 100644 HOME/.zshrc delete mode 100644 old/.zprofile diff --git a/HOME/.Xresources b/HOME/.Xresources deleted file mode 100644 index 30ec4ac..0000000 --- a/HOME/.Xresources +++ /dev/null @@ -1,45 +0,0 @@ - urxvt.perl-ext-common: default,tabbed,matcher,resize-font,-tabbed - - -! font config -URxvt.font: xft:hack:size=10 -URxvt.boldFont: xft:hack:size=10:bold -URxvt.italicFont: xft:hack:size=10:italic -URxvt.boldItalicFont: xft:hack:size=10:bolditalic -! xft:SauceCodePro Nerd Font -! xft:Inconsolata for Powerline -! xft:Droid Sans Mono for Powerline -! xft:Roboto Mono for Powerline -! xft:Go Mono for Powerline -! xft:DejaVu Sans Mono for Powerline -! xft:hack - -! bindings -URxvt.keysym.C-minus: resize-font:smaller -URxvt.keysym.C-plus: resize-font:bigger -URxvt.keysym.C-equal: resize-font:reset -URxvt.keysym.C-question: resize-font:show -URxvt.keysym.Shift-Control-V: eval:paste_clipboard -URxvt.keysym.Shift-Control-C: eval:selection_to_clipboard - -! font config -Xft.dpi: 108 -Xft.antialias: true -Xft.hinting: true -Xft.rgba: rgb -Xft.autohint: false -Xft.hintstyle: hintslight -Xft.lcdfilter: lcddefault - -! fade text when focus is lost -*fading: 8 -*fadeColor: black - -! cursor when hovering -Xcursor.theme: Maia-Cursor -Xcursor.size: 0 - -! settings -URxvt*scrollBar: false -URxvt*saveLines: 5000 -URxvt.iso14755: false diff --git a/HOME/.bashrc b/HOME/.bashrc deleted file mode 100644 index eaf54cc..0000000 --- a/HOME/.bashrc +++ /dev/null @@ -1,141 +0,0 @@ -# -# ~/.bashrc -# - -[[ $- != *i* ]] && return - -colors() { - local fgc bgc vals seq0 - - printf "Color escapes are %s\n" '\e[${value};...;${value}m' - printf "Values 30..37 are \e[33mforeground colors\e[m\n" - printf "Values 40..47 are \e[43mbackground colors\e[m\n" - printf "Value 1 gives a \e[1mbold-faced look\e[m\n\n" - - # foreground colors - for fgc in {30..37}; do - # background colors - for bgc in {40..47}; do - fgc=${fgc#37} # white - bgc=${bgc#40} # black - - vals="${fgc:+$fgc;}${bgc}" - vals=${vals%%;} - - seq0="${vals:+\e[${vals}m}" - printf " %-9s" "${seq0:-(default)}" - printf " ${seq0}TEXT\e[m" - printf " \e[${vals:+${vals+$vals;}}1mBOLD\e[m" - done - echo; echo - done -} - -[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion - -# Change the window title of X terminals -case ${TERM} in - xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*) - PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/\~}\007"' - ;; - screen*) - PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/\~}\033\\"' - ;; -esac - -use_color=true - -# Set colorful PS1 only on colorful terminals. -# dircolors --print-database uses its own built-in database -# instead of using /etc/DIR_COLORS. Try to use the external file -# first to take advantage of user additions. Use internal bash -# globbing instead of external grep binary. -safe_term=${TERM//[^[:alnum:]]/?} # sanitize TERM -match_lhs="" -[[ -f ~/.dir_colors ]] && match_lhs="${match_lhs}$(<~/.dir_colors)" -[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(/dev/null \ - && match_lhs=$(dircolors --print-database) -[[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true - -if ${use_color} ; then - # Enable colors for ls, etc. Prefer ~/.dir_colors #64489 - if type -P dircolors >/dev/null ; then - if [[ -f ~/.dir_colors ]] ; then - eval $(dircolors -b ~/.dir_colors) - elif [[ -f /etc/DIR_COLORS ]] ; then - eval $(dircolors -b /etc/DIR_COLORS) - fi - fi - - if [[ ${EUID} == 0 ]] ; then - PS1='\[\033[01;31m\][\h\[\033[01;36m\] \W\[\033[01;31m\]]\$\[\033[00m\] ' - else - PS1='\[\033[01;32m\][\u@\h\[\033[01;37m\] \W\[\033[01;32m\]]\$\[\033[00m\] ' - fi - - alias ls='ls --color=auto' - alias grep='grep --colour=auto' - alias egrep='egrep --colour=auto' - alias fgrep='fgrep --colour=auto' -else - if [[ ${EUID} == 0 ]] ; then - # show root@ when we don't have colors - PS1='\u@\h \W \$ ' - else - PS1='\u@\h \w \$ ' - fi -fi - -unset use_color safe_term match_lhs sh - -alias cp="cp -i" # confirm before overwriting something -alias df='df -h' # human-readable sizes -alias free='free -m' # show sizes in MB -alias np='nano -w PKGBUILD' -alias more=less - -xhost +local:root > /dev/null 2>&1 - -complete -cf sudo - -# Bash won't get SIGWINCH if another process is in the foreground. -# Enable checkwinsize so that bash will check the terminal size when -# it regains control. #65623 -# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11) -shopt -s checkwinsize - -shopt -s expand_aliases - -# export QT_SELECT=4 - -# Enable history appending instead of overwriting. #139609 -shopt -s histappend - -# -# # ex - archive extractor -# # usage: ex -ex () -{ - if [ -f $1 ] ; then - case $1 in - *.tar.bz2) tar xjf $1 ;; - *.tar.gz) tar xzf $1 ;; - *.bz2) bunzip2 $1 ;; - *.rar) unrar x $1 ;; - *.gz) gunzip $1 ;; - *.tar) tar xf $1 ;; - *.tbz2) tar xjf $1 ;; - *.tgz) tar xzf $1 ;; - *.zip) unzip $1 ;; - *.Z) uncompress $1;; - *.7z) 7z x $1 ;; - *) echo "'$1' cannot be extracted via ex()" ;; - esac - else - echo "'$1' is not a valid file" - fi -} - -[ -f ~/.fzf.bash ] && source ~/.fzf.bash diff --git a/HOME/.xprofile b/HOME/.xprofile index 30d019c..4c4e897 100644 --- a/HOME/.xprofile +++ b/HOME/.xprofile @@ -3,3 +3,4 @@ export TERMINAL=st export VISUAL=nvim export EDITOR=nvim export PAGER="bat --style=header,rule,snip" +export BROWSER=/usr/bin/vivaldi-stable diff --git a/HOME/.zshrc b/HOME/.zshrc deleted file mode 100644 index 73769f0..0000000 --- a/HOME/.zshrc +++ /dev/null @@ -1,44 +0,0 @@ -# Lines configured by zsh-newuser-install -HISTFILE=~/.zhistory -HISTSIZE=10000 -SAVEHIST=10000 -setopt nomatch -unsetopt autocd -bindkey -v -# End of lines configured by zsh-newuser-install -# The following lines were added by compinstall -zstyle :compinstall filename '/home/hjalmarlucius/.zshrc' - -autoload -Uz compinit -compinit -# End of lines added by compinstall - -# more history stuff -REPORTTIME=3 # Report command running time if it is more than 3 seconds -setopt INC_APPEND_HISTORY # Add commands to history as they are entered, don't wait for shell to exit -setopt EXTENDED_HISTORY # Also remember command start time and duration -setopt HIST_IGNORE_ALL_DUPS # Do not keep duplicate commands in history -setopt HIST_IGNORE_SPACE # Do not remember commands that start with a whitespace - -# default ls settings -alias ls='ls -hat --group-directories-first' -ls --color=auto &> /dev/null && alias ls='ls --color=auto' -export CLICOLOR=1 - -# fuzzy find -[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh -bindkey '^y' fzf-cd-widget - -# configure custom command prompt -_setup_ps1() { - GLYPH="▲" - [ "x$KEYMAP" = "xvicmd" ] && GLYPH="▼" - PS1="%F{red}[%F{cyan}%*%F{red}] %(?.%F{cyan}.%F{red})$GLYPH%f %(1j.%F{cyan}[%j]%f .)%F{cyan}%~%f %(!.%F{red}#%f .)" -} -_setup_ps1 - -# Base16 Shell -BASE16_SHELL="$HOME/.config/base16-shell/" -[ -n "$PS1" ] && \ - [ -s "$BASE16_SHELL/profile_helper.sh" ] && \ - eval "$("$BASE16_SHELL/profile_helper.sh")" diff --git a/fish/config.fish b/fish/config.fish index 1486fb4..47e5f04 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -1,4 +1,3 @@ -set -x BROWSER /usr/bin/google-chrome-stable set -x QT_QPA_PLATFORMTHEME "qt5ct" set -x GTK2_RC_FILES "$HOME/.gtkrc-2.0" set -x JAVA_HOME "/usr/lib/jvm/default/" diff --git a/hjalmar-mothership/i3/config b/hjalmar-mothership/i3/config index 7beed18..84456aa 100644 --- a/hjalmar-mothership/i3/config +++ b/hjalmar-mothership/i3/config @@ -21,7 +21,7 @@ workspace_auto_back_and_forth no # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. -font xft:URWGothic-Book 10 +font xft:URWGothic-Book 11 # Use Mouse+$mod to drag floating windows floating_modifier $mod @@ -40,7 +40,7 @@ exec_always --no-startup-id sbxkb exec_always --no-startup-id fix_xcursor # HB STARTUP ADDITIONS -exec --no-startup-id setxkbmap -layout no -model pc105 -variant nodeadkeys +exec --no-startup-id setxkbmap -layout no -model pc105 -variant nodeadkeys -option caps:escape exec --no-startup-id redshift-gtk -l 59.91:10.75 # exec --no-startup-id dropbox start & # exec --no-startup-id nvidia-settings -a GPUFanControlState=1 -a GPUTargetFanSpeed=60 diff --git a/manjaro.md b/manjaro.md index f578aed..94435d0 100644 --- a/manjaro.md +++ b/manjaro.md @@ -1,17 +1,16 @@ # linux * AUR package manager `sudo pacman -S yay` -* fonts `yay -S nerd-fonts-source-code-pro powerline-fonts-git libxft-bgra` +* fonts `yay -S ttf-hack` * cloud storage `yay -S onedrive-abraunegg dropbox` -* multimedia `yay -S ncspot-git pavucontrol manjaro-pulse pa-applet pavucontrol pulseaudio-bluetooth xwininfo` -* web `yay -S slack-desktop google-chrome` +* multimedia `yay -S ncspot-git pavucontrol manjaro-pulse pa-applet pavucontrol pulseaudio-bluetooth` +* web `yay -S slack-desktop vivaldi-stable` * pdf reader `yay -S zathura zathura-pdf-mupdf zathura zathura-djvu zathura-ps` * shell `yay -S fish` - * curl -L https://get.oh-my.fish | fish - * omf install https://github.com/edc/bass - * omf install https://github.com/jethrokuan/fzf + * `curl -L https://get.oh-my.fish | fish` + * `omf install https://github.com/edc/bass` + * `omf install https://github.com/jethrokuan/fzf` * div applications `yay -S thunar ranger drawio-desktop steam-manjaro` * div utils `yay -S trash-cli rofi redshift flameshot asus-fan-control` -* caps2esc `yay -S caps2esc` [install routine](https://askubuntu.com/questions/979359/how-do-i-install-caps2esc) - mode 1 * sysrq lock shutdown https://forum.manjaro.org/t/howto-reboot-turn-off-your-frozen-computer-reisub-reisuo/3855 + `echo kernel.sysrq=1 | sudo tee --append /etc/sysctl.d/99-sysctl.conf` + `sudo update-grub` @@ -19,9 +18,8 @@ # coding * essentials `yay -S neovim tmux` - * tmux plugins `git clone https://github.com/tmux-plugins/tpm ~/.config/tmux/plugins/tpm` - * base16 shell `git clone https://github.com/chriskempson/base16-shell.git ~/.config/base16-shell` -* cuda `yay -S cuda nvidia-container-toolkit` +* tmux plugins `git clone https://github.com/tmux-plugins/tpm ~/.config/tmux/plugins/tpm` +* base16 shell `git clone https://github.com/chriskempson/base16-shell.git ~/.config/base16-shell` * docker `yay -S docker docker-compose dry-bin` * git `yay -S diff-so-fancy tig git-lfs` * indexing `yay -S fsearch-git the_silver_searcher ripgrep ctags` @@ -29,10 +27,10 @@ * build `yay -S ninja` # python +* pytorch `yay python-pytorch-opt-cuda` * `pip install ipython pytest neovim numpy scipy sympy flake8 ptvsd addict dill ipdb pudb web-pdb` * matplotlib stuff `pip install matplotlib seaborn matplotlib-label-lines ipympl qbstyles` * other plotting `pip install plotly ggplot` -* install torch from [link](https://pytorch.org/) * `pip install tensorboard torchtext pytorch-lightning torchvision` # settings @@ -42,8 +40,7 @@ * jupyter `openssl req -x509 -nodes -days 365 -newkey rsa:1024 -keyout ~/.jupyter/mykey.key -out ~/.jupyter/mycert.pem` * start onedrive `systemctl enable --user onedrive --now` * ssd maintenance `sudo systemctl enable fstrim.timer --now` -* urxvt ext install `https://github.com/simmel/urxvt-resize-font` -* set nodeadkeys `setxkbmap -layout no -model pc105 -variant nodeadkeys` +* set nodeadkeys and caps to escape `setxkbmap -layout no -model pc105 -variant nodeadkeys -option caps:escape` # wsl * sudo apt install fish neovim ranger tmux docker docker/compose tig git-lfs ctags ripgrep silversearcher-ag python3-pip diff --git a/mimeapps.list b/mimeapps.list index 6e4080b..99f1a1f 100644 --- a/mimeapps.list +++ b/mimeapps.list @@ -1,12 +1,12 @@ [Default Applications] -application/x-extension-htm=google-chrome.desktop; -application/x-extension-html=google-chrome.desktop; -application/x-extension-shtml=google-chrome.desktop; -application/x-extension-xhtml=google-chrome.desktop; -application/x-extension-xht=google-chrome.desktop; -application/xhtml+xml=google-chrome.desktop; +application/x-extension-htm=vivaldi-stable.desktop; +application/x-extension-html=vivaldi-stable.desktop; +application/x-extension-shtml=vivaldi-stable.desktop; +application/x-extension-xhtml=vivaldi-stable.desktop; +application/x-extension-xht=vivaldi-stable.desktop; +application/xhtml+xml=vivaldi-stable.desktop; application/xml=draw.io.desktop; -application/pdf=google-chrome.desktop;org.pwmt.zathura.desktop; +application/pdf=vivaldi-stable.desktop;org.pwmt.zathura.desktop; application/x-bittorrent=deluge.desktop; application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=freeoffice-planmaker.desktop; application/vnd.openxmlformats-officedocument.presentationml.presentation=freeoffice-presentations.desktop; @@ -14,7 +14,7 @@ inode/directory=ranger.desktop image/jpeg=viewnior.desktop; image/png=viewnior.desktop; image/svg+xml=viewnior.desktop; -message/rfc822=google-chrome.desktop; +message/rfc822=vivaldi-stable.desktop; text/csv=freeoffice-planmaker.desktop; text/html=nvim.desktop; text/x-log=nvim.desktop; diff --git a/old/.zprofile b/old/.zprofile deleted file mode 100644 index d288c6a..0000000 --- a/old/.zprofile +++ /dev/null @@ -1,14 +0,0 @@ -export VISUAL=/usr/bin/nvim -export EDITOR=/usr/bin/nvim -export BROWSER=/usr/bin/chromium -export QT_QPA_PLATFORMTHEME="qt5ct" -export GTK2_RC_FILES="$HOME/.gtkrc-2.0" - -# cuda stuff -export CUDA_HOME=/opt/cuda -export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CUDA_HOME}/lib64 -PATH=${CUDA_HOME}/bin:${PATH} -export PATH - -# MKL AMD fix -export MKL_DEBUG_CPU_TYPE=5