summaryrefslogtreecommitdiffstats
path: root/x
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--x/.Xresources51
-rw-r--r--x/.Xresources.d/colors3
-rw-r--r--x/.Xresources.d/emacs15
-rw-r--r--x/.Xresources.d/fonts7
-rw-r--r--x/.Xresources.d/gruvbox-dark.xresources36
-rw-r--r--x/.Xresources.d/gruvbox-light.xresources36
-rw-r--r--x/.Xresources.d/gruvbox-urxvt256.xresources38
-rw-r--r--x/.Xresources.d/rxvt-unicode85
-rw-r--r--[-rwxr-xr-x]x/.xprofile87
-rw-r--r--xdg/.config/user-dirs.dirs8
10 files changed, 236 insertions, 130 deletions
diff --git a/x/.Xresources b/x/.Xresources
index 3dd91e4..5d23a38 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -1,47 +1,4 @@
-URxvt.scrollBar: false
-!URxvt.font: -*-termsyn-medium-*-*-*-14-*-*-*-*-*-*-*
-!URxvt.boldFont: -*-termsyn-bold-*-*-*-14-*-*-*-*-*-*-*
-
-!! Sauce Code Pro
-URxvt.font: xft:Source Code Pro-11:hinting=True;antialias:True,xft:Meslo LG M for Powerline-10:medium;antialias=False,xft:DejaVu Sans Mono for Powerline-10:medium;antialias=True,xft:Unifont-10:medium;antialias:True
-URxvt.boldFont: xft:Source Code Pro-11:bold;hinting=True;antialias:True,xft:Meslo LG M for Powerline-10:bold;antialias=False,xft:DejaVu Sans Mono for Powerline-10:bold;antialias=True,xft:Unifont-10:bold;antialias:True
-URxvt.letterSpace: -1
-!-*-{ Xft settings
-Xft*dpi: 96
-Xft*antialias: True
-Xft*hinting: Full
-!-*-}
-
-URxvt.depth: 0
-URxvt.loginShell: true
-URxvt.saveLines: 1000
-URxvt.internalBorder: 3
-URxvt.lineSpace: 0
-URxvt.scrollStyle: rxvt
-
-URxvt.perl-ext-common: default,clipboard,url-select,font-size
-URxvt.url-select.launcher: firefox
-URxvt.url-select.underline: true
-URxvt.keysym.M-u: perl:url-select:select_next
-URxvt.url-launcher: /usr/bin/firefox
-URxvt.matcher.button: 1
-URxvt.iso14755 : false
-URxvt.keysym.M-c: perl:clipboard:copy
-URxvt.keysym.M-v: perl:clipboard:paste
-URxvt.keysym.C-A-V: perl:clipboard:paste_escaped
-
-URxvt.iconFile: /usr/share/icons/Moka/96x96/apps/utilities-terminal.png
-!URxvt.iconFile: /home/amin/.icons/Moka/96x96/apps/utilities-terminal.png
-
-URxvt.keysym.C-Up: perl:font-size:increase
-URxvt.keysym.C-Down: perl:font-size:decrease
-!URxvt.keysym.C-S-Up: perl:font-size:incglobal
-!URxvt.keysym.C-S-Down: perl:font-size:decglobal
-!URxvt.iso14755: false
-!URxvt.iso14755_52: false
-
-! Xcursor --------------------------------------------------------------------
-
-!Xcursor.theme: Vanilla-DMZ-AA
-!Xcursor.size: 22
-
+#include ".Xresources.d/fonts"
+#include ".Xresources.d/colors"
+#include ".Xresources.d/emacs"
+#include ".Xresources.d/rxvt-unicode"
diff --git a/x/.Xresources.d/colors b/x/.Xresources.d/colors
new file mode 100644
index 0000000..9b1136e
--- /dev/null
+++ b/x/.Xresources.d/colors
@@ -0,0 +1,3 @@
+#include "gruvbox-light.xresources"
+! #include "gruvbox-dark.xresources"
+#include "gruvbox-urxvt256.xresources"
diff --git a/x/.Xresources.d/emacs b/x/.Xresources.d/emacs
new file mode 100644
index 0000000..8269961
--- /dev/null
+++ b/x/.Xresources.d/emacs
@@ -0,0 +1,15 @@
+! Emacs stuff
+Emacs.menuBar: off
+Emacs.toolBar: off
+Emacs.verticalScrollBars: off
+Emacs.cursorBlink: off
+Emacs.FontBackend: xft,x
+Emacs.font: Ubuntu Mono-10.5
+! Emacs.font: Ubuntu Mono-12
+! Emacs.font: Iosevka-11
+
+! Emacs.font: Fira Mono:size=15
+! Emacs.font: DejaVu Sans Mono:size=15
+! Emacs.font: Inconsolata:size=17
+! Emacs.font: Source Code Pro-10
+! Emacs.font: Iosevka:size=16
diff --git a/x/.Xresources.d/fonts b/x/.Xresources.d/fonts
new file mode 100644
index 0000000..05c96ae
--- /dev/null
+++ b/x/.Xresources.d/fonts
@@ -0,0 +1,7 @@
+Xft.lcdfilter: lcddefault
+Xft.antialias: true
+Xft.autohint: 0
+Xft.hinting: true
+Xft.hintstyle: hintslight
+Xft.rgba: rgb
+Xft.dpi: 96 \ No newline at end of file
diff --git a/x/.Xresources.d/gruvbox-dark.xresources b/x/.Xresources.d/gruvbox-dark.xresources
new file mode 100644
index 0000000..5beeba2
--- /dev/null
+++ b/x/.Xresources.d/gruvbox-dark.xresources
@@ -0,0 +1,36 @@
+! -----------------------------------------------------------------------------
+! File: gruvbox-dark.xresources
+! Description: Retro groove colorscheme generalized
+! Author: morhetz <morhetz@gmail.com>
+! Source: https://github.com/morhetz/gruvbox-generalized
+! Last Modified: 6 Sep 2014
+! -----------------------------------------------------------------------------
+
+! hard contrast: *background: #1d2021
+*background: #282828
+! soft contrast: *background: #32302f
+*foreground: #ebdbb2
+! Black + DarkGrey
+*color0: #282828
+*color8: #928374
+! DarkRed + Red
+*color1: #cc241d
+*color9: #fb4934
+! DarkGreen + Green
+*color2: #98971a
+*color10: #b8bb26
+! DarkYellow + Yellow
+*color3: #d79921
+*color11: #fabd2f
+! DarkBlue + Blue
+*color4: #458588
+*color12: #83a598
+! DarkMagenta + Magenta
+*color5: #b16286
+*color13: #d3869b
+! DarkCyan + Cyan
+*color6: #689d6a
+*color14: #8ec07c
+! LightGrey + White
+*color7: #a89984
+*color15: #ebdbb2
diff --git a/x/.Xresources.d/gruvbox-light.xresources b/x/.Xresources.d/gruvbox-light.xresources
new file mode 100644
index 0000000..738848d
--- /dev/null
+++ b/x/.Xresources.d/gruvbox-light.xresources
@@ -0,0 +1,36 @@
+! -----------------------------------------------------------------------------
+! File: gruvbox-light.xresources
+! Description: Retro groove colorscheme generalized
+! Author: morhetz <morhetz@gmail.com>
+! Source: https://github.com/morhetz/gruvbox-generalized
+! Last Modified: 6 Sep 2014
+! -----------------------------------------------------------------------------
+
+! hard contrast: *background: #f9f5d7
+*background: #fbf1c7
+! soft contrast: *background: #f2e5bc
+*foreground: #3c3836
+! Black + DarkGrey
+*color0: #fdf4c1
+*color8: #928374
+! DarkRed + Red
+*color1: #cc241d
+*color9: #9d0006
+! DarkGreen + Green
+*color2: #98971a
+*color10: #79740e
+! DarkYellow + Yellow
+*color3: #d79921
+*color11: #b57614
+! DarkBlue + Blue
+*color4: #458588
+*color12: #076678
+! DarkMagenta + Magenta
+*color5: #b16286
+*color13: #8f3f71
+! DarkCyan + Cyan
+*color6: #689d6a
+*color14: #427b58
+! LightGrey + White
+*color7: #7c6f64
+*color15: #3c3836
diff --git a/x/.Xresources.d/gruvbox-urxvt256.xresources b/x/.Xresources.d/gruvbox-urxvt256.xresources
new file mode 100644
index 0000000..52f58d9
--- /dev/null
+++ b/x/.Xresources.d/gruvbox-urxvt256.xresources
@@ -0,0 +1,38 @@
+! -----------------------------------------------------------------------------
+! File: gruvbox-urxvt256.xresources
+! Description: Retro groove colorscheme generalized
+! Author: morhetz <morhetz@gmail.com>
+! Source: https://github.com/morhetz/gruvbox-generalized
+! Last Modified: 13 Dec 2013
+! -----------------------------------------------------------------------------
+
+URxvt.color24: #076678
+URxvt.color66: #427b58
+URxvt.color88: #9d0006
+URxvt.color96: #8f3f71
+URxvt.color100: #79740e
+URxvt.color108: #8ec07c
+URxvt.color109: #83a598
+URxvt.color130: #af3a03
+URxvt.color136: #b57614
+URxvt.color142: #b8bb26
+URxvt.color167: #fb4934
+URxvt.color175: #d3869b
+URxvt.color208: #fe8019
+URxvt.color214: #fabd2f
+URxvt.color223: #ebdbb2
+URxvt.color228: #f2e5bc
+URxvt.color229: #fbf1c7
+URxvt.color230: #f9f5d7
+URxvt.color234: #1d2021
+URxvt.color235: #282828
+URxvt.color236: #32302f
+URxvt.color237: #3c3836
+URxvt.color239: #504945
+URxvt.color241: #665c54
+URxvt.color243: #7c6f64
+URxvt.color244: #928374
+URxvt.color245: #928374
+URxvt.color246: #a89984
+URxvt.color248: #bdae93
+URxvt.color250: #d5c4a1
diff --git a/x/.Xresources.d/rxvt-unicode b/x/.Xresources.d/rxvt-unicode
new file mode 100644
index 0000000..eacb397
--- /dev/null
+++ b/x/.Xresources.d/rxvt-unicode
@@ -0,0 +1,85 @@
+URxvt.xftAntialias: true
+URxvt.letterSpace: 0
+
+! Fira Mono
+! URxvt.font: xft:Fira Mono:pixelsize=15:antialias=true:hinting=true, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true
+! URxvt.boldFont: xft:Fira Mono:pixelsize=15:antialias=true:hinting=true:bold, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bold
+! URxvt.italicFont: xft:Fira Mono:pixelsize=15:antialias=true:hinting=true:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:italic
+! URxvt.bolditalicFont: xft:Fira Mono:pixelsize=15:antialias=true:hinting=true:bold:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bolditalic
+
+! Inconsolata
+! URxvt.font: xft:inconsolata:pixelsize=14:antialias=true:hinting=true, xft:dejavu sans mono:pixelsize=14:antialias=true:hinting=true
+! URxvt.boldFont: xft:inconsolata:pixelsize=14:antialias=true:hinting=true:bold, xft:dejavu sans mono:pixelsize=14:antialias=true:hinting=true:bold
+! URxvt.italicFont: xft:inconsolata:pixelsize=14:antialias=true:hinting=true:italic, xft:dejavu sans mono:pixelsize=14:antialias=true:hinting=true:italic
+! URxvt.bolditalicFont: xft:inconsolata:pixelsize=14:antialias=true:hinting=true:bold:italic, xft:dejavu sans mono:pixelsize=14:antialias=true:hinting=true:bolditalic
+
+! Ubuntu Mono
+! URxvt.font: xft:ubuntu mono:pixelsize=17:antialias=true:hinting=true, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true
+! URxvt.boldFont: xft:ubuntu mono:pixelsize=17:antialias=true:hinting=true:bold, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bold
+! URxvt.italicFont: xft:ubuntu mono:pixelsize=17:antialias=true:hinting=true:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:italic
+! URxvt.bolditalicFont: xft:ubuntu mono:pixelsize=17:antialias=true:hinting=true:bold:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bolditalic
+
+! Ubuntu Mono
+URxvt.font: xft:ubuntu mono-10.5:antialias=true:hinting=true, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true
+URxvt.boldFont: xft:ubuntu mono-10.5:antialias=true:hinting=true:bold, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bold
+URxvt.italicFont: xft:ubuntu mono-10.5:antialias=true:hinting=true:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:italic
+URxvt.bolditalicFont: xft:ubuntu mono-10.5:antialias=true:hinting=true:bold:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bolditalic
+
+! Iosevka
+!URxvt.font: xft:iosevka-11:antialias=true:hinting=true, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true
+!URxvt.boldFont: xft:iosevka-11:antialias=true:hinting=true:bold, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bold
+!URxvt.italicFont: xft:iosevka-11:antialias=true:hinting=true:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:italic
+!URxvt.bolditalicFont: xft:iosevka-11:antialias=true:hinting=true:bold:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bolditalic
+
+!URxvt.font: xft:iosevka-12:pixelsize=14:antialias=true:hinting=true, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true
+!URxvt.boldFont: xft:iosevka-12:pixelsize=14:antialias=true:hinting=true:bold, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bold
+!URxvt.italicFont: xft:iosevka-12:pixelsize=14:antialias=true:hinting=true:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:italic
+!URxvt.bolditalicFont: xft:iosevka-12:pixelsize=14:antialias=true:hinting=true:bold:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bolditalic
+
+! DejaVu Sans Mono
+! URxvt.font: xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true
+! URxvt.boldFont: xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bold
+! URxvt.italicFont: xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:italic
+! URxvt.bolditalicFont: xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bolditalic
+
+! Source Code Pro
+! URxvt.font: xft:source code pro:pixelsize=15:antialias=true:hinting=true, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true
+! URxvt.boldFont: xft:source code pro:pixelsize=15:antialias=true:hinting=true:bold, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bold
+! URxvt.italicFont: xft:source code pro:pixelsize=15:antialias=true:hinting=true:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:italic
+! URxvt.bolditalicFont: xft:source code pro:pixelsize=15:antialias=true:hinting=true:bold:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bolditalic
+
+URxvt.depth: 0
+URxvt.loginShell: true
+URxvt.saveLines: 100000
+URxvt.internalBorder: 3
+URxvt.lineSpace: 0
+URxvt.scrollBar: false
+URxvt.scrollStyle: rxvt
+URxvt*scrollTtyOutput: false
+URxvt*scrollWithBuffer: true
+URxvt*scrollTtyKeypress: true
+URxvt.keysym.Shift-Up: command:\033]720;1\007
+URxvt.keysym.Shift-Down: command:\033]721;1\007
+
+URxvt.perl-ext-common: default,clipboard,url-select,keyboard-select,font-size
+URxvt.url-select.launcher: firefox
+URxvt.url-select.underline: true
+URxvt.keysym.M-u: perl:url-select:select_next
+URxvt.keysym.M-Escape: perl:keyboard-select:activate
+URxvt.keysym.M-s: perl:keyboard-select:search
+URxvt.url-launcher: /usr/bin/firefox
+URxvt.matcher.button: 1
+URxvt.iso14755: false
+URxvt.iso14755_53: false
+URxvt.keysym.M-c: perl:clipboard:copy
+URxvt.keysym.M-v: perl:clipboard:paste
+URxvt.keysym.C-A-V: perl:clipboard:paste_escaped
+URxvt.keysym.C-Up: font-size:increase
+URxvt.keysym.C-Down: font-size:decrease
+URxvt.keysym.C-S-Up: font-size:incglobal
+URxvt.keysym.C-S-Down: font-size:decglobal
+URxvt.keysym.C-equal: font-size:reset
+URxvt.keysym.C-question: font-size:show
+
+! URxvt.iconFile: /usr/share/icons/Moka/96x96/apps/utilities-terminal.png
+URxvt.iconFile: /usr/share/icons/elementary-xfce/apps/128/utilities-terminal.svg
diff --git a/x/.xprofile b/x/.xprofile
index 83428bd..3117fc7 100755..100644
--- a/x/.xprofile
+++ b/x/.xprofile
@@ -1,87 +1,8 @@
-#!/bin/sh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
+setxkbmap -option ctrl:nocaps
+#setxkbmap -option compose:ralt
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
- for f in /etc/X11/xinit/xinitrc.d/*; do
- [ -x "$f" ] && . "$f"
- done
- unset f
-fi
-
-# workaround for some java apps, when running a non-reparenting window manager
+source ~/.zprofile
export _JAVA_AWT_WM_NONREPARENTING=1
+export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true'
-xrdb -merge ~/.Xresources
-# xrdb -merge ~/.base16-tomorrow.dark.256.xresources
-xrdb -merge ~/.gotham.xresources
-# xrdb -merge ~/.hybrid.xresources
-# xrdb -merge ~/.dawn.xresources
-# xrdb -merge ~/.zenburn.xresources
-# xrdb -merge ~/.solarized-dark.xresources
-
-# set the cursor icon
-# xsetroot -cursor_name left_ptr &
-
-# set the wallpaper
-# sh ~/.fehbg &
-
-# font stuff
-# xset +fp /usr/share/fonts/local
-# xset +fp ~/.fonts
-# xset fp rehash
-# xset b off
-
-# the compositor
-#compton &
-
-# xbacklight -set 50
-
-# synaptics (touchpad) configs
-#synclient TapButton2=3
-#synclient TapButton3=2
-synclient TapButton1=1
-synclient TapButton2=0
-synclient TapButton3=0
-synclient HorizTwoFingerScroll=1
-synclient VertScrollDelta=-237
-synclient HorizScrollDelta=-237
-
-# swap caps lock and esc
-setxkbmap -option caps:swapescape
-
-# MPD daemon start (if no other instance exists)
-[ -z $(pidof mpd) ] && mpd &
-
-# screen powersave
-# xset +dpms
-# xset dpms 0 0 300
-
-# lock the screen using lightdm after 5 minutes
-# xautolock -time 5 -locker "slimlock" &
-
-# adjust the keypress delays
-xset r rate 200 20
-
-# exec gnome-session
-# exec startkde
-# exec startxfce4
-# ...or the Window Manager of your choice
-# source ~/.profile
-xfsettingsd &
-xfdesktop --disable-wm-check &
-xfce4-panel --disable-wm-check &
bspwm &
-sxhkd &
-#emacs --daemon &
-sleep 2 && pnmixer &
-# panel &
-
-# DEFAULTSESSION=bspwm
-# case "$1" in
-# i3) exec i3;;
-# bspwm) exec bspwm;;
-# *) exec $DEFAULTSESSION ;;
-# esac
diff --git a/xdg/.config/user-dirs.dirs b/xdg/.config/user-dirs.dirs
new file mode 100644
index 0000000..82d4b02
--- /dev/null
+++ b/xdg/.config/user-dirs.dirs
@@ -0,0 +1,8 @@
+XDG_DESKTOP_DIR="$HOME/Desktop"
+XDG_DOCUMENTS_DIR="$HOME/usr/docs"
+XDG_DOWNLOAD_DIR="$HOME/usr/dls"
+XDG_MUSIC_DIR="$HOME/usr/music"
+XDG_PICTURES_DIR="$HOME/usr/img"
+XDG_PUBLICSHARE_DIR="$HOME/usr/Public"
+XDG_TEMPLATES_DIR="$HOME/usr/Templates"
+XDG_VIDEOS_DIR="$HOME/usr/vids"