From 283e3b1908736418517e1e6148fa366dc5645a56 Mon Sep 17 00:00:00 2001 From: tiynger Date: Thu, 3 Oct 2019 22:40:43 +0200 Subject: [PATCH] restructuring of dotfiles --- .Xdefaults => .config/xorg/Xdefaults | 0 .xprofile => .config/xorg/xprofile | 4 +- .zprofile => .config/zsh/.zprofile | 0 .config/zsh/{zshrc => .zshrc} | 0 .profile | 7 +--- .tmux.conf | 56 ---------------------------- .xinitrc | 6 +-- .zshrc | 1 - 8 files changed, 6 insertions(+), 68 deletions(-) rename .Xdefaults => .config/xorg/Xdefaults (100%) rename .xprofile => .config/xorg/xprofile (75%) rename .zprofile => .config/zsh/.zprofile (100%) rename .config/zsh/{zshrc => .zshrc} (100%) delete mode 100644 .tmux.conf delete mode 120000 .zshrc diff --git a/.Xdefaults b/.config/xorg/Xdefaults similarity index 100% rename from .Xdefaults rename to .config/xorg/Xdefaults diff --git a/.xprofile b/.config/xorg/xprofile similarity index 75% rename from .xprofile rename to .config/xorg/xprofile index 4596afd..db2e694 100644 --- a/.xprofile +++ b/.config/xorg/xprofile @@ -1,7 +1,7 @@ #!/bin/sh -setbg & # Set the background -sxhkd & # Bind keys +setbg & # Set the background +sxhkd & # Bind keys xset r rate 300 50 & # Speed xrate up unclutter & # Remove mouse when idle xcompmgr & # xcompmgr for transparency diff --git a/.zprofile b/.config/zsh/.zprofile similarity index 100% rename from .zprofile rename to .config/zsh/.zprofile diff --git a/.config/zsh/zshrc b/.config/zsh/.zshrc similarity index 100% rename from .config/zsh/zshrc rename to .config/zsh/.zshrc diff --git a/.profile b/.profile index 286bb1a..3ee4b72 100644 --- a/.profile +++ b/.profile @@ -13,6 +13,7 @@ export NOTMUCH_CONFIG="$HOME/.config/notmuch-config" export GTK2_RC_FILES="$HOME/.config/gtk-2.0/gtkrc-2.0" export RTV_BROWSER="firefox" export QT_QPA_PLATFORMTHEME="qt5ct" +export ZDOTDIR="$HOME/.config/zsh" # less/man colors export LESS=-R @@ -26,13 +27,7 @@ export LESS_TERMCAP_ue="$(printf '%b' '')"; a="${a%_}" mpd >/dev/null 2>&1 & -[ ! -f ~/.config/shortcutrc ] && shortcuts >/dev/null 2>&1 - echo "$0" | grep "bash$" >/dev/null && [ -f ~/.bashrc ] && source "$HOME/.bashrc" # Start graphical server if i3 not already running. [ "$(tty)" = "/dev/tty1" ] && ! pgrep -x i3 >/dev/null && exec startx - -# Switch escape and caps if tty: -##sudo -n loadkeys ~/.local/bin/ttymaps.kmap 2>/dev/null - diff --git a/.tmux.conf b/.tmux.conf deleted file mode 100644 index 2a6cda1..0000000 --- a/.tmux.conf +++ /dev/null @@ -1,56 +0,0 @@ -set -g prefix C-a -setw -g mode-keys vi -setw -g mode-style bg=black -set-option -g default-terminal "xterm-256color" -set-option -g pane-active-border-style fg=green -set-window-option -g xterm-keys on # for vim -set-window-option -g mode-keys vi # vi key -set-window-option -g monitor-activity on -set-window-option -g window-status-current-style fg=white -setw -g window-status-current-style reverse -setw -g automatic-rename -set -g mouse on -set -g history-limit 30000 -set -g terminal-overrides 'xterm*:smcup@:rmcup@' -set-option -g status-justify right -set-option -g status-bg black # colour213 # pink -set-option -g status-fg cyan -set-option -g status-interval 5 -set-option -g status-left-length 30 -set-option -g status-left '#[fg=magenta]» #[fg=blue,bold]#T#[default]' -set-option -g status-right '#[fg=red,bold][[ #(git branch) branch ]] #[fg=cyan]»» #[fg=blue,bold]###S #[fg=magenta]%R %m-%d#(acpi | cut -d ',' -f 2)#[default]' -set-option -g visual-activity on -set-option -g set-titles on -set-option -g set-titles-string '#H:#S.#I.#P #W #T' -unbind j -unbind C-b # unbind default leader key -unbind '"' # unbind horizontal split -unbind % # unbind vertical split -bind-key r source-file ~/.tmux.conf -bind-key c split-window -v # split pane horizontally -bind-key v split-window -h # split pane vertically -bind-key Space list-panes -bind-key Enter break-pane -bind-key Space command-prompt "joinp -t:%%" # %% = prompt for window.pane [-V|H] # vert|hor split -bind-key -n C-up prev -bind-key -n C-left prev -bind-key -n C-right next -bind-key -n C-down next -set-window-option -g window-status-current-style bg=red -bind C-j previous-window -bind C-k next-window -#bind-key C-a last-window # C-a C-a for last active window -bind A command-prompt "rename-window %%" -setw -g aggressive-resize on -bind-key h select-pane -L -bind-key j select-pane -D -bind-key k select-pane -U -bind-key l select-pane -R -bind-key -r C-h resize-pane -L -bind-key -r C-j resize-pane -D -bind-key -r C-k resize-pane -U -bind-key -r C-l resize-pane -R -bind o select-layout "active-only" -bind M-- select-layout "even-vertical" -bind M-| select-layout "even-horizontal" -bind M-r rotate-window diff --git a/.xinitrc b/.xinitrc index c83b782..fcc6419 100644 --- a/.xinitrc +++ b/.xinitrc @@ -1,9 +1,9 @@ #!/bin/sh #adding ressources -[ -f "$HOME/.xprofile" ] && . "$HOME/.xprofile" -[ -f "$HOME/.Xdefaults" ] && xrdb -merge "$HOME/.Xdefaults" -[ -f "$HOME/.Xpcspec" ] && xrdb -merge "$HOME/.Xpcspec" +[ -f "$HOME/.config/xorg/xprofile" ] && . "$HOME/.config/xorg/xprofile" +[ -f "$HOME/.config/xorg/Xdefaults" ] && xrdb -merge "$HOME/.config/xorg/Xdefaults" +[ -f "$HOME/.config/xorg/Xpcspec" ] && xrdb -merge "$HOME/.config/xorg/Xpcspec" xterm -geometry 80x24+10+10 -fn 10x20 diff --git a/.zshrc b/.zshrc deleted file mode 120000 index 7fd83ee..0000000 --- a/.zshrc +++ /dev/null @@ -1 +0,0 @@ -.config/zsh/zshrc \ No newline at end of file