diff --git a/README.org b/README.org index b834168..b2450d4 100644 --- a/README.org +++ b/README.org @@ -2,55 +2,19 @@ dots for my lenovo yoga slim 7i pro 「itomori」, managed with =gnu stow=. -Files can be =stow='ed and un'=stow='-ed with =stow.sh=. +Files can be =stow='ed and un'=stow='ed with =stow.sh=. It will link all dotfiles to their correct place. -[[./screen.png]] +* dotfiles +All files in =files/= are currently being used and =stow='ed. +Configuration for my =i3= are found in =tiling-wm=. -* colors -** main -+ fg: #5c6773 -+ bg: #ffffff -** colorful -+ red: #FF3333 -+ green: #A6CC70 -+ yellow: #e7c547 -+ blue: #55b4d4 -+ magenta: #A37ACC -+ cyan: #95E6CB -** custom ui colors -+ dark bg alt: #222222 -+ light bg alt: #eeeeee +* fonts +Should be installed manually or via system package manager. +Fallsback are provided in =fallback-fonts/= ++ JuliaMono (Regular, Italic) ++ Noto Sans CJK JP ++ Noto Color Emoji -* an incomplete list of dependencies: -** main environment -+ emacs 💜 -+ i3-gaps -+ alacritty -+ zsh -+ dunst -+ polybar -+ rofi -+ xlock -** main programs -+ discord -+ spotify -+ seafile-applet -+ keepassxc -+ okular -** control stuff -+ [[https://github.com/bulletmark/libinput-gestures][libinput-gestures]] -+ pactl -+ playerctl -+ light -+ feh -+ nm-applet -+ xdotool -+ wmctrl -+ redshift-gtk -** special stuff +* legacy packages + fcitx5 (=fcitx5 fcitx5-configtool fcitx5-gtk fcitx5-mozc fcitx5-qt=) -+ hunspell-de (=hunspell-en= should be installed) -** GTK theming -+ papirus icons -+ materia gtk theme diff --git a/fallback-fonts/JuliaMono-Regular.ttf b/fallback-fonts/JuliaMono-Regular.ttf new file mode 100644 index 0000000..8e59854 Binary files /dev/null and b/fallback-fonts/JuliaMono-Regular.ttf differ diff --git a/fallback-fonts/JuliaMono-RegularItalic.ttf b/fallback-fonts/JuliaMono-RegularItalic.ttf new file mode 100644 index 0000000..2751af0 Binary files /dev/null and b/fallback-fonts/JuliaMono-RegularItalic.ttf differ diff --git a/fonts/NotoSansCJK-Regular.ttc b/fallback-fonts/NotoSansCJK-Regular.ttc similarity index 100% rename from fonts/NotoSansCJK-Regular.ttc rename to fallback-fonts/NotoSansCJK-Regular.ttc diff --git a/fonts/Roboto-Regular.ttf b/fallback-fonts/Roboto-Regular.ttf similarity index 100% rename from fonts/Roboto-Regular.ttf rename to fallback-fonts/Roboto-Regular.ttf diff --git a/fonts/fontawesome.ttf b/fallback-fonts/fontawesome.ttf similarity index 100% rename from fonts/fontawesome.ttf rename to fallback-fonts/fontawesome.ttf diff --git a/files/emacs/.emacs.d/init.org b/files/emacs/.emacs.d/init.org index 34328af..6185267 100644 --- a/files/emacs/.emacs.d/init.org +++ b/files/emacs/.emacs.d/init.org @@ -12,9 +12,9 @@ to =~/.emacs.d=). This file replaces itself with the actual configuration at first run. #+BEGIN_SRC emacs-lisp :tangle no (require 'org) -(find-file (concat (getenv "HOME") "/dots/files/emacs/.emacs.d/init.org")) +(find-file (concat (getenv "HOME") "/.dots/files/emacs/.emacs.d/init.org")) (org-babel-tangle) -(load-file (concat (getenv "HOME") "/dots/files/emacs/.emacs.d/init.el")) +(load-file (concat (getenv "HOME") "/.dots/files/emacs/.emacs.d/init.el")) #+END_SRC It tangles the org-file, so that this file is overwritten with the actual @@ -53,7 +53,7 @@ the =after-save-hook= ensuring to always tangle and byte-compile the #+BEGIN_SRC emacs-lisp :tangle yes (defun tangle-init () (when (equal (buffer-file-name) - (expand-file-name (concat (getenv "HOME") "/dots/files/emacs/.emacs.d/init.org"))) + (expand-file-name (concat (getenv "HOME") "/.dots/files/emacs/.emacs.d/init.org"))) ;; Avoid running hooks when tangling. (let ((prog-mode-hook nil)) (org-babel-tangle)))) @@ -247,7 +247,7 @@ I mainly use these fonts: + Noto Emoji to show emojis in emacs + Noto JP for japanese characters #+begin_src emacs-lisp :tangle yes -(set-face-attribute 'default nil :font "JuliaMono" :height 110) +(set-face-attribute 'default nil :font "JuliaMono" :height 80) (set-fontset-font t 'unicode "Noto Color Emoji" nil 'prepend) (set-fontset-font t 'unicode "Noto Sans Mono CJK JP" nil 'append) #+end_src @@ -308,7 +308,7 @@ Show me both line and column counter in my bar. *** Theme -Setting my beloved =ayu= light theme with some icons. +Setting my beloved light theme with some icons. #+begin_src emacs-lisp :tangle yes (use-package doom-themes :straight (doom-themes :type git :host github :repo "hlissner/emacs-doom-themes" @@ -316,9 +316,8 @@ Setting my beloved =ayu= light theme with some icons. :config (setq doom-themes-enable-bold t doom-themes-enable-italic t - doom-ayu-light-brighter-comments t - doom-ayu-light-padded-modeline t) - (load-theme 'doom-ayu-light t) + doom-solarized-light-padded-modeline t) + (load-theme 'doom-solarized-light t) (doom-themes-org-config) (doom-themes-treemacs-config)) #+end_src @@ -331,7 +330,8 @@ Use =doom-modeline= as a bar... together with icons and nyan cat! :config (doom-modeline-mode 1) (setq doom-modeline-indent-info t - doom-modeline-buffer-file-name-style 'file-name)) + doom-modeline-buffer-file-name-style 'file-name + doom-modeline-height 10)) (use-package all-the-icons :straight t) @@ -341,6 +341,7 @@ Use =doom-modeline= as a bar... together with icons and nyan cat! :init (nyan-mode) (nyan-start-animation) + (nyan-toggle-wavy-trail) :config (setq nyan-cat-face-number 4)) #+end_src @@ -410,7 +411,7 @@ Sometimes I want to see all of my files. treemacs-recenter-after-tag-follow t treemacs-tag-follow-delay 1) (treemacs-follow-mode t) - (treemacs-load-theme "Default") + (treemacs-load-theme "doom-colors") (dolist (face '(treemacs-root-face treemacs-git-unmodified-face treemacs-git-modified-face diff --git a/files/environment/.config/environment.d/envvars.conf b/files/environment/.config/environment.d/envvars.conf new file mode 100644 index 0000000..18fde90 --- /dev/null +++ b/files/environment/.config/environment.d/envvars.conf @@ -0,0 +1,3 @@ +PATH=$PATH:$HOME/.dots/scripts:$HOME/.cargo/bin:$HOME/.ghcup/bin:$HOME/.local/bin +EDITOR=vim +VISUAL=vim diff --git a/files/vim/.vimrc b/files/vim/.vimrc index 8f4092a..33a4d6c 100644 --- a/files/vim/.vimrc +++ b/files/vim/.vimrc @@ -18,16 +18,15 @@ endif call plug#begin() -Plug 'ayu-theme/ayu-vim' " color scheme +Plug 'altercation/vim-colors-solarized' " color scheme Plug 'tpope/vim-sleuth' " heuristic file indendation Plug 'jiangmiao/auto-pairs' " pair completion call plug#end() " ============================== Colors syntax on -let ayucolor="light" -colorscheme ayu -set termguicolors +set background=light +colorscheme solarized hi Normal guibg=NONE ctermbg=NONE " ============================== General diff --git a/files/x11/.Xresources b/files/x11/.Xresources deleted file mode 100644 index e088e5e..0000000 --- a/files/x11/.Xresources +++ /dev/null @@ -1,41 +0,0 @@ -Xft.dpi: 140 - -! Font -XTerm.vt100.faceName: xft:JuliaMono:antialias=true -XTerm.vt100.faceSize: 10 - -! Remove Scrollbar -XTerm.vt100.scrollBar: false - -! Resize Term Font -XTerm.vt100.translations: #override \n\ - Ctrl minus: smaller-vt-font() \n\ - Ctrl plus: larger-vt-font() - -! colors -*background: #fafafa -*foreground: #5c6773 -! Black + DarkGrey -*color0: #000000 -*color8: #686868 -! DarkRed + Red -*color1: #ff3333 -*color9: #f27983 -! DarkGreen + Green -*color2: #a6cc70 -*color10: #bae67e -! DarkYellow + Yellow -*color3: #e7c547 -*color11: #ffcc66 -! DarkBlue + Blue -*color4: #55b4d4 -*color12: #5ccfe6 -! DarkMagenta + Magenta -*color5: #a37acc -*color13: #d4bfff -! DarkCyan + Cyan -*color6: #95e6cb -*color14: #95e6cb -! LightGrey + White -*color7: #c7c7c7 -*color15: #ffffff diff --git a/files/zsh/.zshrc b/files/zsh/.zshrc index d2821ec..7a883ff 100644 --- a/files/zsh/.zshrc +++ b/files/zsh/.zshrc @@ -23,22 +23,22 @@ GIT="%{$fg[red]%}\$vcs_info_msg_0_" NAME="%B%{$fg[yellow]%}%m%b " # fi -case $TERM in - (*xterm* | rxvt | alacritty) + case $TERM in + (*xterm* | rxvt | alacritty) - # Write some info to terminal title. - # This is seen when the shell prompts for input. - function precmd { - print -Pn "\e]0;%(1j,%j job%(2j|s|) - ,)%~ - $TERM\a" - } - # Write command and arguments to terminal title. - # This is seen while the shell waits for a command to complete. - function preexec { - printf "\033]0;%s\a" "$1 - $TERM" - } + # Write some info to terminal title. + # This is seen when the shell prompts for input. + function precmd { + print -Pn "\e]0;%(1j,%j job%(2j|s|) - ,)%~\a" + } + # Write command and arguments to terminal title. + # This is seen while the shell waits for a command to complete. + function preexec { + printf "\033]0;%s\a" "$1" + } - ;; -esac + ;; + esac export PROMPT="${NAME}${DIR}${GIT} ${ICON}%{$reset_color%} " zstyle ':vcs_info:git:*' formats '|%b ' @@ -122,10 +122,10 @@ export FZF_DEFAULT_OPTS=' --layout=reverse --bind=tab:down --bind=btab:up - --color=fg:#575f66,bg:#ffffff,hl:#a6cc70 - --color=fg+:#575f66,bg+:#ffffff,hl+:#a6cc70 - --color=info:#575f66,prompt:#575f66,pointer:#575f66 - --color=marker:#575f66,spinner:#575f66,header:#575f66' + --color=fg:#657B83,bg:#FDF6E3,hl:#859900 + --color=fg+:#657B83,bg+:#FDF6E3,hl+:#859900 + --color=info:#657B83,prompt:#657B83,pointer:#657B83 + --color=marker:#657B83,spinner:#657B83,header:#657B83' ## fzf Bindings in zsh (C-r and C-t) if [[ -x $(which fzf 2> /dev/null) ]] diff --git a/fonts/JuliaMono-Regular.ttf b/fonts/JuliaMono-Regular.ttf deleted file mode 100644 index 207f1f7..0000000 Binary files a/fonts/JuliaMono-Regular.ttf and /dev/null differ diff --git a/screen.png b/screen.png deleted file mode 100644 index 58db1e3..0000000 Binary files a/screen.png and /dev/null differ diff --git a/scripts/laptop/monitor.sh b/scripts/laptop/monitor.sh index 95d6bdb..0920590 100755 --- a/scripts/laptop/monitor.sh +++ b/scripts/laptop/monitor.sh @@ -24,4 +24,4 @@ if [ "$(hostname)" = "itomori" ]; then fi # reload wallpaper etc -$HOME/dots/scripts/reload_desktop.sh +$HOME/.dots/scripts/reload_desktop.sh diff --git a/scripts/reload_desktop.sh b/scripts/reload_desktop.sh index 5625af1..05de011 100755 --- a/scripts/reload_desktop.sh +++ b/scripts/reload_desktop.sh @@ -6,7 +6,7 @@ systemctl restart --user dunst # bar killall -q polybar while pgrep -u $UID -x polybar > /dev/null; do sleep 1; done -$HOME/dots/scripts/polybar/polybar.sh +$HOME/.dots/scripts/polybar/polybar.sh # wallpaper feh --bg-fill $HOME/data/Seafile/images/wallpaper/wallpaper.png diff --git a/stow.sh b/stow.sh index c962347..1d2ed24 100755 --- a/stow.sh +++ b/stow.sh @@ -3,7 +3,7 @@ FILES_DIR=$PWD/files OPTS=$1 -echo "You are about to stow all config files and fonts." +echo "You are about to stow all config files." echo "Do you want to proceed? [y]" read proceed @@ -16,8 +16,3 @@ echo "Stowing configs..." cd $FILES_DIR stow ${OPTS} -v --ignore="init.org" --target="$HOME" * echo "Done!" - -echo "Stowing fonts..." -cd ../ -stow ${OPTS} -v --target="$HOME/.local/share/fonts" fonts -echo "Done!" diff --git a/files/alacritty/.config/alacritty/alacritty.yml b/tiling-wm/alacritty/.config/alacritty/alacritty.yml similarity index 55% rename from files/alacritty/.config/alacritty/alacritty.yml rename to tiling-wm/alacritty/.config/alacritty/alacritty.yml index b9478fa..deea76e 100644 --- a/files/alacritty/.config/alacritty/alacritty.yml +++ b/tiling-wm/alacritty/.config/alacritty/alacritty.yml @@ -24,30 +24,56 @@ font: family: JuliaMono style: Regular +# # Ayu light +# colors: +# primary: +# background: '#ffffff' +# foreground: '#5c6773' +# +# normal: +# black: '#000000' +# red: '#FF3333' +# green: '#A6CC70' +# yellow: '#e7c547' +# blue: '#55b4d4' +# magenta: '#A37ACC' +# cyan: '#95E6CB' +# white: '#C7C7C7' +# +# bright: +# black: '#686868' +# red: '#F27983' +# green: '#BAE67E' +# yellow: '#FFCC66' +# blue: '#5CCFE6' +# magenta: '#D4BFFF' +# cyan: '#95E6CB' +# white: '#FFFFFF' + colors: primary: - background: '#ffffff' - foreground: '#5c6773' + background: '0xfdf6e3' + foreground: '0x586e75' normal: - black: '#000000' - red: '#FF3333' - green: '#A6CC70' - yellow: '#e7c547' - blue: '#55b4d4' - magenta: '#A37ACC' - cyan: '#95E6CB' - white: '#C7C7C7' + black: '0x073642' + red: '0xdc322f' + green: '0x859900' + yellow: '0xb58900' + blue: '0x268bd2' + magenta: '0xd33682' + cyan: '0x2aa198' + white: '0xeee8d5' bright: - black: '#686868' - red: '#F27983' - green: '#BAE67E' - yellow: '#FFCC66' - blue: '#5CCFE6' - magenta: '#D4BFFF' - cyan: '#95E6CB' - white: '#FFFFFF' + black: '0x002b36' + red: '0xcb4b16' + green: '0x586e75' + yellow: '0x657b83' + blue: '0x839496' + magenta: '0x6c71c4' + cyan: '0x93a1a1' + white: '0xfdf6e3' background_opacity: 1 diff --git a/files/dunst/.config/dunst/dunstrc b/tiling-wm/dunst/.config/dunst/dunstrc similarity index 95% rename from files/dunst/.config/dunst/dunstrc rename to tiling-wm/dunst/.config/dunst/dunstrc index b3b9f89..71e7f79 100644 --- a/files/dunst/.config/dunst/dunstrc +++ b/tiling-wm/dunst/.config/dunst/dunstrc @@ -59,12 +59,12 @@ [urgency_low] background="#222222" foreground="#ffffff" - timeout = 3 + timeout = 5 [urgency_normal] - background="#333333" + background="#222222" foreground="#ffffff" - timeout = 3 + timeout = 5 [urgency_critical] background="#222222" diff --git a/files/i3/.config/i3/config b/tiling-wm/i3/.config/i3/config similarity index 98% rename from files/i3/.config/i3/config rename to tiling-wm/i3/.config/i3/config index dbcca4e..aedac92 100644 --- a/files/i3/.config/i3/config +++ b/tiling-wm/i3/.config/i3/config @@ -124,10 +124,7 @@ set $white "#ffffff" set $fg "#5c6773" set $black "#222222" set $grey "#eeeeee" -set $green "#a6cc70" set $red "#ff3333" -set $blue "#55b4d4" -set $yellow "#e7c547" # class border backgr. text indicator child_border client.focused $black $black $white $grey $grey diff --git a/files/libinput/.config/libinput-gestures.conf b/tiling-wm/libinput/.config/libinput-gestures.conf similarity index 100% rename from files/libinput/.config/libinput-gestures.conf rename to tiling-wm/libinput/.config/libinput-gestures.conf diff --git a/files/polybar/.config/polybar/config b/tiling-wm/polybar/.config/polybar/config similarity index 97% rename from files/polybar/.config/polybar/config rename to tiling-wm/polybar/.config/polybar/config index 8f8b9a7..469a2a6 100644 --- a/files/polybar/.config/polybar/config +++ b/tiling-wm/polybar/.config/polybar/config @@ -41,8 +41,8 @@ padding = 3 module-margin = 3 modules-left = logo i3 polywins -modules-center = -modules-right = spotify backlight conservation battery date +modules-center = date +modules-right = spotify backlight conservation battery [module/i3] strip-wsnumbers = true @@ -149,6 +149,8 @@ label = %percentage%% # ramp-1 =  ramp-0 =  +enable-scroll = true + [module/polywins] type = custom/script exec = ~/dots/scripts/polybar/polywins.sh 2>/dev/null diff --git a/files/rofi/.config/rofi/config.rasi b/tiling-wm/rofi/.config/rofi/config.rasi similarity index 100% rename from files/rofi/.config/rofi/config.rasi rename to tiling-wm/rofi/.config/rofi/config.rasi diff --git a/files/rofi/.config/rofi/confirm.rasi b/tiling-wm/rofi/.config/rofi/confirm.rasi similarity index 100% rename from files/rofi/.config/rofi/confirm.rasi rename to tiling-wm/rofi/.config/rofi/confirm.rasi diff --git a/files/tmux/.tmux.conf b/tiling-wm/tmux/.tmux.conf similarity index 82% rename from files/tmux/.tmux.conf rename to tiling-wm/tmux/.tmux.conf index 2663e2b..f68124a 100644 --- a/files/tmux/.tmux.conf +++ b/tiling-wm/tmux/.tmux.conf @@ -25,7 +25,7 @@ bind-key r source-file ~/.tmux.conf set-window-option -g window-status-current-format "[#I:#W]" set-window-option -g window-status-format "#I:#W" -set-window-option -g window-status-current-style fg="#A6CC70",bg="#fafafa",bold +set-window-option -g window-status-current-style fg="#586e75",bg="#fdf6e3",bold -set -g status-bg "#fafafa" -set -g status-fg "#49535f" +set -g status-bg "#fdf6e3" +set -g status-fg "#586e75" diff --git a/tiling-wm/x11/.Xresources b/tiling-wm/x11/.Xresources new file mode 100644 index 0000000..e5d243d --- /dev/null +++ b/tiling-wm/x11/.Xresources @@ -0,0 +1,69 @@ +! Font +XTerm.vt100.faceName: xft:JuliaMono:antialias=true +XTerm.vt100.faceSize: 10 + +! Remove Scrollbar +XTerm.vt100.scrollBar: false + +! Resize Term Font +XTerm.vt100.translations: #override \n\ + Ctrl minus: smaller-vt-font() \n\ + Ctrl plus: larger-vt-font() + +! solarized light colors +#define S_base03 #002b36 +#define S_base02 #073642 +#define S_base01 #586e75 +#define S_base00 #657b83 +#define S_base0 #839496 +#define S_base1 #93a1a1 +#define S_base2 #eee8d5 +#define S_base3 #fdf6e3 + +*background: S_base3 +*foreground: S_base00 +*fadeColor: S_base3 +*cursorColor: S_base01 +*pointerColorBackground:S_base1 +*pointerColorForeground:S_base01 + +#define S_yellow #b58900 +#define S_orange #cb4b16 +#define S_red #dc322f +#define S_magenta #d33682 +#define S_violet #6c71c4 +#define S_blue #268bd2 +#define S_cyan #2aa198 +#define S_green #859900 + +!! black dark/light +*color0: S_base02 +*color8: S_base03 + +!! red dark/light +*color1: S_red +*color9: S_orange + +!! green dark/light +*color2: S_green +*color10: S_base01 + +!! yellow dark/light +*color3: S_yellow +*color11: S_base00 + +!! blue dark/light +*color4: S_blue +*color12: S_base0 + +!! magenta dark/light +*color5: S_magenta +*color13: S_violet + +!! cyan dark/light +*color6: S_cyan +*color14: S_base1 + +!! white dark/light +*color7: S_base2 +*color15: S_base3 diff --git a/files/x11/.profile b/tiling-wm/x11/.profile similarity index 52% rename from files/x11/.profile rename to tiling-wm/x11/.profile index 61d3afe..9c11620 100755 --- a/files/x11/.profile +++ b/tiling-wm/x11/.profile @@ -3,10 +3,11 @@ # set xresources xrdb -merge $HOME/.Xresources -# map CAPS to ~ +# keyboard setxkbmap eu -setxkbmap -option caps:none -xmodmap -e "keycode 66 = grave asciitilde" +# setxkbmap -option caps:none +# xmodmap -e "keycode 66 = grave asciitilde" +setxkbmap -option caps:swapescape # energy options xset s off @@ -20,19 +21,15 @@ xset r rate 300 50 xset m 1 # path -export PATH=$PATH:$HOME/dots/scripts:$HOME/.cargo/bin:$HOME/.cabal/bin:$HOME/.ghcup/bin:$HOME/.local/bin +export PATH=$PATH:$HOME/.dots/scripts:$HOME/.cargo/bin:$HOME/.cabal/bin:$HOME/.ghcup/bin:$HOME/.local/bin # editor -export EDITOR="nvim" +export EDITOR="vim" export VISIAL=${EDITOR} -# anthy +# fcitx export GTK_IM_MODULE='xim' export QT_IM_MODULE='ibus' export SDL_IM_MODULE='ibus' export XMODIFIERS='@im=ibus' export WINIT_UNIX_BACKEND=x11 - -# ssh agent - requires gnome keyring -# eval $(systemctl --user show-environment | grep SSH_AUTH_SOCK) -# export SSH_AUTH_SOCK