marcothms/dotfiles
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleared a lot of things

Browse Source
This commit is contained in:
CramMK
2020-02-07 16:55:43 +01:00
parent 5a88229f85
commit c0018032aa
15 changed files with 236 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -10,6 +10,6 @@ My personal configurations, managed with the 'dotdrop' submodule
| Shell | zsh with oh-my-zsh |
| WM | i3 |
| Terminal | xterm |
| Font | Inconsolata for Powerline |
| Font | Inconsolata |
| Transparency | picom |
| Wallpaper | teh |

18
config.yaml
View File

@@ -19,9 +19,6 @@ dotfiles:
actions:
- vundle-install
- vundle-refresh
f_gitconfig:
src: gitconfig
dst: ~/.gitconfig
f_xresources:
src: Xresources
dst: ~/.Xresources
@@ -47,12 +44,15 @@ dotfiles:
d_oh-my-zsh:
src: oh-my-zsh
dst: ~/.oh-my-zsh
f_zsh_theme:
src: zsh
f_zsh_themes:
src: zsh-themes
dst: ~/.oh-my-zsh/themes
d_fonts:
src: fonts
dst: ~/.local/share/fonts
d_xresources_d:
src: Xresources.d
dst: ~/.Xresources.d
f_picom.conf:
src: picom.conf
dst: ~/.config/picom.conf
@@ -65,7 +65,6 @@ profiles:
- i3
- font
- picom
- git
- gdb
work:
include:
@@ -75,7 +74,6 @@ profiles:
- i3
- font
- picom
- git
- gdb
dev-linux:
include:
@@ -94,7 +92,7 @@ profiles:
dotfiles:
- f_zshrc
- d_oh-my-zsh
- f_zsh_theme
- f_zsh_themes
vim:
dotfiles:
- f_vimrc
@@ -102,6 +100,7 @@ profiles:
dotfiles:
- f_xresources
- f_xinitrc
- d_xresources_d
i3:
dotfiles:
- f_i3_config
@@ -109,9 +108,6 @@ profiles:
font:
dotfiles:
- d_fonts
git:
dotfiles:
- f_gitconfig
gdb:
dotfiles:
- f_gdbinit

59
dotfiles/Xresources
View File

@@ -1,52 +1,11 @@
! Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
! Copyright (c) 2016-present Sven Greb <code@svengreb.de>
! Colors
#include ".Xresources.d/colors-nord"
!#include ".Xresources.d/colors-breeze-dark"
!#include ".Xresources.d/colors-onedark"
!#include ".Xresources.d/colors-onedark-16"
! 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
XTerm.vt100.faceName: xft:Inconsolata for Powerline:antialias=true
! Font
XTerm.vt100.faceName: xft:Inconsolata:antialias=true
{%@@ if profile == "work" @@%}
XTerm.vt100.faceSize: 13
{%@@ endif @@%}
@@ -54,15 +13,17 @@ XTerm.vt100.faceSize: 13
XTerm.vt100.faceSize: 15
{%@@ endif @@%}
! Remove Scrollbar
XTerm.vt100.scrollBar: false
Xterm.vt100.scrollBar.widht:1
! Resize Term Font
XTerm.vt100.translations: #override \n\
Ctrl <Key> minus: smaller-vt-font() \n\
Ctrl <Key> plus: larger-vt-font()
! some urxvt term settings
URxvt.font: xft:Inconsolata for Powerline:size=11:antialias=true
URxvt.font: xft:Inconsolata:size=11:antialias=true
URxvt.transparent: true
URxvt.shading: 50
URxvt.scrollBar: false

36
dotfiles/Xresources.d/colors-breeze-dark Normal file
View File

@@ -0,0 +1,36 @@
! special
*.foreground: #cfcfc2
*.background: #232629
*.cursorColor: #cfcfc2
! black
*.color0: #2a2e32
*.color8: #31363b
! red
*.color1: #c0392b
*.color9: #f44f4f
! green
*.color2: #218058
*.color10: #27ae60
! yellow
*.color3: #fdbc4b
*.color11: #fdbc4b
! blue
*.color4: #2980b9
*.color12: #0099ff
! magenta
*.color5: #8e44ad
*.color13: #af81ff
! cyan
*.color6: #27aeae
*.color14: #31dddd
! white
*.color7: #acada1
*.color15: #cfd0c2

47
dotfiles/Xresources.d/colors-nord Normal file
View File

@@ -0,0 +1,47 @@
! Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
! Copyright (c) 2016-present Sven Greb <code@svengreb.de>
! 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

36
dotfiles/Xresources.d/colors-onedark Normal file
View File

@@ -0,0 +1,36 @@
! special
*.foreground: #ABB2BF
*.background: #282C34
*.cursorColor: #ABB2BF
! black
*.color0: #5C6370
*.color8: #4B5263
! red
*.color1: #E06C75
*.color9: #BE5046
! green
*.color2: #98C379
*.color10: #98C379
! yellow
*.color3: #E5C07B
*.color11: #D19A66
! blue
*.color4: #61AFEF
*.color12: #61AFEF
! magenta
*.color5: #C678DD
*.color13: #C678DD
! cyan
*.color6: #56B6C2
*.color14: #56B6C2
! white
*.color7: #ABB2BF
*.color15: #3E4452

50
dotfiles/Xresources.d/colors-onedark-16 Normal file
View File

@@ -0,0 +1,50 @@
! Base16 OneDark
! Scheme: Lalit Magant (http://github.com/tilal6991)
#define base00 #282c34
#define base01 #353b45
#define base02 #3e4451
#define base03 #545862
#define base04 #565c64
#define base05 #abb2bf
#define base06 #b6bdca
#define base07 #c8ccd4
#define base08 #e06c75
#define base09 #d19a66
#define base0A #e5c07b
#define base0B #98c379
#define base0C #56b6c2
#define base0D #61afef
#define base0E #c678dd
#define base0F #be5046
*foreground: base05
*background: base00
*cursorColor: base05
*color0: base00
*color1: base08
*color2: base0B
*color3: base0A
*color4: base0D
*color5: base0E
*color6: base0C
*color7: base05
*color8: base03
*color9: base08
*color10: base0B
*color11: base0A
*color12: base0D
*color13: base0E
*color14: base0C
*color15: base07
! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt),
! use 'shell' template to set these if necessary
*color16: base09
*color17: base0F
*color18: base01
*color19: base02
*color20: base04
*color21: base06

18
dotfiles/gitconfig
View File

@@ -1,18 +0,0 @@
[alias]
a = add
aa = add .
b = branch
c = commit
co = checkout
d = diff
l = log
ps = push
ph = push
pl = pull
sh = show
st = status
[user]
name = CramMK
email = ma_tho@web.de
[log]
decorate = true

9
dotfiles/i3status_config
View File

@@ -4,21 +4,16 @@ general {
interval = 1
}
{%@@ if profile == "work" @@%}
order += "load"
order += "memory"
order += "tztime local"
{%@@ endif @@%}
{%@@ if profile == "laptop" @@%}
order += "wireless _first_"
order += "ethernet _first_"
order += "battery all"
order += "disk /"
{%@@ endif @@%}
order += "load"
order += "memory"
order += "tztime local"
{%@@ endif @@%}
wireless _first_ {

25
dotfiles/picom.conf
View File

@@ -1,8 +1,23 @@
opacity-rule = [
"90:class_g = 'XTerm' && !focused"
# add xlock
];
fading = true;
fade-delta = 4;
fade-in-step = 0.03;
fade-out-step = 0.03;
active-opacity = 0.99;
inactive-opacity = 0.9;
blur-background = true;
blur-background-fixed = true;
inactive-dim = 0.05;
#fading = true;
#fade-delta = 4;
#fade-in-step = 0.02;
#fade-out-step = 0.02;
blur:
{
method = "gaussian";
size = 90;
deviation = 10.0;
}

14
dotfiles/vimrc
View File

@@ -6,14 +6,12 @@ call vundle#begin()
" Plugins - load with :PluginInstall
Plugin 'VundleVim/Vundle.vim'
Plugin 'scrooloose/nerdtree'
Plugin 'editorconfig/editorconfig-vim'
Plugin 'maxboisvert/vim-simple-complete'
Plugin 'itchyny/vim-gitbranch'
Plugin 'tmsvg/pear-tree'
" Colorscheme
Plugin 'joshdick/onedark.vim'
Plugin 'fneu/breezy' "lightline
Plugin 'itchyny/lightline.vim'
" Required
@@ -22,14 +20,12 @@ filetype plugin indent on
" Vundle Plugin Manager - END
" Plugin Settings
" NerdTree
let NERDTreeShowHidden=1
" Lightline Statusbar
" absolutepath or filename
set laststatus=2
let g:lightline = {
\ 'colorscheme': 'wombat',
\ 'colorscheme': 'breezy',
\ 'active': {
\ 'left': [ [ 'mode', 'paste' ],
\ [ 'gitbranch', 'readonly', 'filename', 'modified' ] ]
@@ -39,10 +35,12 @@ let g:lightline = {
\ },
\ }
" Breezy
set termguicolors
" Onedark Colorscheme
let g:onedark_hide_endofbuffer=1
let g:onedark_terminal_italics=1
colorscheme onedark
" PearTree
let g:pear_tree_smart_openers=1
@@ -114,8 +112,6 @@ cmap Wq wq
cmap Q q
cmap W w
cmap q1 q!
map <C-t> :NERDTreeToggle<CR>
map <F2> :NERDTreeToggle<CR>
" go to line edited, when closed
if has("autocmd")

0
dotfiles/zsh/agnoster-plus.zsh-theme → dotfiles/zsh-themes/agnoster-plus.zsh-theme
View File

0
dotfiles/zsh/marc-pygmalion.zsh-theme → dotfiles/zsh-themes/marc-pygmalion.zsh-theme
View File

19
dotfiles/zsh-themes/the-one.zsh-theme Normal file
View File

@@ -0,0 +1,19 @@
# The One Theme v1.0.0
#
# https://github.com/benniemosher/the-one-theme
#
# Copyright 2015, All rights reserved
#
# Code licensed under the MIT license
# http://benniemosher.mit-license.org
#
# @author Bennie Mosher <benniemosher@gmail.com>
#
# modded by Marc
PROMPT='%{$fg_bold[green]%}➜ %{$fg_bold[green]%}%p %{$fg_bold[blue]%}%~ $(git_prompt_info)% %{$reset_color%}'
ZSH_THEME_GIT_PROMPT_CLEAN=") %{$fg_bold[green]%}✔ "
ZSH_THEME_GIT_PROMPT_DIRTY=") %{$fg_bold[yellow]%}✗ "
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[red]%}("
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"

7
dotfiles/zshrc
View File

@@ -1,9 +1,6 @@
export ZSH="/home/$USER/.oh-my-zsh"
ZSH_THEME="agnoster-plus"
{%@@ if profile == "dev-obsd" @@%}
ZSH_THEME="marc-pygmalion"
{%@@ endif @@%}
ZSH_THEME="the-one"
DISABLE_AUTO_UPDATE="true"
COMPLETION_WAITING_DOTS="true"
@@ -20,6 +17,8 @@ source $ZSH/oh-my-zsh.sh
export TERM="xterm-256color"
export EDITOR="vim"
export LANG="en_US.UTF-8"
# Some aliases
alias zshrc="vim ~/.zshrc"
alias szsh="source ~/.zshrc"