Compare commits
No commits in common. "086146f86477c5a9eff525894abdcad851881296" and "8a0aa9d07070635dceccea3ce450e290283bb0bb" have entirely different histories.
086146f864
...
8a0aa9d070
|
|
@ -3,8 +3,8 @@
|
|||
# packages, and another for any packages that come from AUR.
|
||||
|
||||
# This can be used as a reference, or to reinstall packages with:
|
||||
# `pacman -S --needed --noconfirm $(cat pacman.lst) and`
|
||||
# `yay -S --needed --noconfirm $(cat pacman_aur.lst)`
|
||||
# `cat pacman.lst | xargs pacman -S --needed --noconfirm` and
|
||||
# `cat pacman_aur.lst | xargs yay -S --needed --noconfirm`
|
||||
# (assuming yay is your AUR helper)
|
||||
|
||||
pacman -Qqe | grep -v "$(pacman -Qqm)" > pacman.lst
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
configuration {
|
||||
color-enabled: true;
|
||||
theme: "iceberg-dark";
|
||||
separator-style: "solid";
|
||||
sidebar-mode: false;
|
||||
separator-style: solid;
|
||||
sindebar-mode: false;
|
||||
lines: 5;
|
||||
font: "Source Code Pro Semibold 10.5";
|
||||
bw: 1;
|
||||
|
|
@ -1,2 +1,4 @@
|
|||
|
||||
file:///home/dtodd/dev dev
|
||||
file:///mnt/otdc otdc
|
||||
file:///mnt/erp erp
|
||||
file:///mnt/external external
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Frequently used programs
|
||||
bindsym $mod+Return exec --no-startup-id terminator
|
||||
bindsym $mod+Shift+Return exec --no-startup-id urxvt
|
||||
bindsym $mod+F2 exec --no-startup-id firefox
|
||||
bindsym $mod+F2 exec --no-startup-id google-chrome-stable
|
||||
bindsym $mod+F3 exec --no-startup-id pcmanfm
|
||||
bindsym $mod+F4 exec --no-startup-id code
|
||||
bindsym $mod+F6 exec --no-startup-id ~/bin/music_player
|
||||
|
|
|
|||
|
|
@ -193,17 +193,8 @@ assign [class="^Code"] $ws5
|
|||
# Begin i3-bar configuration
|
||||
|
||||
bar {
|
||||
position top
|
||||
height 18
|
||||
tray_padding 0
|
||||
#mode hide
|
||||
#workspace_buttons yes
|
||||
#tray_output DP-0
|
||||
#separator_symbol "|"
|
||||
|
||||
#status_command i3status -c ~/.config/i3/i3status.conf
|
||||
status_command i3blocks -c $i3_path/i3blocks.conf
|
||||
|
||||
# status_command i3status -c $i3_path/i3status.conf
|
||||
# status_command bumblebee-status \
|
||||
# -m \
|
||||
# disk:root \
|
||||
|
|
@ -233,18 +224,26 @@ bar {
|
|||
# iceberg-dark-powerline
|
||||
#
|
||||
|
||||
position top
|
||||
#mode hide
|
||||
#workspace_buttons yes
|
||||
#tray_output DP-0
|
||||
tray_padding 0
|
||||
#separator_symbol "|"
|
||||
|
||||
colors {
|
||||
background #161821
|
||||
statusline #c6c8d1
|
||||
separator #161821
|
||||
|
||||
# border backgr. text
|
||||
# border backgr. text
|
||||
focused_workspace #89b8c2 #89b8c2 #161821
|
||||
active_workspace #a093c7 #a093c7 #161821
|
||||
inactive_workspace #6b7089 #6b7089 #c6c8d1
|
||||
binding_mode #e2a478 #e2a478 #161821
|
||||
urgent_workspace #e27878 #e27878 #CB4B16
|
||||
}
|
||||
height 18
|
||||
}
|
||||
|
||||
# End i3-bar configuration
|
||||
|
|
@ -379,7 +378,7 @@ mode "resize" {
|
|||
# Frequently used programs
|
||||
bindsym $mod+Return exec --no-startup-id terminator
|
||||
bindsym $mod+Shift+Return exec --no-startup-id urxvt
|
||||
bindsym $mod+F2 exec --no-startup-id firefox
|
||||
bindsym $mod+F2 exec --no-startup-id google-chrome-stable
|
||||
bindsym $mod+F3 exec --no-startup-id pcmanfm
|
||||
bindsym $mod+F4 exec --no-startup-id code
|
||||
bindsym $mod+F6 exec --no-startup-id ~/bin/music_player
|
||||
|
|
@ -392,6 +391,12 @@ bindsym $mod+z exec --no-startup-id morc_menu
|
|||
bindsym $mod+d exec --no-startup-id rofi -show run
|
||||
bindsym $mod+Tab exec --no-startup-id rofi -show window
|
||||
|
||||
# Configuration Editor
|
||||
bindsym $mod+Ctrl+b exec --no-startup-id urxvt -e bmenu
|
||||
|
||||
# File Explorer
|
||||
bindsym $mod+n --release exec --no-startup-id urxvt -e nnn
|
||||
|
||||
# Force Kill program
|
||||
bindsym $mod+Ctrl+x --release exec --no-startup-id xkill
|
||||
|
||||
|
|
@ -404,11 +409,6 @@ bindsym $mod+p exec --no-startup-id i3lock-fancy -p
|
|||
# Toggle visibility of status bar
|
||||
bindsym $mod+m bar mode toggle
|
||||
|
||||
# music player control
|
||||
bindsym XF86AudioPlay exec --no-startup-id playerctl play-pause
|
||||
bindsym XF86AudioNext exec --no-startup-id playerctl next
|
||||
bindsym XF86AudioPrev exec --no-startup-id playerctl previous
|
||||
|
||||
# Screenshots
|
||||
# Selection
|
||||
bindsym Insert exec --no-startup-id maim -s ~/Pictures/$(date +%Y-%m-%d-%s).png
|
||||
|
|
@ -417,19 +417,24 @@ bindsym $mod+Insert exec --no-startup-id ~/bin/screenshotter.sh
|
|||
# Fullscreen
|
||||
bindsym $mod+Shift+Insert --release exec --no-startup-id maim ~/Pictures/$(date +%Y-%m-%d).png
|
||||
# Selection and Edit
|
||||
bindsym $mod+Ctrl+Insert exec --no-startup-id maim -s ~/Pictures/$(date +%Y-%m-%d-%M).png&& pinta ~/Pictures/$(date +%Y-%m-%d-%M).png
|
||||
bindsym $mod+Ctrl+Insert exec --no-startup-id maim -s ~/Pictures/$(date +%Y-%m-%d).png&& pinta ~/Pictures/$(date +%Y-%m-%d-%s).png
|
||||
|
||||
# Screen recording
|
||||
bindsym Shift+Print exec --no-startup-id ~/bin/screencast2gif.sh
|
||||
bindsym Print exec --no-startup-id "ffcast -q $(while slop -q -n -f '-g %g ';do :;done) rec ~/Videos/rec-%si-$(date +%Y-%m-%d-%s).mp4"
|
||||
bindsym $mod+Print exec --no-startup-id pkill -fxn '(/\S+)*ffmpeg\s.*\sx11grab\s.*'
|
||||
|
||||
# End keybind configuration
|
||||
# Configure applications to start once i3 has initialized
|
||||
|
||||
#exec --no-startup-id xfce4-panel --disable-wm-check
|
||||
#exec --no-startup-id stalonetray -c ~/.stalonetrayrc
|
||||
exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
|
||||
exec --no-startup-id xfce4-power-manager
|
||||
exec_always --no-startup-id fix_xcursor
|
||||
exec --no-startup-id nm-applet
|
||||
exec --no-startup-id xfce4-power-manager
|
||||
#exec --no-startup-id stalonetray
|
||||
exec --no-startup-id clipit
|
||||
# exec_always --no-startup-id ff-theme-util
|
||||
exec_always --no-startup-id fix_xcursor
|
||||
# exec --no-startup-id start_conky_mia
|
||||
|
||||
# Random wallpaper
|
||||
|
|
@ -440,7 +445,7 @@ exec --no-startup-id xautolock -time 10 -locker 'i3lock-fancy -p' &
|
|||
|
||||
# Composition Manager (Transparency)
|
||||
#exec --no-startup-id xcompmgr -c -f -n
|
||||
#exec --no-startup-id compton --config ~/.config/compton/compton.conf &
|
||||
#exec --no-startup-id compton --config ~/.config/compton.conf &
|
||||
|
||||
# Network Keyboard/Mouse/Clipboard
|
||||
#exec --no-startup-id synergy &
|
||||
|
|
|
|||
|
|
@ -25,20 +25,20 @@ export DISABLE_DOTFILES_UPDATE_PROMPT=false
|
|||
export UPDATE_DOTFILES_DAYS=13
|
||||
|
||||
# Whether or not to automatically connect to a TMUX session when opening the shell
|
||||
#export ENABLE_TMUXAC=false
|
||||
export ENABLE_TMUXAC=false
|
||||
|
||||
# If there is not an active tmux session, we probably want one
|
||||
# Otherwise, the shell will not open the session again (eg. opening tabs, new terminals)
|
||||
#if $(tmux list-sessions >> /dev/null 2>&1); then
|
||||
# export TMUXATT=true
|
||||
#else
|
||||
# export TMUXATT=false
|
||||
#fi
|
||||
if $(tmux list-sessions >> /dev/null 2>&1); then
|
||||
export TMUXATT=true
|
||||
else
|
||||
export TMUXATT=false
|
||||
fi
|
||||
|
||||
# Automatically attach tmux session "C0DE"
|
||||
#if [[ -z "$TMUX" && "$TMUXATT"==true && "$ENABLE_TMUXAC"==true ]]; then
|
||||
# tmux attach -t C0DE || tmux new -s C0DE
|
||||
#fi
|
||||
if [[ -z "$TMUX" && "$TMUXATT" && "$ENABLE_TMUXAC" ]]; then
|
||||
tmux attach -t C0DE || tmux new -s C0DE
|
||||
fi
|
||||
|
||||
# Enable shell-history for interactive shells
|
||||
# https://github.com/pawamoy/shell-history
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
gtk-icon-theme-name = "oomox-iceberg"
|
||||
gtk-theme-name = "oomox-iceberg"
|
||||
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
# FILE: iceberg.tmux.conf
|
||||
# REPO: https://github.com/gkeep/iceberg-dark
|
||||
# MAINTAINER: gkeep <gkeep77@protonmail.com>
|
||||
|
||||
set -g status-justify "centre"
|
||||
set -g status "on"
|
||||
set -g status-left-style "none"
|
||||
set -g message-command-style "fg=#c6c8d1,bg=#2e3244"
|
||||
set -g status-right-style "none"
|
||||
set -g pane-active-border-style "fg=#454b68"
|
||||
set -g status-style "none,bg=#1e2132"
|
||||
set -g message-style "fg=#c6c8d1,bg=#2e3244"
|
||||
set -g pane-border-style "fg=#2e3244"
|
||||
set -g status-right-length "100"
|
||||
set -g status-left-length "100"
|
||||
setw -g window-status-activity-style "none,fg=#454b68,bg=#1e2132"
|
||||
setw -g window-status-separator ""
|
||||
setw -g window-status-style "none,fg=#c6c8d1,bg=#1e2132"
|
||||
|
||||
# modules
|
||||
module_left_1="#(whoami)"
|
||||
module_left_2="%R %a"
|
||||
|
||||
module_right_1="#(ip route get 1 | awk '{print $7}')"
|
||||
module_right_2="#H"
|
||||
|
||||
# separators
|
||||
separator_left="\ue0bc"
|
||||
separator_right="\ue0ba"
|
||||
|
||||
subseparator_left="\ue0bb"
|
||||
subseparator_right="\ue0bd"
|
||||
|
||||
set -g status-left "#[fg=#c6c8d1,bg=#454b68,bold] $module_left_1 #[fg=#454b68,bg=#2e3244,nobold,nounderscore,noitalics]$separator_left#[fg=#c6c8d1,bg=#2e3244] $module_left_2 #[fg=#2e3244,bg=#1e2132,nobold,nounderscore,noitalics]$separator_left#[fg=#c6c8d1,bg=#1e2132] #[fg=#1e2132,bg=#1e2132,nobold,nounderscore,noitalics]$separator_left"
|
||||
set -g status-right "#[fg=#1e2132,bg=#1e2132,nobold,nounderscore,noitalics]$separator_right#[fg=#c6c8d1,bg=#1e2132] #[fg=#2e3244,bg=#1e2132,nobold,nounderscore,noitalics]$separator_right#[fg=#c6c8d1,bg=#2e3244] $module_right_1 #[fg=#454b68,bg=#2e3244,nobold,nounderscore,noitalics]$separator_right#[fg=#c6c8d1,bg=#454b68,bold] $module_right_2 #{prefix_highlight}"
|
||||
setw -g window-status-format "#[fg=#1e2132,bg=#1e2132,nobold,nounderscore,noitalics]$separator_right#[fg=#c6c8d1] #I $subseparator_right #W $subseparator_left#[fg=#1e2132,bg=#1e2132,nobold,nounderscore,noitalics]$separator_right"
|
||||
setw -g window-status-current-format "#[fg=#2e3244,bg=#1e2132,nobold,nounderscore,noitalics]$separator_right#[fg=#c6c8d1,bg=#2e3244] #I $subseparator_right #W $subseparator_left #F #[fg=#2e3244,bg=#1e2132,nobold,nounderscore,noitalics]$separator_left"
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
DF_PATH=${HOME}/dotfiles/home/.config/i3
|
||||
DF_PATH=${HOME}/dotfiles/.config/i3
|
||||
CONFIG_PATH=${DF_PATH}/conf.d
|
||||
DST_FILE=${DF_PATH}/config
|
||||
|
||||
|
|
|
|||
18
install.sh
18
install.sh
|
|
@ -63,11 +63,6 @@ fi
|
|||
echo "Installing user binary directory to ~/bin"
|
||||
symlink "${DF_HOME}/bin" "${HOME}/bin"
|
||||
|
||||
echo "Creating needed directories"
|
||||
mkdir -p "${HOME}/.tmux"
|
||||
mkdir -p "${HOME}/.vim/{autoload,bundle}"
|
||||
mkdir -p "${HOME}/dev"
|
||||
|
||||
echo "Linking Configuration files..."
|
||||
|
||||
# All the dotfiles that live in the home dir directly
|
||||
|
|
@ -79,15 +74,13 @@ symlink "${DF_HOME}/.dmrc" "${HOME}/.dmrc"
|
|||
symlink "${DF_HOME}/.environment" "${HOME}/.environment"
|
||||
symlink "${DF_HOME}/.functions" "${HOME}/.functions"
|
||||
symlink "${DF_HOME}/.gitconfig" "${HOME}/.gitconfig"
|
||||
symlink "${DF_HOME}/.gtkrc.mine" "${HOME}/.gtkrc.mine"
|
||||
symlink "${DF_HOME}/.stalonetrayrc" "${HOME}/.stalonetrayrc"
|
||||
symlink "${DF_HOME}/.tmux.conf" "${HOME}/.tmux.conf"
|
||||
symlink "${DF_HOME}/.tmux/iceberg.tmux.conf" "${HOME}/.tmux/iceberg.tmux.conf"
|
||||
symlink "${DF_HOME}/.vimrc" "${HOME}/.vimrc"
|
||||
symlink "${DF_HOME}/.zshrc" "${HOME}/.zshrc"
|
||||
|
||||
# Install ~/.config stuff
|
||||
symlink "${DF_CONFIG}/rofi" "${HOME}/.config/rofi"
|
||||
symlink "${DF_CONFIG}/.rofi" "${HOME}/.config/.rofi"
|
||||
symlink "${DF_CONFIG}/compton" "${HOME}/.config/compton"
|
||||
symlink "${DF_CONFIG}/dunst" "${HOME}/.config/dunst"
|
||||
symlink "${DF_CONFIG}/gtk-2.0" "${HOME}/.config/gtk-2.0"
|
||||
|
|
@ -104,8 +97,8 @@ symlink "${DF_CONFIG}/mimeapps.list" "${HOME}/.config/mimeapps.list"
|
|||
symlink "${DF_CONFIG}/Code/User/settings.json" "${HOME}/.config/Code/User/settings.json"
|
||||
|
||||
echo "Installing Iceberg GTK theme and Icon pack..."
|
||||
symlink "${DF_HOME}/.themes/oomox-iceberg" "${HOME}/.themes/oomox-iceberg"
|
||||
symlink "${DF_HOME}/.icons/oomox-iceberg" "${HOME}/.icons/oomox-iceberg"
|
||||
symlink "${DOTFILES}/.themes/oomox-iceberg" "${HOME}/.themes/oomox-iceberg"
|
||||
symlink "${DOTFILES}/.icons/oomox-iceberg" "${HOME}/.icons/oomox-iceberg"
|
||||
|
||||
echo "Building i3 configuration..."
|
||||
"${DF_HOME}/bin/build-i3-config"
|
||||
|
|
@ -116,10 +109,11 @@ chsh -s /usr/bin/zsh
|
|||
echo "Installing Oh-My-ZSH..."
|
||||
CHSH='no' RUNZSH='no' KEEP_ZSHRC='yes' sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
|
||||
|
||||
#echo "Installing VSCode Extensions..."
|
||||
#cat "${DOTFILES}/vs_code_extensions.lst" | xargs -n 1 code --install-extension --force
|
||||
echo "Installing VSCode Extensions..."
|
||||
cat "${DOTFILES}/vs_code_extensions.lst" | xargs -n 1 code --install-extension --force
|
||||
|
||||
echo "Installing VIM Pathogen..."
|
||||
mkdir -p "${HOME}/.vim/{autoload,bundle}"
|
||||
curl -LSs https://tpo.pe/pathogen.vim -o "${HOME}/.vim/autoload/pathogen.vim"
|
||||
|
||||
echo "Installing VIM Sensible..."
|
||||
|
|
|
|||
14
pacman.lst
14
pacman.lst
|
|
@ -10,6 +10,7 @@ apparmor
|
|||
arandr
|
||||
arm-none-eabi-gcc
|
||||
artwork-i3
|
||||
asciidoc
|
||||
audacity
|
||||
autoconf
|
||||
autoconf-archive
|
||||
|
|
@ -26,7 +27,6 @@ binwalk
|
|||
bison
|
||||
blueman
|
||||
bluez-utils
|
||||
bmenu
|
||||
bmon
|
||||
btrfs-progs
|
||||
bzip2
|
||||
|
|
@ -43,13 +43,11 @@ cronie
|
|||
cryptsetup
|
||||
debootstrap
|
||||
deja-dup
|
||||
deluge
|
||||
device-mapper
|
||||
dfc
|
||||
dhclient
|
||||
dhcpcd
|
||||
diffutils
|
||||
discord
|
||||
dmidecode
|
||||
dmraid
|
||||
dnsmasq
|
||||
|
|
@ -103,7 +101,6 @@ gst-plugins-base
|
|||
gst-plugins-good
|
||||
gst-plugins-ugly
|
||||
gstreamer
|
||||
gtk-chtheme
|
||||
gtksourceview-pkgbuild
|
||||
gufw
|
||||
gvfs
|
||||
|
|
@ -113,7 +110,6 @@ gvfs-mtp
|
|||
gvfs-smb
|
||||
gvim
|
||||
gzip
|
||||
hexchat
|
||||
htop
|
||||
hw-probe
|
||||
i3blocks
|
||||
|
|
@ -144,7 +140,8 @@ libva-vdpau-driver
|
|||
licenses
|
||||
lightdm-settings
|
||||
lightdm-slick-greeter
|
||||
linux59
|
||||
linux54
|
||||
linux54-headers
|
||||
logrotate
|
||||
lvm2
|
||||
lxappearance
|
||||
|
|
@ -167,7 +164,6 @@ manjaro-ranger-settings
|
|||
manjaro-release
|
||||
manjaro-settings-manager-notifier
|
||||
manjaro-system
|
||||
manjaro-zsh-config
|
||||
mariadb
|
||||
markdown_previewer
|
||||
matcha-gtk-theme
|
||||
|
|
@ -257,8 +253,6 @@ spectre-meltdown-checker
|
|||
speedtest-cli
|
||||
sqlitebrowser
|
||||
stalonetray
|
||||
steam-manjaro
|
||||
steam-native
|
||||
strace
|
||||
subversion
|
||||
sudo
|
||||
|
|
@ -280,6 +274,7 @@ tlp
|
|||
tmux
|
||||
traceroute
|
||||
tree
|
||||
ttf-bitstream-vera
|
||||
ttf-dejavu
|
||||
ttf-droid
|
||||
ttf-inconsolata
|
||||
|
|
@ -347,3 +342,4 @@ yubikey-manager-qt
|
|||
yubikey-personalization-gui
|
||||
yubioath-desktop
|
||||
zensu
|
||||
zsh
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ gprof2dot
|
|||
i3-layout-manager-git
|
||||
i3ipc-python-git
|
||||
i3lock-fancy-git
|
||||
js60
|
||||
mhwd-nvidia-340xx
|
||||
minecraft
|
||||
ninja-bin
|
||||
|
|
@ -20,6 +21,8 @@ open-fuse-iso
|
|||
openwsman
|
||||
pangox-compat
|
||||
perl-uuid
|
||||
python-emoji
|
||||
python2-pytoml
|
||||
qdirstat
|
||||
remmina-plugin-rdesktop
|
||||
rustscan
|
||||
|
|
@ -29,11 +32,9 @@ step-ca-bin
|
|||
step-cli-bin
|
||||
surf
|
||||
symlinks
|
||||
ttf-adobe-source-fonts
|
||||
ttf-font-awesome-4
|
||||
ttf-symbola
|
||||
vi-vim-symlink
|
||||
visual-studio-code-bin
|
||||
wireguard-go-git
|
||||
wsmancli
|
||||
xcwd-git
|
||||
xdg-su
|
||||
|
|
|
|||
Loading…
Reference in New Issue