From 761064fd4f56f56b9fde9b0ee1a4e2ed26211de3 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Sun, 22 Jan 2017 18:30:19 +0100 Subject: [PATCH] Update README and firefox.css Signed-off-by: Tomas Slusny --- .gitmodules | 2 +- README.md | 34 +++++----------------------------- dotfiles/sxhkdrc | 2 +- dotfiles/zimrc | 2 +- dotfiles/zshrc | 5 +++++ lib/firefox/firefox.css | 37 ++++++++++++++++++++++--------------- lib/shell/zim | 2 +- 7 files changed, 36 insertions(+), 48 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4ae193bd..e0bbdf90 100644 --- a/.gitmodules +++ b/.gitmodules @@ -90,4 +90,4 @@ url = https://github.com/tmux-plugins/tmux-open [submodule "lib/shell/zim"] path = lib/shell/zim - url = https://github.com/deathbeam/zim + url = https://github.com/Eriner/zim/ diff --git a/README.md b/README.md index e1bf1c27..cca67abc 100644 --- a/README.md +++ b/README.md @@ -76,15 +76,7 @@ https://raw.githubusercontent.com/deathbeam/dotfiles/master/lib/firefox/firefox. ## How to update? -You can use - -``` -dottool --update -``` - -what was made exactly for this. It will fetch latest changes from remote, then runs rebase and at end run installation -script to update links and installed stuff. Or, if you want, you can use Git like this: - +You can just use Git: ```shell git -C $DOTHOME pull --rebase @@ -92,39 +84,23 @@ git -C $DOTHOME pull --rebase ## How to inlude your own stuff? -After you have installed dotfiles, you can start including your own stuff by using the `dottool --open` command: - -```shell -dottool --open bashrc -dottool --open vimrc -dottool --open tmux.conf -dottool --open gitconfig -``` - -or manually without helper: +After you have installed dotfiles, you can start including your own stuff by creating appropriate dotfiles in usr +directory: ```shell -vim $DOTHOME/usr/bashrc +vim $DOTHOME/usr/zshrc vim $DOTHOME/usr/vimrc vim $DOTHOME/usr/tmux.conf vim $DOTHOME/usr/gitconfig ``` -To add your own Vim plugin you can use `dottool --vim-plugin` command. For example to add +To add your own Vim plugin you can use clone it to proper directory. For example to add [SuperTab](https://github.com/ervandew/supertab), all you need to do is run this command: -```shell -dottool --vim-plugin https://github.com/ervandew/supertab.git -``` - -or you can do the same just with Git: - ```shell git clone https://github.com/ervandew/supertab.git $DOTHOME/usr/vim/supertab ``` -To see all helper commands, run `dottool --help`. - ## Included stuff ### Shell diff --git a/dotfiles/sxhkdrc b/dotfiles/sxhkdrc index 4ca13edd..4c356617 100644 --- a/dotfiles/sxhkdrc +++ b/dotfiles/sxhkdrc @@ -8,7 +8,7 @@ super + Return # program launcher super + space - st -c fzf-menu -g 80x15 -e bash -li -c 'nohup $(compgen -c | fzf --prompt "Run> " --bind "ctrl-x:print-query")' + st -c fzf-menu -g 80x15 -e zsh -li -c 'nohup $(print -lr -- $^path/*$^@*(N:t) | sort -u | fzf --prompt "Run> " --bind "ctrl-x:print-query")' # make sxhkd reload its configuration files: super + Escape diff --git a/dotfiles/zimrc b/dotfiles/zimrc index 151df4f5..219a0eaa 100644 --- a/dotfiles/zimrc +++ b/dotfiles/zimrc @@ -1,5 +1,5 @@ # Select what modules you would like enabled. -zmodules=(directory environment fasd git git-info history input utility meta \ +zmodules=(archive directory environment fasd git git-info history input utility \ syntax-highlighting history-substring-search prompt completion) # Set your desired prompt here diff --git a/dotfiles/zshrc b/dotfiles/zshrc index bad93838..e9ffa6cf 100644 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -31,6 +31,11 @@ $EDITOR --servername "$1" +Session +"ProjectOpen $1" } + # Super cool gource alias (requires gource) + alias gource="gource -1280x720 --key --stop-at-end -e 0.5 -c 1.7 -a 1 -r 60 -i 0 --highlight-dirs + --highlight-all-users --max-file-lag 0.5 --hide mouse,progress --camera-mode track --bloom-multiplier 1.7 + --bloom-intensity 1.2 --no-vsync" + # }}} # Plugins {{{ diff --git a/lib/firefox/firefox.css b/lib/firefox/firefox.css index 1feff8cc..37c889d3 100644 --- a/lib/firefox/firefox.css +++ b/lib/firefox/firefox.css @@ -18,15 +18,15 @@ --fg-light: #e8e8e8; --fg-dark: #e8e8e8; --tab-triangle-correction: -1px; --tab-height: 22px; --tab-icon-size: 10px; --tab-strip-margin: 0px -15px 0 -11px; --tab-overlap: -5px; - --tab-fonts: "Hack","Droid Sans","Source Sans Pro","Lemon",monospace,"Dejavu Sans"; --tab-font-size: 10pt; + --tab-fonts: "Terminus","Droid Sans","Source Sans Pro","Lemon",monospace,"Dejavu Sans"; --tab-font-size: 10pt; --tab-text-align: left; /* left | center | right */ --tab-triangle: block; /* block | none */ /* URL VARIABLES */ --url-background: var(--bg-light); --url-color: var(--fg-dark); --url-height: 22px; --url-right-margin: 6px; - --url-fonts: "Hack","Droid Sans", "Source Sans Pro", "Lemon",monospace,"Dejavu Sans"; --url-font-size: 10pt; - --url-text-align: center; /* left | center | right */ + --url-fonts: "Terminus","Droid Sans", "Source Sans Pro", "Lemon",monospace,"Dejavu Sans"; --url-font-size: 10pt; + --url-text-align: left; /* left | center | right */ --url-position: absolute; /* absolute == top (under tabs) || fixed == bottom of browser */ } @@ -53,6 +53,7 @@ position: var(--url-position) !important; bottom: 0 !important; width: 100% !important; height: var(--url-height) !important; margin: 0 !important; background: transparent !important; + border: none !important; } #nav-bar-customization-target, #urlbar-container, #urlbar { @@ -65,28 +66,26 @@ position: absolute !important; top: -1px !important; left: 0 !important; height: calc(100% - 1px) !important; /* (bottom margin - height switch +/- to fix line) */ } - #urlbar { - border: none !important; padding: 0 2px 0 8px !important; + #urlbar, .urlbar-textbox-container .urlbar-input-box .textbox-input { + border: none !important; + padding: 0px !important;; background: var(--url-background) !important; color: var(--url-color) !important; font-family: var(--url-fonts) !important; font-size: var(--url-font-size) !important; text-align: var(--url-text-align) !important; height: 100% !important; } - #urlbar * { -moz-appearance: none !important; } + #urlbar { + padding: 0 5px !important; + } + + #urlbar * { -moz-appearance: none !important; border: none !important; } .urlbar-textbox-container .urlbar-input-box .textbox-input { + margin-top: -2px !important;; height: var(--url-height) !important; } - /* --- Comment out the section below to make the url-bar visible --- */ - #nav-bar { - width: 0 !important; height: 0 !important; - position: fixed !important; left: -1px !important; top: -1px !important; - overflow: hidden !important; visibility: hidden !important; - } - /**/ - /* TABS */ .tabbrowser-tab[fadein]:not([pinned]) { min-width: 100px !important; max-width: /*180px*/ 100% !important; } tab { @@ -96,7 +95,10 @@ font-size: var(--tab-font-size); text-shadow: none !important; text-align: var(--tab-text-align) !important; } - .tabbrowser-tab label { padding: 0 10px 0 10px !important; } + .tabbrowser-tab label { + padding: 0 10px 0 10px !important; + text-align: var(--tab-text-align) !important; + } #tabbrowser-tabs .tabbrowser-tab[pinned] { width: 48px !important; } #tabbrowser-tabs .tabbrowser-tab[pinned] label { display: none !important; } @@ -201,6 +203,11 @@ img.decoded { background-color: transparent !important; } } +/* About:Blank background */ +@-moz-document url(about:home) { + html,body { background: var(--bg-light) !important; } +} + /* About:Blank background */ @-moz-document url(about:blank) { html,body { background: var(--bg-light) !important; } diff --git a/lib/shell/zim b/lib/shell/zim index d5536d60..61ff6019 160000 --- a/lib/shell/zim +++ b/lib/shell/zim @@ -1 +1 @@ -Subproject commit d5536d607f5c593e9f827ec005f3e09a486e65f3 +Subproject commit 61ff6019b10f659bf30a60b9da108f907a85e5d8