diff --git a/nvim/after/ftplugin/css.vim b/nvim/after/ftplugin/css.vim deleted file mode 100644 index df4fe48..0000000 --- a/nvim/after/ftplugin/css.vim +++ /dev/null @@ -1 +0,0 @@ -setlocal iskeyword+=- diff --git a/nvim/after/ftplugin/scss.vim b/nvim/after/ftplugin/scss.vim deleted file mode 100644 index 94b3fea..0000000 --- a/nvim/after/ftplugin/scss.vim +++ /dev/null @@ -1 +0,0 @@ -source :h/css.vim diff --git a/nvim/colors/dotfiles.vim b/nvim/colors/dotfiles.vim index a042dd5..3083041 100644 --- a/nvim/colors/dotfiles.vim +++ b/nvim/colors/dotfiles.vim @@ -262,8 +262,7 @@ " CSS {{{ hi! link cssBraces Delimiter hi! link cssTagName htmlTagName - hi! link cssPseudoClassId Type - hi! link cssPseudoClass cssPseudoClassId + hi! link cssPseudoClassId Special hi! link cssClassName Type hi! link cssClassNameDot cssClassName hi! link cssAtRule Keyword @@ -275,12 +274,6 @@ hi! link cssAttrRegion cssAttr " }}} -" SCSS {{{ - hi! link scssSelectorName cssClassName - hi! link scssSelectorChar cssClassnameDot - hi! link scssAmpersand cssSelectorOp -" }}} - " JavaScript {{{ hi! link javaScriptBraces Delimiter hi! link jsParens Delimiter diff --git a/script-resources/pycalc_startup.py b/script-resources/pycalc_startup.py index 6aab338..7f97f03 100644 --- a/script-resources/pycalc_startup.py +++ b/script-resources/pycalc_startup.py @@ -11,21 +11,4 @@ def factors(n): return result -def solve_quadratic(a, b, c): - if a == 0: - raise Exception("not a quadratic equation") - else: - d = b ** 2 - 4 * a * c - print("D = " + str(d)) - if d < 0: - print("no solutions") - elif d > 0: - sd = sqrt(d) - print("sqrt(D) = " + str(sd)) - print("x1 = " + str((-b + sd) / (2 * a))) - print("x2 = " + str((-b - sd) / (2 * a))) - else: - print("x = " + str(-b / (2 * a))) - - print("loaded Python calculator")