diff --git a/.bashrc b/.bashrc index 07c3df2..5dd74bc 100644 --- a/.bashrc +++ b/.bashrc @@ -30,79 +30,12 @@ shopt -s globstar # Type directory names directly, without 'cd' and still move there shopt -s autocd -# 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 ~/.config/bash_aliases ]; then - . ~/.config/bash_aliases -fi +alias ls='ls -lahtr --color=auto' +alias vi='kak' +alias df='/usr/bin/git --git-dir=$HOME/.dotfilesrepo/ --work-tree=$HOME' +alias unpack='dtrx' +alias imv='imv-wayland' +alias sway='sway --unsupported-gpu' # enable programmable completion features (you don't need to enable # this, if it's already enabled in /etc/bash.bashrc and /etc/profile @@ -115,4 +48,3 @@ if ! shopt -oq posix; then fi fi -export PATH="$PATH:/home/kk/.local/share/pi-node/node-v22.22.3-linux-x64/bin" diff --git a/.config/bash_aliases b/.config/bash_aliases deleted file mode 100644 index 54140a2..0000000 --- a/.config/bash_aliases +++ /dev/null @@ -1,6 +0,0 @@ -alias ls='ls -lahtr' -alias vi='kak' -alias df='/usr/bin/git --git-dir=$HOME/.dotfilesrepo/ --work-tree=$HOME' -alias unpack='dtrx' -alias imv='imv-wayland' -alias sway='sway --unsupported-gpu' diff --git a/.config/sway/config b/.config/sway/config index 207df5d..7d8bc9c 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -83,8 +83,6 @@ input "1267:12734:ELAN06FA:00_04F3:31BE_Touchpad" { # # Basics: # - - # Start a terminal bindsym $mod+Return exec $term diff --git a/.profile b/.profile deleted file mode 100644 index 1c979fa..0000000 --- a/.profile +++ /dev/null @@ -1,37 +0,0 @@ -# ~/.profile: executed by the command interpreter for login shells. -# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login -# exists. -# see /usr/share/doc/bash/examples/startup-files for examples. -# the files are located in the bash-doc package. - -# the default umask is set in /etc/profile; for setting the umask -# for ssh logins, install and configure the libpam-umask package. -#umask 022 - -export EDITOR=kak -export VISUAL=kak -export BROWSER=firefox -export TERMINAL=foot - -# if running bash -if [ -n "$BASH_VERSION" ]; then - # include .bashrc if it exists - if [ -f "$HOME/.bashrc" ]; then - . "$HOME/.bashrc" - fi -fi - -# set PATH so it includes user's private bin if it exists -if [ -d "$HOME/bin" ] ; then - PATH="$HOME/bin:$PATH" -fi - -# set PATH so it includes user's private bin if it exists -if [ -d "$HOME/.local/bin" ] ; then - PATH="$HOME/.local/bin:$PATH" -fi - -if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then - exec sway --unsupported-gpu -fi - diff --git a/setup.sh b/setup.sh index 2f57284..254fdf7 100644 --- a/setup.sh +++ b/setup.sh @@ -1,9 +1,9 @@ SRC=$HOME/dotfiles rm $HOME/.bashrc -rm $HOME/.profile +rm $HOME/.bash_profile ln -sf $SRC/.bashrc $HOME/.bashrc ln -sf $SRC/.vimrc $HOME/.vimrc -ln -sf $SRC/.profile $HOME/.profile +ln -sf $SRC/.bash_profile $HOME/.bash_profile ln -sf $SRC/.config $HOME/.config ln -sf $SRC/bin $HOME/bin