diff --git a/README.md b/README.md index 7395e1a..a8825c7 100644 --- a/README.md +++ b/README.md @@ -19,10 +19,10 @@ My personal configurations, managed with the 'dotdrop' submodule. ## Requirements + App Launcher: `rofi` -+ Audio Control: `playerctl` ++ Audio Control: `playerctl and pactl` + Backlight: `light` + Bar: `polybar` -+ Browser: `firefox` with [minimal-fuctional-fox](https://github.com/mut-ex/minimal-functional-fox) and [nightTab](https://github.com/zombieFox/nightTab) ++ Browser: `firefox` + Filebrowser: `ranger` + Image-Viewer: `feh` + Locking: `i3lock-color` diff --git a/config.yaml b/config.yaml index 1ebac5e..17d4fdf 100644 --- a/config.yaml +++ b/config.yaml @@ -10,28 +10,25 @@ config: dotpath: dotfiles dotfiles: f_zshrc: - src: zsh/zshrc + src: zshrc dst: ~/.zshrc f_zshhighlighting: src: zsh-highlighting dst: ~/.zsh-highlighting f_vimrc: - src: vim/vimrc + src: vimrc dst: ~/.vimrc actions: - vundle-install - vundle-refresh f_xresources: - src: X11/Xresources + src: Xresources dst: ~/.Xresources - d_xresources_themes: - src: X11/Xresources.themes - dst: ~/.Xresources.themes f_i3: - src: i3/config + src: config/i3/config dst: ~/.config/i3/config f_i3status: - src: i3/i3status + src: config/i3/i3status dst: ~/.config/i3status/config d_fonts: src: fonts @@ -39,35 +36,35 @@ dotfiles: actions: - font-cache f_picom: - src: picom/picom.conf + src: config/picom.conf dst: ~/.config/picom.conf f_tmux: - src: tmux/tmux.conf + src: tmux.conf dst: ~/.tmux.conf d_tmux_themes: src: tmux/themes dst: ~/.tmux/themes d_polybar: - src: polybar + src: config/polybar dst: ~/.config/polybar - d_dunst: - src: dunst - dst: ~/.config/dunst - d_rofi: - src: rofi - dst: ~/.config/rofi + f_dunst: + src: config/dunst/dunstrc + dst: ~/.config/dunst/dunstrc + f_rofi: + src: config/rofi/config.rasi + dst: ~/.config/rofi/config.rasi d_ranger: - src: ranger + src: config/ranger dst: ~/.config/ranger f_dir_colors: - src: dir_colors/dir_colors + src: dir_colors dst: ~/.dir_colors d_scripts: src: scripts dst: ~/scripts - d_alacritty: - src: alacritty - dst: ~/.config/alacritty + f_alacritty: + src: config/alacritty/alacritty.yml + dst: ~/.config/alacritty/alacritty.yml profiles: laptop: @@ -125,7 +122,6 @@ profiles: x11: dotfiles: - f_xresources - - d_xresources_themes i3: dotfiles: - f_i3 @@ -139,16 +135,15 @@ profiles: tmux: dotfiles: - f_tmux - - d_tmux_themes polybar: dotfiles: - d_polybar dunst: dotfiles: - - d_dunst + - f_dunst rofi: dotfiles: - - d_rofi + - f_rofi ranger: dotfiles: - d_ranger @@ -160,4 +155,4 @@ profiles: - d_scripts alacritty: dotfiles: - - d_alacritty + - f_alacritty diff --git a/dotfiles/X11/Xresources b/dotfiles/X11/Xresources deleted file mode 100644 index 8d1fb88..0000000 --- a/dotfiles/X11/Xresources +++ /dev/null @@ -1,15 +0,0 @@ -! Colors -#include ".Xresources.themes/Xresources.nord" - -! Font -XTerm.vt100.faceName: xft:InconsolataLGC Nerd Font Mono:antialias=true -XTerm.vt100.faceSize: 11 - -! Remove Scrollbar -XTerm.vt100.scrollBar: false -Xterm.vt100.scrollBar.widht:1 - -! Resize Term Font -XTerm.vt100.translations: #override \n\ - Ctrl minus: smaller-vt-font() \n\ - Ctrl plus: larger-vt-font() diff --git a/dotfiles/X11/Xresources.themes/Xresources.nord b/dotfiles/X11/Xresources.themes/Xresources.nord deleted file mode 100644 index 916a0ff..0000000 --- a/dotfiles/X11/Xresources.themes/Xresources.nord +++ /dev/null @@ -1,47 +0,0 @@ -! Copyright (c) 2016-present Arctic Ice Studio -! Copyright (c) 2016-present Sven Greb - -! Project: Nord XResources -! Version: 0.1.0 -! Repository: https://github.com/arcticicestudio/nord-xresources -! License: MIT - -#define nord0 #2E3440 -#define nord1 #3B4252 -#define nord2 #434C5E -#define nord3 #4C566A -#define nord4 #D8DEE9 -#define nord5 #E5E9F0 -#define nord6 #ECEFF4 -#define nord7 #8FBCBB -#define nord8 #88C0D0 -#define nord9 #81A1C1 -#define nord10 #5E81AC -#define nord11 #BF616A -#define nord12 #D08770 -#define nord13 #EBCB8B -#define nord14 #A3BE8C -#define nord15 #B48EAD - -*.foreground: nord4 -*.background: nord0 -*.cursorColor: nord4 -*fading: 35 -*fadeColor: nord3 - -*.color0: nord1 -*.color1: nord11 -*.color2: nord14 -*.color3: nord13 -*.color4: nord9 -*.color5: nord15 -*.color6: nord8 -*.color7: nord5 -*.color8: nord3 -*.color9: nord11 -*.color10: nord14 -*.color11: nord13 -*.color12: nord9 -*.color13: nord15 -*.color14: nord7 -*.color15: nord6 diff --git a/dotfiles/Xresources b/dotfiles/Xresources new file mode 100644 index 0000000..2670f5c --- /dev/null +++ b/dotfiles/Xresources @@ -0,0 +1,60 @@ +! Font +XTerm.vt100.faceName: xft:InconsolataLGC Nerd Font Mono:antialias=true +XTerm.vt100.faceSize: 11 + +! Remove Scrollbar +XTerm.vt100.scrollBar: false +Xterm.vt100.scrollBar.widht:1 + +! Resize Term Font +XTerm.vt100.translations: #override \n\ + Ctrl minus: smaller-vt-font() \n\ + Ctrl plus: larger-vt-font() + +! Copyright (c) 2016-present Arctic Ice Studio +! ! Copyright (c) 2016-present Sven Greb +! +! ! Project: Nord XResources +! ! Version: 0.1.0 +! ! Repository: https://github.com/arcticicestudio/nord-xresources +! ! License: MIT +! +! #define nord0 #2E3440 +! #define nord1 #3B4252 +! #define nord2 #434C5E +! #define nord3 #4C566A +! #define nord4 #D8DEE9 +! #define nord5 #E5E9F0 +! #define nord6 #ECEFF4 +! #define nord7 #8FBCBB +! #define nord8 #88C0D0 +! #define nord9 #81A1C1 +! #define nord10 #5E81AC +! #define nord11 #BF616A +! #define nord12 #D08770 +! #define nord13 #EBCB8B +! #define nord14 #A3BE8C +! #define nord15 #B48EAD +! +! *.foreground: nord4 +! *.background: nord0 +! *.cursorColor: nord4 +! *fading: 35 +! *fadeColor: nord3 +! +! *.color0: nord1 +! *.color1: nord11 +! *.color2: nord14 +! *.color3: nord13 +! *.color4: nord9 +! *.color5: nord15 +! *.color6: nord8 +! *.color7: nord5 +! *.color8: nord3 +! *.color9: nord11 +! *.color10: nord14 +! *.color11: nord13 +! *.color12: nord9 +! *.color13: nord15 +! *.color14: nord7 +! *.color15: nord6 diff --git a/dotfiles/alacritty/alacritty.yml b/dotfiles/config/alacritty/alacritty.yml similarity index 100% rename from dotfiles/alacritty/alacritty.yml rename to dotfiles/config/alacritty/alacritty.yml diff --git a/dotfiles/dunst/dunstrc b/dotfiles/config/dunst/dunstrc similarity index 100% rename from dotfiles/dunst/dunstrc rename to dotfiles/config/dunst/dunstrc diff --git a/dotfiles/i3/config b/dotfiles/config/i3/config similarity index 100% rename from dotfiles/i3/config rename to dotfiles/config/i3/config diff --git a/dotfiles/i3/i3status b/dotfiles/config/i3/i3status similarity index 100% rename from dotfiles/i3/i3status rename to dotfiles/config/i3/i3status diff --git a/dotfiles/picom/picom.conf b/dotfiles/config/picom.conf similarity index 100% rename from dotfiles/picom/picom.conf rename to dotfiles/config/picom.conf diff --git a/dotfiles/polybar/config b/dotfiles/config/polybar/config similarity index 100% rename from dotfiles/polybar/config rename to dotfiles/config/polybar/config diff --git a/dotfiles/polybar/scripts/load.sh b/dotfiles/config/polybar/scripts/load.sh similarity index 100% rename from dotfiles/polybar/scripts/load.sh rename to dotfiles/config/polybar/scripts/load.sh diff --git a/dotfiles/polybar/scripts/spotify.sh b/dotfiles/config/polybar/scripts/spotify.sh similarity index 100% rename from dotfiles/polybar/scripts/spotify.sh rename to dotfiles/config/polybar/scripts/spotify.sh diff --git a/dotfiles/polybar/start.sh b/dotfiles/config/polybar/start.sh similarity index 100% rename from dotfiles/polybar/start.sh rename to dotfiles/config/polybar/start.sh diff --git a/dotfiles/ranger/plugins/devicons.py b/dotfiles/config/ranger/plugins/devicons.py similarity index 100% rename from dotfiles/ranger/plugins/devicons.py rename to dotfiles/config/ranger/plugins/devicons.py diff --git a/dotfiles/ranger/plugins/devicons_linemode.py b/dotfiles/config/ranger/plugins/devicons_linemode.py similarity index 100% rename from dotfiles/ranger/plugins/devicons_linemode.py rename to dotfiles/config/ranger/plugins/devicons_linemode.py diff --git a/dotfiles/ranger/rc.conf b/dotfiles/config/ranger/rc.conf similarity index 100% rename from dotfiles/ranger/rc.conf rename to dotfiles/config/ranger/rc.conf diff --git a/dotfiles/rofi/config.rasi b/dotfiles/config/rofi/config.rasi similarity index 100% rename from dotfiles/rofi/config.rasi rename to dotfiles/config/rofi/config.rasi diff --git a/dotfiles/dir_colors/dir_colors b/dotfiles/dir_colors similarity index 100% rename from dotfiles/dir_colors/dir_colors rename to dotfiles/dir_colors diff --git a/dotfiles/tmux/tmux.conf b/dotfiles/tmux.conf similarity index 100% rename from dotfiles/tmux/tmux.conf rename to dotfiles/tmux.conf diff --git a/dotfiles/vim/vimrc b/dotfiles/vimrc similarity index 100% rename from dotfiles/vim/vimrc rename to dotfiles/vimrc diff --git a/dotfiles/zsh/zshrc b/dotfiles/zshrc similarity index 100% rename from dotfiles/zsh/zshrc rename to dotfiles/zshrc