michael 4 months ago
parent
commit
b80c0e6bf1
8 changed files with 20 additions and 78 deletions
  1. 2
    1
      .Xresources
  2. 13
    9
      .config/alacritty/alacritty.yml
  3. 3
    1
      .config/i3/config
  4. 1
    0
      .config/nvim/init.vim
  5. 0
    20
      .gitconfig
  6. 1
    1
      .i3blocks.conf
  7. 0
    4
      .local/scripts/sonata
  8. 0
    42
      .zshrc

+ 2
- 1
.Xresources View File

@@ -79,6 +79,7 @@ URxvt.keysym.C-Minus:   font-size:decrease
79 79
 URxvt.keysym.C-0:  font-size:reset
80 80
 URxvt.keysym.C-slash:  font-size:show<Paste>
81 81
 
82
-URxvt.termName: rxvt-unicode-256color
82
+! URxvt.termName: rxvt-unicode-256color
83
+URxvt.termName: xterm-256color
83 84
 
84 85
 ! Esetroot -s /home/michael/pictures/wallpaper.png

+ 13
- 9
.config/alacritty/alacritty.yml View File

@@ -31,7 +31,7 @@ window:
31 31
 
32 32
   # Window decorations
33 33
   # Setting this to false will result in window without borders and title bar.
34
-  decorations: true
34
+  decorations: full
35 35
 
36 36
 # Display tabs using this many cells (changes require restart)
37 37
 tabspaces: 8
@@ -97,7 +97,7 @@ font:
97 97
   # screens and make reading text a little easier.
98 98
   # On X11 it is possible to change the DPI for each instance of alacritty by using
99 99
   # `WINIT_HIDPI_FACTOR=1.0 alacritty` to scale the font.
100
-  scale_with_dpi: true
100
+  # scale_with_dpi: true
101 101
 
102 102
   # OS X only: use thin stroke font rendering. Thin strokes are suitable
103 103
   # for retina displays, but for non-retina you probably want this set to
@@ -109,7 +109,7 @@ render_timer: false
109 109
 
110 110
 # Use custom cursor colors. If true, display the cursor in the cursor.foreground
111 111
 # and cursor.background colors, otherwise invert the colors of the cursor.
112
-custom_cursor_colors: false
112
+# custom_cursor_colors: false
113 113
 
114 114
 # Colors (Tomorrow Night Bright)
115 115
 colors:
@@ -131,6 +131,8 @@ colors:
131 131
   cursor:
132 132
     text: '0x000000'
133 133
     cursor: '0xffffff'
134
+    style: Block
135
+    unfocused_hollow: true
134 136
 
135 137
   # Normal colors
136 138
   normal:
@@ -221,6 +223,8 @@ mouse:
221 223
   double_click: { threshold: 300 }
222 224
   triple_click: { threshold: 300 }
223 225
 
226
+  hide_when_typing: false
227
+
224 228
   # Faux Scrollback
225 229
   #
226 230
   # The `faux_scrollback_lines` setting controls the number
@@ -229,14 +233,14 @@ mouse:
229 233
   # scrolling for applications like `man`.
230 234
   #
231 235
   # To disable this completely, set `faux_scrollback_lines` to 0.
232
-  faux_scrollback_lines: 1
236
+  faux_scrolling_lines: 1
233 237
 
234 238
 selection:
235 239
   semantic_escape_chars: ",│`|:\"' ()[]{}<>"
236 240
 
237 241
 dynamic_title: true
238 242
 
239
-hide_cursor_when_typing: false
243
+# hide_cursor_when_typing: false
240 244
 
241 245
 # Style of the cursor
242 246
 #
@@ -244,10 +248,10 @@ hide_cursor_when_typing: false
244 248
 # - Block
245 249
 # - Underline
246 250
 # - Beam
247
-cursor_style: Block
251
+# cursor_style: Block
248 252
 
249 253
 # Whether the cursor should be a hollow block on window focus loss
250
-unfocused_hollow_cursor: true
254
+# unfocused_hollow_cursor: true
251 255
 
252 256
 # Live config reload (changes require restart)
253 257
 live_config_reload: true
@@ -306,8 +310,8 @@ key_bindings:
306 310
   - { key: C,        mods: Control|Shift,    action: Copy                }
307 311
   - { key: Paste,                   action: Paste                        }
308 312
   - { key: Copy,                    action: Copy                         }
309
-  - { key: Q,        mods: Command, action: Quit                         }
310
-  - { key: W,        mods: Command, action: Quit                         }
313
+  - { key: Q,        mods: Super,   action: Quit                         }
314
+  - { key: W,        mods: Super,   action: Quit                         }
311 315
   - { key: Insert,   mods: Shift,   action: PasteSelection               }
312 316
   - { key: Key0,     mods: Control, action: ResetFontSize                }
313 317
   - { key: Equals,   mods: Control, action: IncreaseFontSize             }

+ 3
- 1
.config/i3/config View File

@@ -34,6 +34,8 @@ exec --no-startup-id fcitx-autostart
34 34
 # exec_always --no-startup-id $HOME/.config/polybar/launch.sh
35 35
 # exec --no-startup-id fcitx-autostart
36 36
 exec --no-startup-id dunst
37
+exec --no-startup-id i3-msg 'workspace 10; exec /usr/bin/thunderbird'
38
+exec --no-startup-id i3-msg 'workspace 1'
37 39
 
38 40
 # misc
39 41
 bindsym $mod+space exec ~/.local/scripts/rofiwrap -show run -levenshtein-sort
@@ -89,7 +91,7 @@ bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 10
89 91
 floating_modifier $mod
90 92
 
91 93
 # start a terminal
92
-# bindsym $mod+Return exec i3-sensible-terminal
94
+## bindsym $mod+Return exec i3-sensible-terminal
93 95
 bindsym $mod+Return exec $HOME/.cargo/bin/alacritty
94 96
 
95 97
 # kill focused window

+ 1
- 0
.config/nvim/init.vim View File

@@ -34,6 +34,7 @@
34 34
   syntax enable
35 35
   set number
36 36
   set cursorline
37
+  set colorcolumn=80
37 38
   set wrap
38 39
   set encoding=utf-8
39 40
   set nocompatible

+ 0
- 20
.gitconfig View File

@@ -1,20 +0,0 @@
1
-[alias]
2
-    st = status
3
-    shove = push -f
4
-    cam = commit -a -m
5
-    lg = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
6
-
7
-[user]
8
-	name = Michael Zhang
9
-	email = failed.down@gmail.com
10
-	signingkey = A1B65B603268116B
11
-[commit]
12
-	gpgsign = true
13
-
14
-[core]
15
-	quotepath = false
16
-[merge]
17
-	ff = false
18
-[pull]
19
-	ff = false
20
-

+ 1
- 1
.i3blocks.conf View File

@@ -128,7 +128,7 @@ command=date '+%a %Y %b %d'
128 128
 interval=20
129 129
 
130 130
 [time]
131
-command=date '+%I:%M%P'
131
+command=date '+%H:%M'
132 132
 interval=20
133 133
 
134 134
 # OpenVPN support

+ 0
- 4
.local/scripts/sonata View File

@@ -1,4 +0,0 @@
1
-#!/bin/bash
2
-source ~/.local/share/sonata/.virtualenv/bin/activate
3
-exec sonata
4
-

+ 0
- 42
.zshrc View File

@@ -1,42 +0,0 @@
1
-fpath+=~/.zfunc
2
-source ~/.zshrc.secret
3
-
4
-export ZSH=/home/michael/.oh-my-zsh
5
-export EDITOR=nvim
6
-
7
-ZSH_THEME=${ZSH_THEME:-"ys"}
8
-
9
-plugins=(
10
-  # git
11
-)
12
-
13
-source $ZSH/oh-my-zsh.sh
14
-
15
-alias backup='$HOME/.local/scripts/backup'
16
-alias ls='exa -F'
17
-alias rm='trash'
18
-alias ytdl='youtube-dl --extract-audio --audio-format mp3 --embed-thumbnail --restrict-filenames'
19
-alias siteclone='wget --recursive --no-clobber --page-requisites --html-extension --convert-links --restrict-file-names=windows --no-parent'
20
-
21
-export PATH="$PATH:$HOME/.local/bin:$HOME/.local/scripts:$HOME/.cargo/bin:/usr/local/go/bin:$HOME/go/bin:$HOME/.gem/ruby/2.5.0/bin:$HOME/.nvm/versions/node/v9.2.1/bin:$HOME/.nimble/bin:$HOME/.local/bin/aarch64-none-elf/bin:$HOME/.local/go/bin:$HOME/.local/share/android-sdk/tools"
22
-export GOPATH="$HOME/go"
23
-
24
-[[ -s /home/michael/.autojump/etc/profile.d/autojump.sh ]] && source /home/michael/.autojump/etc/profile.d/autojump.sh
25
-autoload -U compinit && compinit -u
26
-
27
-# opam
28
-# eval `opam config env`
29
-
30
-# export NVM_DIR="$HOME/.nvm"
31
-# [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" --no-use  # This loads nvm
32
-# [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
33
-
34
-# added by travis gem
35
-[ -f /home/michael/.travis/travis.sh ] && source /home/michael/.travis/travis.sh
36
-source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
37
-
38
-export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
39
-export Z3_LIBRARY_PATH="$HOME/.local/lib64"
40
-
41
-alias rust-musl-builder='docker run --rm -it -v "$(pwd)":/home/rust/src -v cargo-git:/home/rust/.cargo/git -v cargo-registry:/home/rust/.cargo/registry ekidd/rust-musl-builder'
42
-alias nm='neomutt'

Loading…
Cancel
Save