diff options
author | Tom Willemsen | 2012-04-19 09:48:26 +0000 |
---|---|---|
committer | Tom Willemsen | 2012-04-19 09:48:26 +0000 |
commit | 20181fab259a62623689adeda30a976fcc09aa0b (patch) | |
tree | 535bbc2d9551db4e31d6c681a36d4399dce67470 | |
parent | 853f43c483ed827a9ed39f9c37869967dc769fc6 (diff) | |
parent | ddc6bafa69cfb4bdc815156ecc7a0b8a21b11e7d (diff) | |
download | dotfiles-20181fab259a62623689adeda30a976fcc09aa0b.tar.gz dotfiles-20181fab259a62623689adeda30a976fcc09aa0b.zip |
Merge remote-tracking branch 'ryuslash/master' into phoenix
Conflicts:
.xinitrc
-rw-r--r-- | .Xdefaults | 44 | ||||
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | .ncmpcpp/config | 66 | ||||
-rw-r--r-- | .pentadactyl/plugins/emacs.penta | 98 | ||||
-rw-r--r-- | .xinitrc | 13 |
5 files changed, 106 insertions, 118 deletions
@@ -1,46 +1,8 @@ ! -*- mode: conf-xdefaults; eval: (rainbow-mode 1); eval: (git-auto-commit-mode 1) -*- !! drop in Solarized colorscheme for Xresources/Xdefaults -*background: #002b36 -*foreground: #657b83 -*fading: 40 -*fadeColor: #002b36 -*cursorColor: #93a1a1 -*pointerColorBackground:#586e75 -*pointerColorForeground:#93a1a1 - -!! black dark/light -*color0: #073642 -*color8: #002b36 - -!! red dark/light -*color1: #dc322f -*color9: #cb4b16 - -!! green dark/light -*color2: #859900 -*color10: #586e75 - -!! yellow dark/light -*color3: #b58900 -*color11: #657b83 - -!! blue dark/light -*color4: #268bd2 -*color12: #839496 - -!! magenta dark/light -*color5: #d33682 -*color13: #6c71c4 - -!! cyan dark/light -*color6: #2aa198 -*color14: #93a1a1 - -!! white dark/light -*color7: #eee8d5 -*color15: #fdf6e3 - +urxvt.background: #000000 +urxvt.foreground: #ffffff urxvt.internalBorder: 0 ! General @@ -93,5 +55,3 @@ xfontsel.sampleTextUCS: \ static void print_sample_message(XWindow *win) {\n\ win.label->text = "Sample text 0123456789"\n\ } - -*.font: -misc-tamsyn-medium-r-normal-*-17-*-*-*-*-*-iso8859-* @@ -115,3 +115,6 @@ Mail/ .mu/ .org-timestamps/ .virtualenv/ +.PlaneShift/ +.android/ +.nv/ diff --git a/.ncmpcpp/config b/.ncmpcpp/config index 20d1030..289318d 100644 --- a/.ncmpcpp/config +++ b/.ncmpcpp/config @@ -17,22 +17,6 @@ titles_visibility = "no" browser_display_mode = "classic" # (classic/columns) browser_playlist_prefix = "$2plist >$9 " -# Colors -active_column_color = "yellow" -color1 = "default" -color2 = "green" -discard_colors_if_item_is_selected = "yes" -header_visibikity = "yes" -header_window_color = "magenta" -main_window_color = "default" -main_window_highlight_color = "default" -progressbar_color = "red" -state_flags_color = "yellow" -state_line_color = "black" -statusbar_color = "magenta" -statusbar_visibility = "yes" -volume_color = "cyan" - # Others allow_physical_directories_deletion = "yes" allow_physical_files_deletion = "yes" @@ -40,53 +24,3 @@ fancy_scrolling = "yes" mpd_music_dir = "/mnt/music/mp3" search_engine_display_mode = "columns" # (classic/columns) user_interface = "alternative" # (classic/alternative) - -#active_window_border = "red" -#alternative_header_first_line_format = "$b$1$aqqu$/a$9 {%t}|{%f} $1$atqq$/a$9$/b" -#alternative_header_second_line_format = "{{$4$b%a$/b$9}{ - $7%b$9}{ ($4%y$9)}}|{%D}" -#alternative_ui_separator_color = "black" -#ask_before_clearing_main_playlist = "no" -#block_search_constraints_change_if_items_found = "yes" -#clock_display_seconds = "no" -#colors_enabled = "yes" -#cyclic_scrolling = "no" -#default_find_mode = "wrapped" (wrapped/normal) -#default_place_to_search_in = "database" (database/playlist) -#default_space_mode = "add" (add/select) -#default_tag_editor_left_col = "albums" (albums/dirs) -#default_tag_editor_pattern = "%n - %t" -#display_remaining_time = "no" -#display_screens_numbers_on_start = "yes" -#empty_tag_color = "cyan" -#empty_tag_marker = "<empty>" -#enable_window_title = "yes" -#execute_on_song_change = "" -#external_editor = "" -#follow_now_playing_lyrics = "no" -#header_text_scrolling = "yes" -#ignore_leading_the = "no" -#incremental_seeking = "yes" -#jump_to_now_playing_song_at_start = "yes" -#lines_scrolled = "2" -#lyrics_database = "1" -#media_library_left_column = "a" (possible values: a,y,g,c,p, legend above) -#message_delay_time = "4" -#mouse_support = "yes" -#mpd_connection_timeout = "5" -#mpd_crossfade_time = "3" -#mpd_host = "localhost" -#mpd_port = "6600" -#ncmpc_like_songs_adding = "no" (enabled - add/remove, disabled - always add) -#playlist_disable_highlight_delay = "5" -#playlist_show_remaining_time = "no" -#regular_expressions = "basic" (basic/extended) -#seek_time = "1" -#selected_item_prefix = "$6" -#selected_item_suffix = "$9" -#show_hidden_files_in_local_browser = "no" -#song_columns_list_format = "(10f)[green]{lr} (25)[cyan]{aE} (40)[]{t} (30)[red]{b}" -#song_library_format = "{%n - }{%t}|{%f}" -#song_window_title_format = "{%a - }{%t}|{%f}" -#tag_editor_album_format = "{(%y) }%b" -#use_console_editor = "no" (set to yes, if your editor is console app) -#window_border_color = "green" diff --git a/.pentadactyl/plugins/emacs.penta b/.pentadactyl/plugins/emacs.penta new file mode 100644 index 0000000..e28bce3 --- /dev/null +++ b/.pentadactyl/plugins/emacs.penta @@ -0,0 +1,98 @@ +set editor=emacsclient +set go=bCs +set hintkeys="arstdhneio" +set stal=never +set titlestring= + +highlight -a Hint text-transform: uppercase + +map -b <A-x> : +map -b -m base <C-g> <Esc> + +map -b -m c <C-n> <Tab> +map -b -m c <C-p> <S-Tab> + +map -b -m i <C-n> <Down> +map -b -m i <C-p> <Up> + +map -b -m c,i <C-/> <C-v><C-z> +map -b -m c,i <C-b> <Left> +map -b -m c,i <C-f> <Right> +map -b -m c,i <A-w> <C-v><C-c> +map -b -m c,i <C-w> <C-v><C-x> +map -b -m c,i <C-y> <C-v><C-v> + +map -b <A-<> gg +map -b <A->> G +map -b <A-v> <C-u> +map -b <A-w> y + +map -b <C-_> u +map -b <C-a> 0 +map -b <C-b> <A-left> +map -b <C-e> $ +map -b <C-f> <A-right> +map -b <C-j> gT +map -b <C-k> gt +map -b <C-n> 2j +map -b <C-p> 2k +map -b <C-r> ? +map -b <C-s> / +map -b <C-v> <C-d> +map -b <C-w> Y +map -b <C-y> P + +map -b <C-x>~ ~ +map -b <C-x>e gF +map -b <C-x>g gf +map -b <C-x>h gh +map -b <C-x>i gi +map -b <C-x>k d +map -b <C-x>m ;c +map -b <C-x>p ;i +map -b <C-x>r r +map -b <C-x>R R +map -b <C-x>u gu + +map -b <C-x><C-b> b +map -b <C-x><C-c> ZZ +map -b <C-x><C-f> t +map -b <C-x><C-r> :restart<CR> +map -b <C-x><C-u> gU +map -b <C-x><C-v> O + +map <C-d> <Nop> +map <C-u> <Nop> +map <C-x> <Nop> +map <C-g> <Nop> +map <C-h> <Nop> +map : <Nop> +map ~ <Nop> +map / <Nop> +map ? <Nop> +map $ <Nop> +map 0 <Nop> +map b <Nop> +map B <Nop> +map d <Nop> +map F <Nop> +map gg <Nop> +map gh <Nop> +map gi <Nop> +map gU <Nop> +map G <Nop> +map i <Nop> +map j <Nop> +map k <Nop> +map o <Nop> +map O <Nop> +map p <Nop> +map P <Nop> +map q <Nop> +map r <Nop> +map t <Nop> +map u <Nop> +map w <Nop> +map y <Nop> +map Y <Nop> +map ZZ <Nop> @@ -1,21 +1,14 @@ -#_ Modify keys #xmodmap ~/.Xmodmap #xrandr --output VGA1 --mode 1920x1080 -#_ Start some programs + #xsetroot -solid "#002b36" #numlockx & #emacs --daemon & #xbindkeys & -#_ Start notifier -#/usr/bin/dunst \ -# -fn "-misc-tamsyn-medium-r-normal-*-14-*-*-*-*-*-iso8859-*" \ -# -nb "#000000" -nf "#15abc3" & -#_ Start session + exec ck-launch-session /usr/bin/herbstluftwm 2>&1 >> ~/.xsession_errors -#exec ck-launch-session /usr/local/bin/dwm 2>&1 >> ~/.xsession_errors -#_ Local Variables + # Local Variables: # mode: shell-script # eval: (git-auto-commit-mode 1) -# eval: (allout-mode 1) # End: |