diff --git a/README.md b/README.md index 44de1b0..76838d3 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@ ## Features - [ZSH](https://www.zsh.org/) + [oh-my-zsh](https://ohmyz.sh/) + [p10k](https://github.com/romkatv/powerlevel10k) - [asdf version manager](https://asdf-vm.com/#/) -- [pre-configured](./configs/init.lua) [neovim](https://neovim.io/) +- [pre-configured](./configs/nvim/init.lua) [neovim](https://neovim.io/) - [tmux](https://github.com/tmux/tmux) -- [i3](https://i3wm.org) +- [sway](https://i3wm.org) - 1 line installation ## Installation @@ -25,7 +25,7 @@ chmod +x ~/.dotfiles/setup.sh ``` ## Testing -If you want to test the script before you can run the provided docker image. +If you want to test this setup, you can use the provided docker image. ```bash docker build . -t jim-fx/dotfiles @@ -34,20 +34,20 @@ docker run -it jim-fx/dotfiles ## Opinionated Stuff -Because this is mainly my personal configs there are some stuff which you should be aware of. +Because this is mainly my personal configs there is some stuff which you should be aware of. ### Directories -- Personal projects are under ~/SYNC +- Personal projects are under ~/Projects - Uni projects are under ~/COCO - Binaries are under ~/bin ### Custom commands ```bash -fx [s/i/o] (directory) +fx [s/i/o/d] (directory) ``` -Used to navigate and edit folders in the ~/SYNC folder +Used to navigate and edit folders in the ~/Projects folder ```bash diff --git a/configs/.bashrc b/configs/.bashrc deleted file mode 100644 index b8218da..0000000 --- a/configs/.bashrc +++ /dev/null @@ -1,119 +0,0 @@ -# ~/.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' - -# some more ls aliases -#alias ll='ls -l' -#alias la='ls -A' -#alias l='ls -CF' - -# 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 - - -export MAX_TEST_VAR="working" - -[ -z $DISPLAY ] && export DISPLAY=127.0.0.1:0.0 -. "$HOME/.cargo/env" diff --git a/setup.sh b/setup.sh index 658abd6..ba64901 100755 --- a/setup.sh +++ b/setup.sh @@ -107,7 +107,6 @@ fi echo "-- linking .dotfiles --" -linkFile .bashrc linkFile .p10k.zsh linkFile .dircolors linkFile .tmux.conf