Browse Source

Merge branch 'master' into ranger

Ian Adam Naval 6 years ago
parent
commit
96791b14a4

+ 38
- 1
X11/Xresources.dotfile View File

@@ -9,8 +9,9 @@ URxvt.depth: 32
9 9
 URxvt.background: [100]#252525
10 10
 URxvt.scrollstyle: plain
11 11
 URxvt.font: xft:meslo lg s dz:size=10
12
-URxvt.boldFont: xft:meslo lg s dz:size=10
12
+URxvt.boldFont: xft:meslo lg s dz:size=10:style=bold
13 13
 URxvt.letterSpace: -1
14
+URxvt.cursorBlink: 0
14 15
 URxvt.scrollBar_right: true
15 16
 URxvt.scrollBar: false
16 17
 URxvt.scrollTtyOutput: false
@@ -44,6 +45,42 @@ xterm*toolBar:            false
44 45
 xterm*metaSendsEscape:    true
45 46
 xterm*borderWidth:        0
46 47
 
48
+rofi.modi:                 window,run,ssh
49
+rofi.opacity:              100
50
+rofi.width:                720
51
+rofi.lines:                5
52
+rofi.columns:              1
53
+rofi.font:                 Meslo LG S DZ 10
54
+rofi.fg:                   #f8f8f2
55
+rofi.bg:                   #252525
56
+rofi.bgalt:                #252525
57
+rofi.hlfg:                 #f8f8f2
58
+rofi.hlbg:                 #600
59
+rofi.bc:                   #252525
60
+rofi.bw:                   0
61
+rofi.location:             2
62
+rofi.padding:              0
63
+rofi.yoffset:              26
64
+rofi.xoffset:              0
65
+rofi.fixed-num-lines:      false
66
+rofi.terminal:             urxvt
67
+rofi.ssh-client:           ssh
68
+rofi.ssh-command:          {terminal} -e {ssh-client} {host}
69
+rofi.run-command:          {cmd}
70
+rofi.run-list-command:     
71
+rofi.run-shell-command:    {terminal} -e {cmd}
72
+rofi.disable-history:      false
73
+rofi.levenshtein-sort:     false
74
+rofi.case-sensitive:       false
75
+rofi.sidebar-mode:         false
76
+rofi.lazy-filter-limit:    5000
77
+rofi.eh:                   1
78
+rofi.auto-select:          false
79
+rofi.pid:                  /run/user/1000/rofi.pid
80
+rofi.key-window:           
81
+rofi.key-run:              
82
+rofi.key-ssh:
83
+
47 84
 *.cursorBlink:  true
48 85
 *.foreground:   #f8f8f2
49 86
 *.background:   #252525

+ 3
- 2
arch/all.pkglist View File

@@ -1,5 +1,6 @@
1
-awesome
2
-awesome-gnome
1
+i3-gaps-git
2
+sublime-text-nightly
3
+thunar
3 4
 file-roller
4 5
 git
5 6
 sudo

+ 10
- 0
gtk/gtk-3.0.configdir/gtk.css View File

@@ -0,0 +1,10 @@
1
+.window-frame, .window-frame:backdrop {
2
+    box-shadow: 0 0 0 black;
3
+    border-style: none;
4
+    margin: 0;
5
+    border-radius: 0;
6
+}
7
+
8
+.titlebar {
9
+    border-radius: 0;
10
+}

+ 16
- 0
gtk/gtk-3.0.configdir/settings.ini View File

@@ -0,0 +1,16 @@
1
+[Settings]
2
+gtk-theme-name=iris
3
+gtk-icon-theme-name=Numix-Circle
4
+gtk-font-name=Cantarell 11
5
+gtk-cursor-theme-name=Adwaita
6
+gtk-cursor-theme-size=0
7
+gtk-toolbar-style=GTK_TOOLBAR_BOTH
8
+gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
9
+gtk-button-images=0
10
+gtk-menu-images=0
11
+gtk-enable-event-sounds=1
12
+gtk-enable-input-feedback-sounds=1
13
+gtk-xft-antialias=1
14
+gtk-xft-hinting=1
15
+gtk-xft-hintstyle=hintslight
16
+gtk-xft-rgba=rgb

+ 55
- 15
i3/i3.dotfile/config View File

@@ -10,7 +10,6 @@
10 10
 
11 11
 set $mod Mod4
12 12
 set $lock lock
13
-set $run_passmenu ~/.i3/passmenu --type -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-10' -hist ~/.passmenu_history -h 26
14 13
 
15 14
 # Font for window titles. Will also be used by the bar unless a different font
16 15
 # is used in the bar {} block below. ISO 10646 = Unicode
@@ -33,10 +32,12 @@ bindsym $mod+Shift+Return exec terminator
33 32
 bindsym $mod+q kill
34 33
 # start dmenu (a program launcher)
35 34
 #bindsym $mod+d exec dmenu_run -sb "#880000"
36
-bindsym $mod+d exec --no-startup-id j4-dmenu-desktop --dmenu="dmenu -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-10' -hist ~/.dmenu_history -h 26"
37
-bindsym $mod+Shift+d exec --no-startup-id dmenu_run -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-10' -hist ~/.dmenu_history -h 26
38
-bindsym $mod+p exec --no-startup-id $run_passmenu
39
-bindsym $mod+Shift+p exec --no-startup-id ~/.i3/passmenu -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-10' -hist ~/.passmenu_history -h 26
35
+#bindsym $mod+d exec --no-startup-id j4-dmenu-desktop --dmenu="dmenu -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-10' -hist ~/.dmenu_history -h 26"
36
+bindsym $mod+d exec --no-startup-id rofi -show run
37
+bindsym $mod+Shift+d exec --no-startup-id j4-dmenu-desktop --dmenu="rofi -dmenu -p run"
38
+bindsym $mod+p exec --no-startup-id ~/.i3/passmenu --type
39
+bindsym $mod+Shift+p exec --no-startup-id ~/.i3/passmenu
40
+bindsym $mod+n exec --no-startup-id nmcli_dmenu -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-10' -h 26
40 41
 # There also is the (new) i3-dmenu-desktop which only displays applications
41 42
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
42 43
 # installed.
@@ -137,12 +138,13 @@ bindsym XF86MonBrightnessDown exec xbacklight -dec 5 # decrease screen brightnes
137 138
 bindsym Shift+XF86MonBrightnessUp exec xbacklight -inc 1 # increase screen brightness
138 139
 bindsym Shift+XF86MonBrightnessDown exec xbacklight -dec 1 # decrease screen brightness
139 140
 
140
-bindsym XF86Tools exec --no-startup-id j4-dmenu-desktop --dmenu="dmenu -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-8' -hist ~/.dmenu_history -h 24"
141
-bindsym XF86Search exec --no-startup-id j4-dmenu-desktop --dmenu="dmenu -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-8' -hist ~/.dmenu_history -h 24"
142
-bindsym XF86LaunchA exec --no-startup-id $run_passmenu
143
-bindsym XF86Explorer exec --no-startup-id j4-dmenu-desktop --dmenu="dmenu -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-8' -hist ~/.dmenu_history -h 24"
141
+bindsym XF86Tools exec --no-startup-id rofi -show ssh
142
+bindsym XF86Search exec --no-startup-id rofi -show fm -switchers 'fm:fmenu-rofi'
143
+bindsym XF86LaunchA exec --no-startup-id rofi -show window
144
+bindsym XF86Explorer exec --no-startup-id rofi -show run
145
+bindsym Mod1+Tab exec --no-startup-id rofi -show window
144 146
 
145
-bindsym Print exec gnome-screenshot -i
147
+bindsym Print exec teiler
146 148
 
147 149
 # resize window (you can also use the mouse for that)
148 150
 mode "resize" {
@@ -198,13 +200,52 @@ bindsym $mod+Shift+e mode "$quit_msg"
198 200
 
199 201
 bindsym $mod+r mode "resize"
200 202
 
201
-new_window pixel 2
202
-new_float normal 2
203
+new_window pixel 1
204
+new_float normal 1
203 205
 smart_borders on
204 206
 
207
+set $mode_gaps Gaps: (o) outer, (i) inner
208
+set $mode_gaps_outer Outer Gaps: +|-|0 (local), Shift + +|-|0 (global)
209
+set $mode_gaps_inner Inner Gaps: +|-|0 (local), Shift + +|-|0 (global)
210
+bindsym $mod+Shift+g mode "$mode_gaps"
211
+
212
+mode "$mode_gaps" {
213
+        bindsym o      mode "$mode_gaps_outer"
214
+        bindsym i      mode "$mode_gaps_inner"
215
+        bindsym Return mode "default"
216
+        bindsym Escape mode "default"
217
+}
218
+
219
+mode "$mode_gaps_inner" {
220
+        bindsym plus  gaps inner current plus 5
221
+        bindsym minus gaps inner current minus 5
222
+        bindsym 0     gaps inner current set 0
223
+
224
+        bindsym Shift+plus  gaps inner all plus 5
225
+        bindsym Shift+minus gaps inner all minus 5
226
+        bindsym Shift+0     gaps inner all set 0
227
+
228
+        bindsym Return mode "default"
229
+        bindsym Escape mode "default"
230
+}
231
+mode "$mode_gaps_outer" {
232
+        bindsym plus  gaps outer current plus 5
233
+        bindsym minus gaps outer current minus 5
234
+        bindsym 0     gaps outer current set 0
235
+
236
+        bindsym Shift+plus  gaps outer all plus 5
237
+        bindsym Shift+minus gaps outer all minus 5
238
+        bindsym Shift+0     gaps outer all set 0
239
+
240
+        bindsym Return mode "default"
241
+        bindsym Escape mode "default"
242
+}
243
+
244
+for_window [class="feh"] floating enable
245
+
205 246
 # border background text indicator
206
-client.focused #660000 #880000 #ffffff #ff0000
207
-client.focused_inactive #252525 #252525 #222222 #000000
247
+client.focused #660000 #880000 #f8f8f2 #ff0000
248
+client.focused_inactive #252525 #252525 #f8f8f2 #000000
208 249
 client.unfocused #252525 #252525 #888888 #000000
209 250
 
210 251
 # Start i3bar to display a workspace bar (plus the system information i3status
@@ -229,7 +270,6 @@ exec --no-startup-id compton -b --vsync opengl-swc --backend glx -f -D 5 --confi
229 270
 exec --no-startup-id feh --bg-scale /home/ian/Pictures/Wallpapers/wallpaper.jpg
230 271
 exec --no-startup-id seafile-applet
231 272
 exec --no-startup-id xrdb -merge ~/.Xresources
232
-exec --no-startup-id nm-applet
233 273
 
234 274
 bindsym $mod+u exec setxkbmap us
235 275
 bindsym $mod+c exec setxkbmap us -variant colemak

+ 3
- 1
i3/i3.dotfile/passmenu View File

@@ -8,12 +8,14 @@ if [[ $1 == "--type" ]]; then
8 8
 	shift
9 9
 fi
10 10
 
11
+prompt="pass"
12
+
11 13
 prefix=${PASSWORD_STORE_DIR-~/.password-store}
12 14
 password_files=( "$prefix"/**/*.gpg )
13 15
 password_files=( "${password_files[@]#"$prefix"/}" )
14 16
 password_files=( "${password_files[@]%.gpg}" )
15 17
 
16
-password=$(printf '%s\n' "${password_files[@]}" | dmenu "$@")
18
+password=$(printf '%s\n' "${password_files[@]}" | rofi -dmenu -p "$prompt" "$@")
17 19
 
18 20
 [[ -n $password ]] || exit
19 21
 

+ 11
- 2
i3/i3.dotfile/status.py View File

@@ -29,7 +29,7 @@ COLORS = {
29 29
 }
30 30
 
31 31
 status.register("clock",
32
-    format="%a %Y-%m-%d %H:%M:%S",
32
+    format="%a %m/%d %H:%M",
33 33
     color=COLORS['Magenta'])
34 34
 
35 35
 status.register("load",
@@ -82,13 +82,22 @@ if os.path.exists("/sys/class/power_supply/BAT1"):
82 82
 if os.path.exists("/sys/class/net/wlp3s0"):
83 83
     status.register("wireless",
84 84
         interface="wlp3s0",
85
-        format_up="{essid}",
85
+        format_up="{essid} {quality:.0f}%",
86
+        format_down="",
86 87
         color_up=COLORS['Green'],
87 88
         color_down=COLORS['Red'])
88 89
 
89 90
 if os.path.exists("/sys/class/net/enp0s25"):
90 91
     status.register("network",
91 92
         interface="enp0s25",
93
+        format_down="",
94
+        color_up=COLORS['Green'],
95
+        color_down=COLORS['Red'])
96
+
97
+if os.path.exists("/sys/class/net/enp0s20u2c2"):
98
+    status.register("network",
99
+        interface="enp0s20u2c2",
100
+        format_down="",
92 101
         color_up=COLORS['Green'],
93 102
         color_down=COLORS['Red'])
94 103
 

+ 104
- 0
teiler/teiler.configdir/config View File

@@ -0,0 +1,104 @@
1
+##### teiler configuration file ######
2
+
3
+# general variables
4
+
5
+backend=rofi
6
+slop_color="255,0,0"
7
+slop_border=2
8
+hidecursor=yes
9
+
10
+# the path where images, videos and pastes should be saved
11
+img_path=$HOME/Pictures/Screenshots
12
+vid_path=$HOME/Videos/Screencasts
13
+paste_path=$HOME/Pictures/Paste
14
+
15
+# some distibutions rename the gdbar binary to dzen2-gdbar
16
+# set it here, accordingly
17
+gdbar=gdbar
18
+
19
+# editor to be used
20
+editor=gimp
21
+
22
+# Uploading & archiving options
23
+# Possible Choices for ul: fb, scp, s3, imgur (imgur does not support videos)
24
+# Possible Choices for paste_ul: fb, scp, ix
25
+#
26
+# If you don't want a local history of images/videos,
27
+# set archive_img/archive_vid to "0"
28
+# keep in mind, that imgur does not support videos
29
+ul=scp
30
+paste_ul=scp
31
+archive_vid=1
32
+archive_img=1
33
+archive_paste=0
34
+upload_vid=0
35
+
36
+# filebin history
37
+# for filebin history to work, you need to set your host here:
38
+filebin_host=https://host.example.com
39
+
40
+# For scp you need to provide the actual path on your server
41
+# where your files should be stored
42
+# this path normally should be within a http domain.
43
+# also set the actual URL to the directory
44
+
45
+scp_host=ratte
46
+scp_path_img=/srv/sites/ianonavy.com/files
47
+scp_path_vid=/srv/sites/ianonavy.com/files
48
+scp_path_paste=/srv/sites/ianonavy.com/files
49
+http_img=http://files.ianonavy.com
50
+http_vid=http://files.ianonavy.com
51
+http_paste=http://files.ianonavy.com
52
+
53
+
54
+
55
+# s3 options
56
+# same as scp options. set an actual path within your bucket, where
57
+# files should be stored. Also set the URL to your directories.
58
+s3_bucket=
59
+s3_path_img=path/to/images
60
+s3_path_vid=path/to/videos
61
+s3_path_paste=path/to/pastes
62
+s3_http_img=http://rasi-teiler.s3-website-eu-west-1.amazonaws.com/path/to/images
63
+s3_http_vid=http://rasi-teiler.s3-website-eu-west-1.amazonaws.com/path/to/videos
64
+s3_http_paste=http://rasi-teiler.s3-website-eu-west-1.amazonaws.com/path/to/pastes
65
+
66
+
67
+# Screencast options
68
+# Resolution to change to when recording:
69
+res=800x600
70
+
71
+# Ffmpeg settings
72
+# Possible encoder options: libav and ffmpeg
73
+encoder=ffmpeg
74
+encopts="-r 30 -vcodec libx264 -pix_fmt yuv420p -s $res -acodec libmp3lame"
75
+rect_encopts="-r 30 -c:v libx264 -preset slow -crf 18 -c:a libvorbis"
76
+ffaudio="-f alsa -ac 2 -i pulse"
77
+
78
+# record indicator
79
+rec_text="capturing..."
80
+rec_w=100
81
+rec_x=3400
82
+rec_y=0
83
+rec_font=PragmataPro-10
84
+rec_nf=\#FFFFFF
85
+rec_sf=\#000000
86
+
87
+
88
+# Normally you don't want to change anything here!
89
+SCREENCAST_PIDFILE=/tmp/$USER-teiler-screencast.pid
90
+INDICATOR_PIDFILE=/tmp/$USER-teiler-indicator.pid
91
+time=1000
92
+namekey=teiler
93
+random_string=$(date +%s | sha256sum | base64 | head -c 4 ; echo)
94
+img_filemask=$random_string
95
+vid_filemask=$random_string
96
+paste_filemask=$random_string
97
+
98
+
99
+###### rofi options ######
100
+
101
+# here you can override options for rofi. normally rofi options
102
+# are read from ~/.Xresources, so setting options there is recommended.
103
+# you can dump options for ~/.Xresources with "rofi -dump-xresources"
104
+rofiopts="-lines 25"

+ 63
- 0
vimperator/vimperatorrc.dotfile View File

@@ -0,0 +1,63 @@
1
+"3.9 (created: 2015/02/15 15:49:05)
2
+
3
+source! /home/ian/.vimperatorrc.local
4
+
5
+set editor="urxvt -e vim"
6
+set gui=nonavigation
7
+set hc=hjklasdfgyuiopqwertnmzxcvb
8
+
9
+nnoremap j 3j
10
+nnoremap k 3k
11
+nnoremap h 3h
12
+nnoremap l 3l
13
+
14
+nnoremap J gt
15
+nnoremap K gT
16
+
17
+noremap m :set gui=invnavigation<CR>
18
+
19
+" Hide status bar when fullscreen mode is detected
20
+autocmd Fullscreen .* js updateBottomBar()
21
+
22
+" Re-enable bottom bar during certain commands.
23
+noremap : :js updateBottomBar(false)<CR>:
24
+noremap o :js updateBottomBar(false)<CR>o
25
+noremap O :js updateBottomBar(false)<CR>O
26
+noremap t :js updateBottomBar(false)<CR>t
27
+noremap T :js updateBottomBar(false)<CR>t
28
+noremap / :js updateBottomBar(false)<CR>/
29
+cnoremap <CR> <CR>:js updateBottomBar()<CR>
30
+cnoremap <Esc> <Esc>:js updateBottomBar()<CR>
31
+
32
+:js << EOF
33
+let hlContentSepValue = highlight.get('ContentSeparator').value
34
+
35
+function updateBottomBar(close = window.fullScreen) {
36
+  let bb = document.getElementById('liberator-bottombar')
37
+  if (! bb) return
38
+
39
+  if (close) {
40
+    bb.style.height = '0px'
41
+    bb.style.overflow = 'hidden'
42
+    liberator.execute('highlight ContentSeparator display: none;')
43
+  }
44
+  else {
45
+    bb.style.height = ''
46
+    bb.style.overflow = ''
47
+    liberator.execute('highlight ContentSeparator ' + hlContentSepValue)
48
+  }
49
+}
50
+updateBottomBar()
51
+EOF
52
+
53
+hi Normal color: #f8f8f2; background: #252525
54
+hi CompItem[selected] background: #800
55
+hi CmdLine background: #252525; color: #f8f8f2; font-family: "Meslo LG S DZ"; font-size: 12px;
56
+hi StatusLine background: #252525; color: #f8f8f2; font-family: "Meslo LG S DZ"; border-color: #252525; font-size: 12px
57
+hi ContentSeparator border-top: none; display: -moz-box;
58
+hi ModeMsg color: #f8f8f2; background: #252525; font-family: "Meslo LG S DZ"; font-size: 12px;
59
+hi MoreMsg color: #f8f8f2; background: #252525; font-family: "Meslo LG S DZ"; font-size: 12px;
60
+hi Message color: #f8f8f2; background: #252525; font-family: "Meslo LG S DZ"; font-size: 12px; min-width: 100%;
61
+hi PromptText color: #f8f8f2; font-family: "Meslo LG S DZ"; font-size: 12px;
62
+
63
+" vim: set ft=vimperator:

Loading…
Cancel
Save