diff --git a/broken_stuff.md b/broken_stuff.md index e957111..cc8e98c 100644 --- a/broken_stuff.md +++ b/broken_stuff.md @@ -1,5 +1,5 @@ -Removing actuator/ -Removing scripts/actuator -Removing scripts/landscape -Removing scripts/portrait -Removing tex/beamercolorthemesimpledark.sty +actuator/ +scripts/actuator +scripts/landscape +scripts/portrait +tex/beamerthemedispboard.sty diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index d944441..08e9db1 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -4,205 +4,227 @@ local function import(name) return ([[require '%s']]):format(name) end -return require('packer').startup({ function(use) - use 'wbthomason/packer.nvim' +return require('packer').startup({ + function(use) + use 'wbthomason/packer.nvim' - use { - 'vim-airline/vim-airline', - requires = { - 'ryanoasis/vim-devicons', - } - } - - use { - 'mustache/vim-mustache-handlebars' - } - - use { - 'nvim-treesitter/nvim-treesitter', - run = ':TSUpdate' - } - - use { - 'petRUShka/vim-sage' - } - - use { - 'evanleck/vim-svelte' - } - - use { - 'wuelnerdotexe/vim-astro' - } - - use { - 'tpope/vim-fugitive', - config = function() - local map = vim.api.nvim_set_keymap - map('n', 'g', 'Git', { noremap = true }) - end, - } - - use { - 'tpope/vim-surround', - } - - use { - 'tpope/vim-repeat', - } - - use { - 'lewis6991/gitsigns.nvim', - requires = { - 'nvim-lua/plenary.nvim' - }, - config = function() - require('gitsigns').setup { - signs = { - add = { hl = 'GitSignsAdd', text = '│', numhl = 'GitSignsAddNr', linehl = 'GitSignsAddLn' }, - change = { hl = 'GitSignsChange', text = '│', numhl = 'GitSignsChangeNr', - linehl = 'GitSignsChangeLn' }, - delete = { hl = 'GitSignsDelete', text = '_', numhl = 'GitSignsDeleteNr', - linehl = 'GitSignsDeleteLn' }, - topdelete = { hl = 'GitSignsDelete', text = '‾', numhl = 'GitSignsDeleteNr', - linehl = 'GitSignsDeleteLn' }, - changedelete = { hl = 'GitSignsChange', text = '~', numhl = 'GitSignsChangeNr', - linehl = 'GitSignsChangeLn' }, - }, + use { + 'vim-airline/vim-airline', + requires = { + 'ryanoasis/vim-devicons', } - end - } + } - use { - 'akinsho/flutter-tools.nvim', - requires = { - 'nvim-lua/plenary.nvim' - }, - config = function() - require('flutter-tools').setup { - lsp = { - color = { - enabled = false + use { + 'mustache/vim-mustache-handlebars' + } + + use { + 'nvim-treesitter/nvim-treesitter', + run = ':TSUpdate' + } + + use { + 'petRUShka/vim-sage' + } + + use { + 'evanleck/vim-svelte' + } + + use { + 'wuelnerdotexe/vim-astro' + } + + use { + 'tpope/vim-fugitive', + config = function() + local map = vim.api.nvim_set_keymap + map('n', 'g', 'Git', { noremap = true }) + end, + } + + use { + 'tpope/vim-surround', + } + + use { + 'tpope/vim-repeat', + } + + use { + 'lewis6991/gitsigns.nvim', + requires = { + 'nvim-lua/plenary.nvim' + }, + config = function() + require('gitsigns').setup { + signs = { + add = { + hl = 'GitSignsAdd', + text = '│', + numhl = 'GitSignsAddNr', + linehl = 'GitSignsAddLn' + }, + change = { + hl = 'GitSignsChange', + text = '│', + numhl = 'GitSignsChangeNr', + linehl = 'GitSignsChangeLn' + }, + delete = { + hl = 'GitSignsDelete', + text = '_', + numhl = 'GitSignsDeleteNr', + linehl = 'GitSignsDeleteLn' + }, + topdelete = { + hl = 'GitSignsDelete', + text = '‾', + numhl = 'GitSignsDeleteNr', + linehl = 'GitSignsDeleteLn' + }, + changedelete = { + hl = 'GitSignsChange', + text = '~', + numhl = 'GitSignsChangeNr', + linehl = 'GitSignsChangeLn' + }, + }, + } + end + } + + use { + 'akinsho/flutter-tools.nvim', + requires = { + 'nvim-lua/plenary.nvim' + }, + config = function() + require('flutter-tools').setup { + lsp = { + color = { + enabled = false + } } } - } - end - } + end + } - use { - 'numToStr/Comment.nvim', - config = function() - local map = vim.api.nvim_set_keymap - require('Comment').setup({}) - map('n', '', - 'lua require("Comment.api").toggle_linewise_op(vim.fn.visualmode())', - { noremap = true, silent = true }) - end - } + use { + 'numToStr/Comment.nvim', + config = function() + local map = vim.api.nvim_set_keymap + require('Comment').setup({}) + map('n', '', + 'lua require("Comment.api").toggle_linewise_op(vim.fn.visualmode())', + { noremap = true, silent = true }) + end + } - use { - 'nvim-telescope/telescope.nvim', - requires = { - 'nvim-lua/plenary.nvim', - { - 'nvim-telescope/telescope-fzf-native.nvim', - run = 'make', + use { + 'nvim-telescope/telescope.nvim', + requires = { + 'nvim-lua/plenary.nvim', + { + 'nvim-telescope/telescope-fzf-native.nvim', + run = 'make', + }, + 'nvim-telescope/telescope-symbols.nvim', }, - 'nvim-telescope/telescope-symbols.nvim', - }, - config = import('tel'), - } + config = import('tel'), + } - use { - 'stevearc/dressing.nvim', - config = function() - require('dressing').setup({ - input = { - default_prompt = '❯', - win_options = { - winhighlight = 'NormalFloat:Normal', + use { + 'stevearc/dressing.nvim', + config = function() + require('dressing').setup({ + input = { + default_prompt = '❯', + win_options = { + winhighlight = 'NormalFloat:Normal', + }, + }, + }) + vim.cmd [[highlight link FloatTitle NonText]] + vim.cmd [[highlight link DressingInputText Normal]] + end, + } + + use { + 'antoinemadec/FixCursorHold.nvim', + config = function() + vim.g.cursorhold_updatetime = 500 + end, + } + + use { + 'sirver/ultisnips', + ft = { 'latex', 'plaintex', 'tex' }, + config = function() + vim.g.UltiSnipsExpandTrigger = '' + vim.g.UltiSnipsJumpForwardTrigger = '' + vim.g.UltiSnipsJumpBackwardTrigger = '' + end + } + + use { + 'neovim/nvim-lspconfig', + -- commit = "607ff48b970b89c3e4e3825b88d9cfd05b7aaea5", + requires = { + 'nvim-lua/lsp-status.nvim', + { + 'ms-jpq/coq.thirdparty', + }, + { + 'ms-jpq/coq_nvim', + run = ':COQdeps', + requires = { + 'ms-jpq/coq.artifacts', }, }, - }) - vim.cmd [[highlight link FloatTitle NonText]] - vim.cmd [[highlight link DressingInputText Normal]] - end, - } - - use { - 'antoinemadec/FixCursorHold.nvim', - config = function() - vim.g.cursorhold_updatetime = 500 - end, - } - - use { - 'sirver/ultisnips', - ft = { 'latex', 'plaintex', 'tex' }, - config = function() - vim.g.UltiSnipsExpandTrigger = '' - vim.g.UltiSnipsJumpForwardTrigger = '' - vim.g.UltiSnipsJumpBackwardTrigger = '' - end - } - - use { - 'neovim/nvim-lspconfig', - -- commit = "607ff48b970b89c3e4e3825b88d9cfd05b7aaea5", - requires = { - 'nvim-lua/lsp-status.nvim', - { - 'ms-jpq/coq.thirdparty', - }, - { - 'ms-jpq/coq_nvim', - run = ':COQdeps', - requires = { - 'ms-jpq/coq.artifacts', + { + 'jose-elias-alvarez/null-ls.nvim', + requires = { + 'nvim-lua/plenary.nvim', + }, }, }, - { - 'jose-elias-alvarez/null-ls.nvim', - requires = { - 'nvim-lua/plenary.nvim', - }, - }, - }, - config = import('lsp'), - } + config = import('lsp'), + } - use { - 'lervag/vimtex', - config = function() - vim.g.vimtex_view_general_viewer = 'zathura' - vim.g.vimtex_compiler_method = "latexmk" - -- vim.g.vimtex_view_general_options = = '-x nvim -n -c "Vimtex' - -- 'file:@pdf\\#src:@line@tex' - -- vim.g.vimtex_quickfix_enabled = 0 - -- vim.g.Tex_GotoError = 0 - -- vim.g.Tex_ShowErrorContext = 0 - end, - } + use { + 'lervag/vimtex', + config = function() + vim.g.vimtex_view_general_viewer = 'zathura' + vim.g.vimtex_compiler_method = "latexmk" + -- vim.g.vimtex_view_general_options = = '-x nvim -n -c "Vimtex' + -- 'file:@pdf\\#src:@line@tex' + -- vim.g.vimtex_quickfix_enabled = 0 + -- vim.g.Tex_GotoError = 0 + -- vim.g.Tex_ShowErrorContext = 0 + end, + } - use { - 'iamcco/markdown-preview.nvim', - commit = "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96", - run = "cd app && npm install", - setup = function() vim.g.mkdp_filetypes = { "markdown" } end, ft = { "markdown" }, - config = function() - local map = vim.api.nvim_set_keymap - map('n', '', 'MarkdownPreviewToggle', {}) - map('n', 'm', 'MarkdownPreviewToggle', {}) - vim.g.mkdp_markdown_css = os.getenv("HOME") .. "/.config/nvim/lua/markdownStyle.css" - vim.g.mkdp_highlight_css = os.getenv("HOME") .. "/.cache/wal/colors.css" + use { + 'iamcco/markdown-preview.nvim', + commit = "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96", + run = "cd app && npm install", + setup = function() vim.g.mkdp_filetypes = { "markdown" } end, ft = { "markdown" }, + config = function() + local map = vim.api.nvim_set_keymap + map('n', '', 'MarkdownPreviewToggle', {}) + map('n', 'm', 'MarkdownPreviewToggle', {}) + vim.g.mkdp_markdown_css = os.getenv("HOME") .. "/.config/nvim/lua/markdownStyle.css" + vim.g.mkdp_highlight_css = os.getenv("HOME") .. "/.cache/wal/colors.css" + end + } + + if bootstrap.is_bootstrap then + require('packer').sync() end - } - - if bootstrap.is_bootstrap then - require('packer').sync() - end - -end, + end, config = { compile_path = require('packer.util').join_paths(vim.fn.stdpath('data'), 'site', 'plugin', 'packer_compiled.lua'), - } }) + } +}) diff --git a/nvim/ultisnips/tex.snippets b/nvim/ultisnips/tex.snippets index b3efa28..326015b 100644 --- a/nvim/ultisnips/tex.snippets +++ b/nvim/ultisnips/tex.snippets @@ -67,6 +67,15 @@ snippet table "Table" b \end{table} $0 endsnippet +snippet algorithm "Algorithm" b +\begin{algorithm}[${1:H}] + \caption{$2}\label{tab:$3} + \begin{algorithmic}[${4:1}] + $5 + \end{algorithmic} +\end{algorithm} $0 +endsnippet + priority 100 snippet ... "Ldots" iA \ldots @@ -80,6 +89,10 @@ snippet section "Section" bA \sect{$1}$0 endsnippet +snippet subsection "Subsection" bA +\subsect{$1}$0 +endsnippet + snippet chapter "Chapter" bA \chapter{$1}$0 endsnippet @@ -130,11 +143,6 @@ snippet ali "Align" bA \end{align*} $0 endsnippet -context "math()" -snippet \\\ "Backslash" Ai -\backslash -endsnippet - context "math()" snippet => "Implies" Ai \implies @@ -211,6 +219,12 @@ snippet -> "To" iA \to endsnippet +priority 100 +context "math()" +snippet -< "Gets" iA +\gets +endsnippet + priority 200 context "math()" snippet <-> "Leftrightarrow" iA @@ -347,7 +361,7 @@ endsnippet context "math()" snippet case "Cases" wA -\begin{case} +\begin{cases} $1 \end{cases} $0 endsnippet @@ -732,6 +746,16 @@ snippet AA "For all" iA \forall endsnippet +context "math()" +snippet "such that" "Such that" iA +\suchthat +endsnippet + +context "math()" +snippet "suchthat" "Suchthat" iA +\suchthat +endsnippet + snippet image "Image" wA \begin{figure}[${1:h}] \includegraphics[width=${2:0.5}\textwidth]{$3} @@ -750,8 +774,7 @@ snippet plot "Plot" w \addplot[domain=$2:$3, samples=${6:100}]{$7}; \end{axis} \end{tikzpicture} - \caption{$8} - \label{${9:$8}} + \caption{$8}\label{plot:$9} \end{figure} $0 endsnippet @@ -795,7 +818,7 @@ else: endsnippet snippet ssc "Inline Code" wA -\inlinecode{${1}}{${2}}`!p +{\inlinecode{${1}}{${2}}}`!p if t[2] and t[2][0] not in [',', '.', '?', '-', ' ']: snip.rv = ' ' else: diff --git a/tex/beamercolorthemesimpledark.sty b/tex/beamercolorthemesimpledark.sty index d8235d8..5b51c32 100644 --- a/tex/beamercolorthemesimpledark.sty +++ b/tex/beamercolorthemesimpledark.sty @@ -1,24 +1,16 @@ \usepackage{amsthm, amssymb, amsmath, bm} -\definecolor{gold}{RGB}{234, 157, 52} -\definecolor{rose}{RGB}{215, 130, 126} -\definecolor{foam}{RGB}{86, 148, 159} -\definecolor{text}{RGB}{87, 82, 121} -\definecolor{base}{RGB}{250, 244, 237} -\definecolor{pine}{RGB}{40, 105, 131} -\definecolor{iris}{RGB}{144, 122, 169} -\definecolor{muted}{RGB}{152, 147, 165} -\definecolor{base}{RGB}{250, 244, 237} -\definecolor{love}{RGB}{180, 99, 122} +\definecolor{base}{HTML}{212121} +\definecolor{title}{HTML}{FFFFFF} +\definecolor{text}{HTML}{ADADAD} +\definecolor{url}{HTML}{4DD0E1} +\definecolor{toc}{HTML}{FFAB40} \setbeamercolor{background canvas}{bg=base} -\setbeamercolor{section in toc}{fg=love} -\setbeamercolor{title}{fg=pine} -\setbeamercolor{frametitle}{fg=pine} +\setbeamercolor{section in toc}{fg=toc} +\setbeamercolor{title}{fg=title} +\setbeamercolor{frametitle}{fg=title} \setbeamercolor{normal text}{fg=text} - \setbeamercolor{item}{fg=text} - -\setbeamercolor{frametitle}{fg=pine} -\setbeamercolor{footline}{fg=pine} +\setbeamercolor{footline}{fg=title} diff --git a/tex/booknotes.cls b/tex/booknotes.cls index e8ddf06..48406e9 100644 --- a/tex/booknotes.cls +++ b/tex/booknotes.cls @@ -38,6 +38,8 @@ \RequirePackage{tikz-cd} \RequirePackage{pgfplots} \RequirePackage{hyperref} +\RequirePackage{algpseudocode} +\RequirePackage{algorithm} \hypersetup{ colorlinks=true, @@ -108,11 +110,11 @@ \declaretheorem[style=thmsimple, numbered=no, name=Note]{note} - \newenvironment{code}[1]{\VerbatimEnvironment\begin{minted}[frame=lines,framesep=7pt, linenos, breaklines]{#1}}{\end{minted}} + \newenvironment{code}[1]{\VerbatimEnvironment\begin{minted}[fontfamily=courier, frame=lines,framesep=7pt, linenos, breaklines]{#1}}{\end{minted}} \newcommand{\inlinecode}[2]{\mintinline{#1}|#2|} - \newcommand{\importcode}[2]{\inputminted[frame=lines, framesep=7pt, linenos, breaklines]{#1}{#2}} + \newcommand{\importcode}[2]{\inputminted[fontfamily=courier, frame=lines, framesep=7pt, linenos, breaklines]{#1}{#2}} \newcommand{\specialquote}[2] @@ -314,6 +316,11 @@ \section{#1} } +\newcommand{\subsect}[1]{ + \def\@subsection{#1} + \subsection{#1} +} + \def\@lecture{} \newcommand{\lecture}[2]{ \ifthenelse{\isempty{#2}}{ diff --git a/tex/handout.cls b/tex/handout.cls index b98c4b1..58632b9 100644 --- a/tex/handout.cls +++ b/tex/handout.cls @@ -37,6 +37,8 @@ \RequirePackage{tikz-cd} \RequirePackage{pgfplots} \RequirePackage{parskip} +\RequirePackage{algpseudocode} +\RequirePackage{algorithm} \pgfplotsset{ compat=newest, @@ -94,16 +96,17 @@ \declaretheorem[style=thmproof, name=Proof]{thmproof} \renewenvironment{proof}[1][\proofname]{\begin{thmproof}}{\end{thmproof}} \declaretheorem[style=thmline, numbered=no, name=Proof]{expl} + \declaretheorem[style=thmline, numbered=no, name=Solution]{answ} \declaretheorem[style=thmsimple, numbered=no, name=Remark]{remark} \declaretheorem[style=thmsimple, numbered=no, name=Note]{note} - \newenvironment{code}[1]{\VerbatimEnvironment\begin{minted}[frame=lines,framesep=7pt, linenos, breaklines]{#1}}{\end{minted}} + \newenvironment{code}[1]{\VerbatimEnvironment\begin{minted}[fontfamily=courier, frame=lines,framesep=7pt, linenos, breaklines]{#1}}{\end{minted}} \newcommand{\inlinecode}[2]{\mintinline{#1}|#2|} - \newcommand{\importcode}[2]{\inputminted[frame=lines, framesep=7pt, linenos, breaklines]{#1}{#2}} + \newcommand{\importcode}[2]{\inputminted[fontfamily=courier, frame=lines, framesep=7pt, linenos, breaklines]{#1}{#2}} \newcommand{\specialquote}[2] @@ -227,6 +230,8 @@ \renewenvironment{proof}[1][\proofname]{\begin{thmproof}}{\end{thmproof}} \declaretheorem[style=thmexpl, numbered=no, name=Proof]{thmexpl} \newenvironment{expl}[1][]{\vspace{-12pt}\begin{thmexpl}}{\end{thmexpl}} + \declaretheorem[style=thmexpl, numbered=no, name=Solution]{thmansw} + \newenvironment{answ}[1][]{\vspace{-12pt}\begin{thmansw}}{\end{thmansw}} \declaretheorem[style=thmremark, numbered=no, name=Remark]{remark} \declaretheorem[style=thmremark, numbered=no, name=Note]{note} @@ -306,6 +311,11 @@ \section{#1} } +\newcommand{\subsect}[1]{ + \def\@subsection{#1} + \subsection{#1} +} + \newcommand{\chapter}[1]{} \renewcommand{\part}[1]{} diff --git a/tex/homework.cls b/tex/homework.cls index aaaabaa..c3b68d9 100644 --- a/tex/homework.cls +++ b/tex/homework.cls @@ -36,6 +36,8 @@ \RequirePackage{tikz} \RequirePackage{tikz-cd} \RequirePackage{pgfplots} +\RequirePackage{algpseudocode} +\RequirePackage{algorithm} \pgfplotsset{ compat=newest, @@ -92,17 +94,18 @@ \declaretheorem[style=thmproof, name=Proof]{thmproof} \renewenvironment{proof}[1][\proofname]{\begin{thmproof}}{\end{thmproof}} \declaretheorem[style=thmline, numbered=no, name=Proof]{expl} + \declaretheorem[style=thmline, numbered=no, name=Solution]{answ} \declaretheorem[style=thmsimple, numbered=no, name=Remark]{remark} \declaretheorem[style=thmsimple, numbered=no, name=Note]{note} -\newenvironment{code}[1]{\VerbatimEnvironment\begin{minted}[frame=lines,framesep=7pt, linenos, breaklines]{#1}}{\end{minted}} +\newenvironment{code}[1]{\VerbatimEnvironment\begin{minted}[fontfamily=courier, frame=lines,framesep=7pt, linenos, breaklines]{#1}}{\end{minted}} \newcommand{\inlinecode}[2]{\mintinline{#1}|#2|} -\newcommand{\importcode}[2]{\inputminted[frame=lines, framesep=7pt, linenos, breaklines]{#1}{#2}} +\newcommand{\importcode}[2]{\inputminted[fontfamily=courier, frame=lines, framesep=7pt, linenos, breaklines]{#1}{#2}} \newcommand{\specialquote}[2] { @@ -169,5 +172,10 @@ \section*{#1} } +\newcommand{\subsect}[1]{ + \def\@subsection{#1} + \subsection*{#1} +} + \makeatother diff --git a/tex/notes.cls b/tex/notes.cls index e01e5cb..3adadb8 100644 --- a/tex/notes.cls +++ b/tex/notes.cls @@ -37,6 +37,8 @@ \RequirePackage{tikz-cd} \RequirePackage{pgfplots} \RequirePackage{hyperref} +\RequirePackage{algpseudocode} +\RequirePackage{algorithm} \hypersetup{ colorlinks=true, @@ -107,11 +109,11 @@ \declaretheorem[style=thmsimple, numbered=no, name=Note]{note} - \newenvironment{code}[1]{\VerbatimEnvironment\begin{minted}[frame=lines,framesep=7pt, linenos, breaklines]{#1}}{\end{minted}} + \newenvironment{code}[1]{\VerbatimEnvironment\begin{minted}[fontfamily=courier, frame=lines,framesep=7pt, linenos, breaklines]{#1}}{\end{minted}} \newcommand{\inlinecode}[2]{\mintinline{#1}|#2|} - \newcommand{\importcode}[2]{\inputminted[frame=lines, framesep=7pt, linenos, breaklines]{#1}{#2}} + \newcommand{\importcode}[2]{\inputminted[fontfamily=courier, frame=lines, framesep=7pt, linenos, breaklines]{#1}{#2}} \newcommand{\specialquote}[2] @@ -313,6 +315,11 @@ \subsection{#1} } +\newcommand{\subsect}[1]{ + \def\@subsection{#1} + \subsubsection{#1} +} + \newcommand{\chapter}[1]{ \section{#1} } diff --git a/tex/tex-macros.sty b/tex/tex-macros.sty index 6bdce94..701fa33 100644 --- a/tex/tex-macros.sty +++ b/tex/tex-macros.sty @@ -12,8 +12,13 @@ \newcommand{\Z}{\ensuremath{\mathbb{Z}}} \newcommand{\R}{\ensuremath{\mathbb{R}}} \newcommand{\Q}{\ensuremath{\mathbb{Q}}} -\newcommand\C{\ensuremath{\mathbb{C}}} +\newcommand{\C}{\ensuremath{\mathbb{C}}} +\newcommand{\D}{\ensuremath{\mathbb{D}}} +\newcommand{\suchthat}{\ensuremath{\text{ such that }}} +\newcommand{\BigO}{\ensuremath{\mathcal{O}}} +\newcommand{\BigOm}{\ensuremath{\Omega}} +\newcommand{\BigT}{\ensuremath{\Theta}} \DeclareMathOperator{\GL}{GL} \DeclareMathOperator{\Imm}{Im} @@ -23,3 +28,4 @@ \DeclareMathOperator{\Hol}{Hol} \DeclareMathOperator{\Arg}{Arg} \DeclareMathOperator{\Log}{Log} +\DeclareMathOperator{\Var}{Var}