diff --git a/root/.Xresources b/HOME/.Xresources similarity index 100% rename from root/.Xresources rename to HOME/.Xresources diff --git a/root/.gitconfig b/HOME/.gitconfig similarity index 100% rename from root/.gitconfig rename to HOME/.gitconfig diff --git a/HOME/.xprofile b/HOME/.xprofile new file mode 100644 index 0000000..98f72da --- /dev/null +++ b/HOME/.xprofile @@ -0,0 +1,5 @@ +#!/bin/sh +export TERMINAL=st +export VISUAL=nvim +export EDITOR=nvim +export PAGER=bat diff --git a/root/locker.sh b/HOME/locker.sh similarity index 100% rename from root/locker.sh rename to HOME/locker.sh diff --git a/fish/config.fish b/fish/config.fish index ef8c897..1486fb4 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -1,5 +1,3 @@ -set -x VISUAL /usr/bin/nvim -set -x EDITOR /usr/bin/nvim set -x BROWSER /usr/bin/google-chrome-stable set -x QT_QPA_PLATFORMTHEME "qt5ct" set -x GTK2_RC_FILES "$HOME/.gtkrc-2.0" diff --git a/hjalmar-droneship/i3/config b/hjalmar-droneship/i3/config index 46435d3..8d63276 100644 --- a/hjalmar-droneship/i3/config +++ b/hjalmar-droneship/i3/config @@ -4,9 +4,6 @@ # Set mod key (Mod1=, Mod4=) set $mod Mod4 -# set terminal -set $term st - # set default desktop layout (default is tiling) # workspace_layout tabbed @@ -87,21 +84,21 @@ bindsym Pause exec pactl set-sink-volume @DEFAULT_SINK@ +10% bindsym Print exec pactl set-sink-volume @DEFAULT_SINK@ -10% bindsym Scroll_Lock exec pactl set-sink-mute @DEFAULT_SINK@ toggle -bindsym $mod+Return exec $term +bindsym $mod+Return exec i3-sensible-terminal bindsym $mod+d exec --no-startup-id rofi -show combi -combi-modi "run#drun" -lines 10 -eh 2 -width 30 bindsym $mod+Shift+s --release exec --no-startup-id flameshot gui bindsym $mod+Shift+x --release exec --no-startup-id xkill -bindsym $mod+F1 exec $term -e 'htop' -bindsym $mod+Shift+F1 exec $term -e 'glances' +bindsym $mod+F1 exec i3-sensible-terminal -e 'htop' +bindsym $mod+Shift+F1 exec i3-sensible-terminal -e 'glances' bindsym $mod+F2 exec "xdg-open 'https://www.inoreader.com'" bindsym $mod+Shift+F2 exec "xdg-open --new-window 'https://www.inoreader.com'" -bindsym $mod+F3 exec $term -e 'ranger' +bindsym $mod+F3 exec i3-sensible-terminal -e 'ranger' bindsym $mod+Shift+F3 exec thunar bindsym $mod+F4 exec pamac-manager bindsym $mod+F5 exec pavucontrol -bindsym $mod+F6 exec $term -e 'mocp' -bindsym $mod+Shift+F6 exec $term -e 'ncspot' +bindsym $mod+F6 exec i3-sensible-terminal -e 'mocp' +bindsym $mod+Shift+F6 exec i3-sensible-terminal -e 'ncspot' bindsym $mod+F9 exec --no-startup-id picom -b bindsym $mod+Shift+F9 exec --no-startup-id pkill picom bindsym $mod+Shift+F10 --release exec "killall dunst; exec notify-send 'restart dunst'" diff --git a/hjalmar-mothership/i3/config b/hjalmar-mothership/i3/config index 407c8ce..c9faaa1 100644 --- a/hjalmar-mothership/i3/config +++ b/hjalmar-mothership/i3/config @@ -4,9 +4,6 @@ # Set mod key (Mod1=, Mod4=) set $mod Mod4 -# set terminal -set $term st - # set default desktop layout (default is tiling) # workspace_layout tabbed @@ -87,21 +84,21 @@ bindsym Pause exec pactl set-sink-volume @DEFAULT_SINK@ +10% bindsym Print exec pactl set-sink-volume @DEFAULT_SINK@ -10% bindsym Scroll_Lock exec pactl set-sink-mute @DEFAULT_SINK@ toggle -bindsym $mod+Return exec $term +bindsym $mod+Return exec i3-sensible-terminal bindsym $mod+d exec --no-startup-id rofi -show combi -combi-modi "run#drun" -lines 10 -eh 2 -width 30 bindsym $mod+Shift+s --release exec --no-startup-id flameshot gui bindsym $mod+Shift+x --release exec --no-startup-id xkill -bindsym $mod+F1 exec $term -e 'htop' -bindsym $mod+Shift+F1 exec $term -e 'glances' +bindsym $mod+F1 exec i3-sensible-terminal -e 'htop' +bindsym $mod+Shift+F1 exec i3-sensible-terminal -e 'glances' bindsym $mod+F2 exec "xdg-open 'https://www.inoreader.com'" bindsym $mod+Shift+F2 exec "xdg-open --new-window 'https://www.inoreader.com'" -bindsym $mod+F3 exec $term -e 'ranger' +bindsym $mod+F3 exec i3-sensible-terminal -e 'ranger' bindsym $mod+Shift+F3 exec thunar bindsym $mod+F4 exec pamac-manager bindsym $mod+F5 exec pavucontrol -bindsym $mod+F6 exec $term -e 'mocp' -bindsym $mod+Shift+F6 exec $term -e 'ncspot' +bindsym $mod+F6 exec i3-sensible-terminal -e 'mocp' +bindsym $mod+Shift+F6 exec i3-sensible-terminal -e 'ncspot' bindsym $mod+F9 exec --no-startup-id picom -b bindsym $mod+Shift+F9 exec --no-startup-id pkill picom bindsym $mod+Shift+F10 --release exec "killall dunst; exec notify-send 'restart dunst'" diff --git a/manjaro.md b/manjaro.md index 91a5daa..8cd9cae 100644 --- a/manjaro.md +++ b/manjaro.md @@ -15,7 +15,7 @@ # coding * essentials `yay -S neovim tmux` - * tmux plugins `git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm` + * 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` * docker `yay -S docker docker-compose dry-bin` diff --git a/nvim/init.vim b/nvim/init.vim index fe9485c..8e5330a 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -101,7 +101,7 @@ let g:airline#extensions#tabline#formatter = 'unique_tail_improved' " temporary files and undo set directory=/tmp//,. set backupdir=/tmp//,. -set undodir=~/.vim/undo/ +set undodir=~/.cache/vim/undo/ set noswapfile set nowritebackup set undofile " Persistent undo diff --git a/root/.tigrc b/tig/config similarity index 100% rename from root/.tigrc rename to tig/config diff --git a/root/.tmux.conf b/tmux/tmux.conf similarity index 97% rename from root/.tmux.conf rename to tmux/tmux.conf index ebc48bf..549d869 100644 --- a/root/.tmux.conf +++ b/tmux/tmux.conf @@ -81,7 +81,7 @@ bind t clock-mode bind i display-panes # Config Reloads -bind r source-file ~/.tmux.conf \; refresh-client \; display-message "Config reloaded" +bind r source-file ~/.config/tmux/tmux.conf \; refresh-client \; display-message "Config reloaded" # resize controls bind -r h resize-pane -L 2 \; display-message "Resize left" @@ -196,4 +196,4 @@ set -g @plugin 'sainnhe/tmux-fzf' set -g @themepack 'powerline/double/yellow' # keep at bottom -run -b '~/.tmux/plugins/tpm/tpm' +run -b '~/.config/tmux/plugins/tpm/tpm'