Commit Graph

1304 Commits

Author SHA1 Message Date
Jorge Bucaran
5654170b93 Merge pull request #538 from dan-c-underwood/master
Improve README clarity for custom configuration
2015-08-28 20:09:01 +09:00
Dan Underwood
92c51768e0 Grammar 2015-08-28 11:59:16 +01:00
Dan Underwood
682acf77b5 Link to the FAQ to reduce ambiguity in README section on custom configuration. 2015-08-28 11:57:48 +01:00
Jorge Bucaran
d107b2ec1e simplify color setters 2015-08-28 18:35:50 +09:00
Jorge Bucaran
84872300df refactor botched source calls with ^/dev/null 2015-08-28 18:35:49 +09:00
Jorge Bucaran
87d88f702e add a Private Functions section 2015-08-28 18:33:31 +09:00
Bruno Pinto
0767b2a72f Fish < 2.2 does not support argument for set_color
The second argument (background) was added on fish 2.2
2015-08-28 18:33:31 +09:00
Harrison Heck
7d47220770 Add checks to see if file exists before source.
Fixes #524.
2015-08-28 18:31:50 +09:00
Harrison Heck
e7abc74939 Change github url to current url. 2015-08-28 18:28:47 +09:00
Wes Morgan
c6e72863bd centralize pkg / theme installation 2015-08-28 18:28:47 +09:00
Bruno Pinto
f7677581fa Add z package to oh-my-fish database 2015-08-28 18:24:57 +09:00
Bruno Pinto
bfe77b6273 Handle scenarios where colors are not defined.
Fish should set default colors:
b32f770a69/share/functions/__fish_config_interactive.fish

But in case some users don't have these color variables set, use their
defaults values.
2015-08-28 18:24:57 +09:00
Bruno Pinto
20ed43983b Naming functions with omf. namespace.
Having a clear namespace `omf.` improves the readability of the code as
we clarify what is the function name and what is the namespace.
2015-08-28 18:24:56 +09:00
Bruno Pinto
2ecc1fc100 Use fish's colors
Instead of using custom colors, reuse fish's colors.
Original fish colors here:
4d628d5f43/functions/restore_original_fish_colors.fish
2015-08-28 18:21:03 +09:00
Wes Morgan
2564e7446c refresh after installing package or theme
The functions themselves no longer do that.
2015-08-28 18:21:03 +09:00
Wes Morgan
718ba2fc10 don't refresh in omf_theme
Leave that up to the caller.
2015-08-28 18:21:03 +09:00
Wes Morgan
4809687b52 don't refresh in omf_install_package
Leave that up to the caller.
2015-08-28 18:21:03 +09:00
Bruno Pinto
b5591c97d0 Improve template README
Layout and links
2015-08-28 18:21:03 +09:00
Justin Hileman
0359ba047c Merge $OMF_CONFIG and $OMF_CUSTOM.
Per conversation with @bpinto in Gitter.

There's no need for two separate directories. You don't have a `.git` and `.git-custom` folder, you just put your config in `.git` :)

The most straightforward interpretation of XDG basedir spec is that user configuration for omf would go in `~/.config/omf`, so let's put it there. The only question is whether omf-generated config (i.e. the `theme` file) should go there as well. By analogy with git, programmatically generated config should probably be merged in with user config. This also makes it so when a user clones their dotfiles to a new machine, both kinds of settings come with it.
2015-08-27 11:02:30 -07:00
Bruno
e116608c01 Merge pull request #526 from bobthecow/add-local-config
Add local-config
2015-08-27 18:16:18 +01:00
Justin Hileman
37debfd4f3 Add local-config 2015-08-27 10:15:03 -07:00
Jorge Bucaran
a1c319db73 fix template generator using incorrect variable USERNAME → USER 2015-08-27 10:28:00 +09:00
Bruno Pinto
aa8a770dea Forgot to rename get to install on README 2015-08-26 23:47:47 +01:00
Jorge Bucaran
fa46c0118e Merge pull request #519 from fish-shell/get-renamed-to-install
Rename 'get' to 'install'
2015-08-27 07:24:02 +09:00
Jorge Bucaran
62a195fa7b Merge pull request #518 from fish-shell/no-def-plus-template
No def plus template
2015-08-27 06:36:04 +09:00
Jorge Bucaran
7a7b0ff393 create empty theme config file during install 2015-08-27 06:15:17 +09:00
Jorge Bucaran
c855e0024c fix omf new theme and remove default theme 2015-08-27 06:04:24 +09:00
Bruno Pinto
24ab9a991b Rename 'get' to 'install'
We already use 'install' on the command description: 'Install one or
more packages.'

Also call update using 'u' instead of 'p'.
2015-08-26 21:19:40 +01:00
Jorge Bucaran
8850c84216 ignore themes directory 2015-08-27 04:41:38 +09:00
Bruno
d647f41bea Merge pull request #516 from fish-shell/fix-omf-remove
Current in use theme should not be deletable
2015-08-26 20:29:21 +01:00
Bruno Pinto
7f53f59ee6 Remove unused code
`default` was doing nothing.
2015-08-26 20:14:23 +01:00
Jorge Bucaran
c480308889 remove references to wa 2015-08-27 03:58:35 +09:00
Jorge Bucaran
bf52f5d57a fix basename polyfill 2015-08-27 03:55:16 +09:00
Jorge Bucaran
ed688aac2d fix use of older omf_use in omf_remove_package 2015-08-27 03:15:05 +09:00
Jorge Bucaran
d18d886c51 Merge pull request #514 from fish-shell/rename_use_to_theme
Rename `omf use` to `omf theme`.
2015-08-27 03:11:32 +09:00
Bruno Pinto
a9df3e1e98 Rename omf use to omf theme.
The first time I saw `use`, I thought I could use the command for
everything, including packages, but it's only used for themes. So, it's
better to have a clearer name.
2015-08-26 19:09:11 +01:00
Bruno
a9d78adc7a Merge pull request #512 from fish-shell/wahoofy
United States of the Fish → Wahoo → Oh My Fish!
2015-08-26 18:16:27 +01:00
Jorge Bucaran
41ce78a86a fix FAQ link again 2015-08-27 02:11:17 +09:00
Jorge Bucaran
eab3cb5733 fix FAQ link 2015-08-27 02:09:37 +09:00
Jorge Bucaran
e68f83ffeb fix omf_get_package typo 2015-08-27 02:06:18 +09:00
Jorge Bucaran
b7161bb0ac Merge branch 'wahoofy' of https://github.com/fish-shell/oh-my-fish into wahoofy 2015-08-27 02:05:23 +09:00
Jorge Bucaran
81be34a751 improve upgrade warning 2015-08-27 02:04:34 +09:00
Bruno
d2bfca7d63 wa -> omf 2015-08-26 18:03:22 +01:00
Jorge Bucaran
f4147ffea1 Merge branch 'wahoofy' of https://github.com/fish-shell/oh-my-fish into wahoofy 2015-08-27 01:51:45 +09:00
Jorge Bucaran
159efd6fa2 add upgrade notice 2015-08-27 01:49:23 +09:00
Jorge Bucaran
933e05f4e5 improve upgrade instructions 2015-08-27 01:48:40 +09:00
Bruno
7a1d25e2cc Fix travis badge URL. 2015-08-26 17:36:28 +01:00
Bruno
405449d84e There is no bootstrap script. 2015-08-26 17:33:22 +01:00
Jorge Bucaran
2693a2fd18 %%% United States of the Fish → Wahoo + OMF %%% 2015-08-27 00:20:13 +09:00
Bruno
4d628d5f43 Merge pull request #510 from ohspite/deprecation-warning
Only show deprecation warnings when omf is loaded.
2015-08-26 03:49:55 +01:00