summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bashrc28
-rw-r--r--.config/gtk-3.0/gtk.css3
-rw-r--r--.config/sway/config3
-rw-r--r--.env19
-rw-r--r--.profile7
5 files changed, 27 insertions, 33 deletions
diff --git a/.bashrc b/.bashrc
index f8f2fa3..8f30966 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,26 +1,6 @@
-PS1="[\u@\h:\W]> "
+[ -n $ENV ] && . $ENV
-if [ -z "${SSH_AGENT_PID}" ]; then
- if ! [ -e /tmp/ssh-agent-$USER ]
- then
- ssh-agent 2>/dev/null >/tmp/ssh-agent-$USER
- fi
- . /tmp/ssh-agent-$USER >/dev/null
-fi
+PS1="\u@\h:\W "
-# Aliases
-# `githome` alias is a trick to avoid having git prompt when working
-# in different directories of my home folder. I simply rename `.git`
-# folder to `.githome` and use the following alias to interact with it.
-# On new systems I only need to do the following:
-# cd ~
-# git init
-# git remote add origin git@git.sr.ht:~mehdix/dotfiles
-# or
-# git remote add origin https://git.sr.ht/~mehdix/dotfiles
-# git fetch
-# git checkout -f master
-# mv .git .githome
-alias githome='git --git-dir ~/.githome --work-tree ~'
-
-[ -f ~/.fzf.bash ] && source ~/.fzf.bash \ No newline at end of file
+[ -f ~/.fzf.bash ] && . ~/.fzf.bash
+[ -f ~/.config/broot/launcher/bash/br ] && . ~/.config/broot/launcher/bash/br
diff --git a/.config/gtk-3.0/gtk.css b/.config/gtk-3.0/gtk.css
deleted file mode 100644
index 7bdbb07..0000000
--- a/.config/gtk-3.0/gtk.css
+++ /dev/null
@@ -1,3 +0,0 @@
-tooltip {
- opacity: 0;
-}
diff --git a/.config/sway/config b/.config/sway/config
index 89c001d..b9bc64c 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -8,8 +8,7 @@ set $term alacritty
# Note: pass the final command to swaymsg so that the resulting window can be opened
# on the original workspace that the command was run on.
-#set $menu dmenu_path | dmenu | xargs swaymsg exec --
-set $menu rofi -show run
+set $menu bemenu-run | xargs swaymsg exec --
### Output configuration
#
diff --git a/.env b/.env
index a184ed8..4149d8d 100644
--- a/.env
+++ b/.env
@@ -6,4 +6,21 @@ if [ -z "${SSH_AGENT_PID}" ]; then
ssh-agent 2>/dev/null >/tmp/ssh-agent-$USER
fi
. /tmp/ssh-agent-$USER >/dev/null
-fi \ No newline at end of file
+fi
+
+# Aliases
+# `githome` alias is a trick to avoid having git prompt when working
+# in different directories of my home folder. I simply rename `.git`
+# folder to `.githome` and use the following alias to interact with it.
+# On new systems I only need to do the following:
+# cd ~
+# git init
+# git remote add origin git@git.sr.ht:~mehdix/dotfiles
+# or
+# git remote add origin https://git.sr.ht/~mehdix/dotfiles
+# git fetch
+# git checkout -f master
+# mv .git .githome
+alias githome='git --git-dir ~/.githome --work-tree ~'
+
+alias ls='ls --color -A --group-directories-first'
diff --git a/.profile b/.profile
index 25b457c..873899c 100644
--- a/.profile
+++ b/.profile
@@ -4,8 +4,8 @@ export LC_TIME=de_DE.UTF-8
export EDITOR=vim
export TERM=xterm
export HISTSIZE=65535
-# autojump needs this
-export PROMPT_COMMAND="history -a"
+export HISTCONTROL=erasedups
+export PROMPT_COMMAND="history -a;history -n"
export PATH=$HOME/.local/bin:$PATH
export PATH=$HOME/.local/bin/`hostname`:$PATH
@@ -18,6 +18,7 @@ export CFLAGS="-O2 -pipe -march=native"
export CXXFLAGS="${CFLAGS}"
# Sway compatiblity https://github.com/swaywm/sway/issues/595
export _JAVA_AWT_WM_NONREPARENTING=1
+export GDK_BACKEND=wayland
+[ -e .config/$(hostname).profile ] && . .config/$(hostname).profile
[ $SHELL = "/bin/bash" ] && [ -f ~/.bashrc ] && . ~/.bashrc
-[ -e .config/$(hostname).profile ] && . .config/$(hostname).profile \ No newline at end of file