From c01afa63c57c7482ffe3485a9f6df671565819cb Mon Sep 17 00:00:00 2001 From: Jonathan Hodgson Date: Tue, 8 Jan 2019 16:26:44 +0000 Subject: [PATCH 1/2] Lots of config changes to things --- Templates/fpldoc.md | 1 - bin/ddspawn | 19 ++ bin/dropdowncalc | 5 + bin/dropdownnotepad | 3 + bin/qrcode | 2 +- bin/showI3Help | 21 +- config/ranger/scope.sh | 2 +- git/gitconfig | 2 +- i3/configWork | 17 +- pandoc/defaults.yaml | 3 + pandoc/templates/fellowship.latex | 342 +++++++++++++++++++++++--- pandoc/templates/fellowship.latex.old | 248 +++++++++++++++++++ qutebrowser/config.py | 5 + shells/aliases | 4 + shells/functions | 2 +- 15 files changed, 619 insertions(+), 57 deletions(-) create mode 100755 bin/ddspawn create mode 100755 bin/dropdowncalc create mode 100755 bin/dropdownnotepad create mode 100644 pandoc/templates/fellowship.latex.old diff --git a/Templates/fpldoc.md b/Templates/fpldoc.md index 664dc9b7..0b31620e 100644 --- a/Templates/fpldoc.md +++ b/Templates/fpldoc.md @@ -1,5 +1,4 @@ --- -colorlinks: true author-meta: Fellowship Productions Ltd title-meta: <++> subject: <++> diff --git a/bin/ddspawn b/bin/ddspawn new file mode 100755 index 00000000..38993a88 --- /dev/null +++ b/bin/ddspawn @@ -0,0 +1,19 @@ +#!/bin/sh + +#Stolen / Borrowed from Luke Smith https://github.com/LukeSmithxyz/voidrice/blob/master/.scripts/i3cmds/ddspawn + +# Toggle floating dropdown terminal in i3, or start if non-existing. +# $1 is the script run in the terminal. +# All other args are terminal settings. +# Terminal names are in dropdown_* to allow easily setting i3 settings. + +[ -z "$1" ] && exit + +if xwininfo -tree -root | grep "(\"dropdown_$1\" "; +then + echo "Window detected." + i3 "[instance=\"dropdown_$1\"] scratchpad show; [instance=\"dropdown_$1\"] move position center" +else + echo "Window not detected... spawning." + i3 "exec --no-startup-id $TERMINAL -n dropdown_$1 $(echo "$@" | cut -d ' ' -f2-) -e $1" +fi diff --git a/bin/dropdowncalc b/bin/dropdowncalc new file mode 100755 index 00000000..fee8f07f --- /dev/null +++ b/bin/dropdowncalc @@ -0,0 +1,5 @@ +#!/bin/sh +# This script ensures that i3 will spawn a calculator. +# If R is installed, it will run R, otherwise it will run +# Python. +([ -e /usr/bin/R ] && R -q --no-save) || python -q diff --git a/bin/dropdownnotepad b/bin/dropdownnotepad new file mode 100755 index 00000000..4b3f1d73 --- /dev/null +++ b/bin/dropdownnotepad @@ -0,0 +1,3 @@ +#!/usr/bin/env sh + +vim --servername jab2870 -c 'startinsert' diff --git a/bin/qrcode b/bin/qrcode index 73330d07..5b73dbd5 100755 --- a/bin/qrcode +++ b/bin/qrcode @@ -1,2 +1,2 @@ #!/usr/bin/bash -echo "$@" | curl -F-=\<- qrenco.de +echo "$@" | qrencode -s 50 -o /tmp/qrcode && sxiv -f /tmp/qrcode && rm /tmp/qrcode diff --git a/bin/showI3Help b/bin/showI3Help index e4e1a057..332d114a 100755 --- a/bin/showI3Help +++ b/bin/showI3Help @@ -7,13 +7,13 @@ function format0to9 { sed -E '/\$mod(\+Shift)?\+0/ { s/0/[1-9,0]/; s/10/[1-10]/g}' } -function formatExec { +function formatLine { while read line; do if echo "$line" | grep -q "exec"; then - echo "Do Stuff $line" - + echo "$line" |\ + awk '{print "# "$1 "\n"; $1=$2=""; print " Runs the shell command: \n\n```bash\n" $0 "\n```\n" }' else - echo "$line" + echo "$line" | awk '{print "# "$1 "\n"; $1=""; print $0 "\n" }' fi done; } @@ -27,13 +27,14 @@ cat $HOME/.dotfiles/i3/configWork |\ sort |\ #Makes Formats [0-9] format0to9 |\ - formatExec |\ - #Formats simple markdown - awk '{print "# "$1 "\n"; $1=""; print $0 "\n" }' |\ + #Goes through each line and turns it into simple markdown + formatLine |\ #Converts markdown to groff ms - pandoc -f markdown -t ms |\ + #pandoc -f markdown -t ms |\ + pandoc -f markdown -t latex -o ~/test.pdf #Converts groff to pdf - groff -ms - -T pdf |\ + #groff -ms - -T pdf > ~/test.pdf + #groff -ms - -T pdf |\ #Opens PDF - zathura - + #zathura - diff --git a/config/ranger/scope.sh b/config/ranger/scope.sh index 58b78bc4..49b02d9c 100755 --- a/config/ranger/scope.sh +++ b/config/ranger/scope.sh @@ -117,7 +117,7 @@ case "$mimetype" in pygmentize_format=terminal highlight_format=ansi fi - bat --style="numbers" --color always "$path" && { dump | trim; exit 5; } + bat --style="numbers" --color always --line-range :$maxln "$path" && { dump | trim; exit 5; } try safepipe highlight --out-format=${highlight_format} "$path" && { dump | trim; exit 5; } try safepipe pygmentize -f ${pygmentize_format} "$path" && { dump | trim; exit 5; } exit 2;; diff --git a/git/gitconfig b/git/gitconfig index 80892d73..0c97e5fc 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -2,7 +2,7 @@ email = jonathan@lunarweb.co.uk name = Jonathan Hodgson [core] - editor = vim + editor = vim -c 'startinsert' excludesfile = ~/.dotfiles/git/global_gitignore [status] submoduleSummary = true diff --git a/i3/configWork b/i3/configWork index 33553cbe..6c44fa02 100644 --- a/i3/configWork +++ b/i3/configWork @@ -143,11 +143,10 @@ bindsym $mod+Shift+space floating toggle bindsym $mod+space focus mode_toggle # focus the parent container -bindsym $mod+a focus parent - -# focus the child container -#bindsym $mod+Shift+a focus child +#bindsym $mod+Shift+a focus parent +bindsym $mod+a exec --no-startup-id ddspawn dropdowncalc -f mono:pixelsize=24 +bindsym $mod+shift+a exec --no-startup-id ddspawn dropdownnotepad #set workspace names set $workspace1 "1: Browser " @@ -376,6 +375,16 @@ mode "$mode_gaps_outer" { bindsym Escape mode "default" } +# General dropdown window traits. The order can matter. +for_window [instance="dropdown_*"] floating enable +for_window [instance="dropdown_*"] move scratchpad +for_window [instance="dropdown_*"] sticky enable +for_window [instance="dropdown_*"] scratchpad show +for_window [instance="dropdown_*"] resize set 1200 600 +for_window [instance="dropdown_*"] border pixel 20 +for_window [instance="dropdown_*"] move position center + + exec --no-startup-id redshift exec --no-startup-id compton -f -i 0.95 exec_always --no-startup-id /usr/lib/kdeconnectd diff --git a/pandoc/defaults.yaml b/pandoc/defaults.yaml index 28edaa52..587da638 100644 --- a/pandoc/defaults.yaml +++ b/pandoc/defaults.yaml @@ -1 +1,4 @@ colorlinks: true +geometry: 'margin=1in' +fontsize: 12pt +papersize: a4paper diff --git a/pandoc/templates/fellowship.latex b/pandoc/templates/fellowship.latex index 9250c5ca..8512b7ef 100644 --- a/pandoc/templates/fellowship.latex +++ b/pandoc/templates/fellowship.latex @@ -1,39 +1,180 @@ -\PassOptionsToPackage{unicode=true}{hyperref} % options for packages loaded elsewhere +\PassOptionsToPackage{unicode=true$for(hyperrefoptions)$,$hyperrefoptions$$endfor$}{hyperref} % options for packages loaded elsewhere \PassOptionsToPackage{hyphens}{url} $if(colorlinks)$ \PassOptionsToPackage{dvipsnames,svgnames*,x11names*}{xcolor} $endif$$if(dir)$$if(latex-dir-rtl)$ \PassOptionsToPackage{RTLdocument}{bidi} $endif$$endif$% -\documentclass[12pt,a4paper]{article} +\documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$babel-lang$,$endif$$if(papersize)$$papersize$paper,$endif$$if(beamer)$ignorenonframetext,$if(handout)$handout,$endif$$if(aspectratio)$aspectratio=$aspectratio$,$endif$$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$} +$if(beamer)$ +$if(background-image)$ +\usebackgroundtemplate{% +\includegraphics[width=\paperwidth]{$background-image$}% +} +$endif$ +\usepackage{pgfpages} +\setbeamertemplate{caption}[numbered] +\setbeamertemplate{caption label separator}{: } +\setbeamercolor{caption name}{fg=normal text.fg} +\beamertemplatenavigationsymbols$if(navigation)$$navigation$$else$empty$endif$ +$for(beameroption)$ +\setbeameroption{$beameroption$} +$endfor$ +% Prevent slide breaks in the middle of a paragraph: +\widowpenalties 1 10000 +\raggedbottom +$if(section-titles)$ +\setbeamertemplate{part page}{ +\centering +\begin{beamercolorbox}[sep=16pt,center]{part title} + \usebeamerfont{part title}\insertpart\par +\end{beamercolorbox} +} +\setbeamertemplate{section page}{ +\centering +\begin{beamercolorbox}[sep=12pt,center]{part title} + \usebeamerfont{section title}\insertsection\par +\end{beamercolorbox} +} +\setbeamertemplate{subsection page}{ +\centering +\begin{beamercolorbox}[sep=8pt,center]{part title} + \usebeamerfont{subsection title}\insertsubsection\par +\end{beamercolorbox} +} +\AtBeginPart{ + \frame{\partpage} +} +\AtBeginSection{ + \ifbibliography + \else + \frame{\sectionpage} + \fi +} +\AtBeginSubsection{ + \frame{\subsectionpage} +} +$endif$ +$endif$ +$if(beamerarticle)$ +\usepackage{beamerarticle} % needs to be loaded first +$endif$ +$if(fontfamily)$ +\usepackage[$for(fontfamilyoptions)$$fontfamilyoptions$$sep$,$endfor$]{$fontfamily$} +$else$ +\usepackage{lmodern} +$endif$ +$if(linestretch)$ +\usepackage{setspace} +\setstretch{$linestretch$} +$endif$ \usepackage{amssymb,amsmath} \usepackage{ifxetex,ifluatex} \usepackage{fixltx2e} % provides \textsubscript -$if(colorlinks)$ -\usepackage{xcolor} +\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex + \usepackage[$if(fontenc)$$fontenc$$else$T1$endif$]{fontenc} + \usepackage[utf8]{inputenc} + \usepackage{textcomp} % provides euro and other symbols +\else % if luatex or xelatex +$if(mathspec)$ + \ifxetex + \usepackage{mathspec} + \else + \usepackage{unicode-math} + \fi +$else$ + \usepackage{unicode-math} +$endif$ + \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase} + +\usepackage{url} +\urlstyle{same} % don't use monospace font for urls +\usepackage{ifxetex} +\ifxetex + \usepackage{fontspec} + \setmainfont[ + BoldFont={AvenirNextLTProBold}, + ]{Avenir LT Std} +\fi +\makeatletter +\setlength{\parskip}{1em} +\renewcommand{\@seccntformat}[1]{} +\makeatother + +$if(mathfont)$ +$if(mathspec)$ + \ifxetex + \setmathfont(Digits,Latin,Greek)[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$} + \else + \setmathfont[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$} + \fi +$else$ + \setmathfont[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$} +$endif$ +$endif$ +$if(CJKmainfont)$ + \ifxetex + \usepackage{xeCJK} + \setCJKmainfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$} + \fi +$endif$ +$if(luatexjapresetoptions)$ + \ifluatex + \usepackage[$for(luatexjapresetoptions)$$luatexjapresetoptions$$sep$,$endfor$]{luatexja-preset} + \fi +$endif$ +$if(CJKmainfont)$ + \ifluatex + \usepackage[$for(luatexjafontspecoptions)$$luatexjafontspecoptions$$sep$,$endfor$]{luatexja-fontspec} + \setmainjfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$} + \fi +$endif$ +\fi +$if(beamer)$ +$if(theme)$ +\usetheme[$for(themeoptions)$$themeoptions$$sep$,$endfor$]{$theme$} +$endif$ +$if(colortheme)$ +\usecolortheme{$colortheme$} +$endif$ +$if(fonttheme)$ +\usefonttheme{$fonttheme$} +$endif$ +$if(mainfont)$ +\usefonttheme{serif} % use mainfont rather than sansfont for slide text +$endif$ +$if(innertheme)$ +\useinnertheme{$innertheme$} +$endif$ +$if(outertheme)$ +\useoutertheme{$outertheme$} +$endif$ +$endif$ +% use upquote if available, for straight quotes in verbatim environments +\IfFileExists{upquote.sty}{\usepackage{upquote}}{} +% use microtype if available +\IfFileExists{microtype.sty}{% +\usepackage[$for(microtypeoptions)$$microtypeoptions$$sep$,$endfor$]{microtype} +\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts +}{} +$if(indent)$ +$else$ +\IfFileExists{parskip.sty}{% +\usepackage{parskip} +}{% else +\setlength{\parindent}{0pt} +\setlength{\parskip}{6pt plus 2pt minus 1pt} +} +$endif$ +$if(verbatim-in-note)$ +\usepackage{fancyvrb} $endif$ -\providecommand{\tightlist}{% - \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} \usepackage{xcolor} \definecolor{fplgreen}{HTML}{769A8C} \usepackage{sectsty} \sectionfont{\color{fplgreen}} \subsectionfont{\color{fplgreen}} \subsubsectionfont{\color{fplgreen}} - -\makeatletter -\let\oldquote\quote -\def\quote{\@ifnextchar[\quote@i \quote@ii} -\def\quote@i[#1]{\oldquote[#1]\itshape} -\def\quote@ii{\oldquote\itshape} -\makeatother - - -%\usepackage[document]{ragged2e} -\usepackage{ragged2e} -\justifying - - \usepackage{hyperref} \hypersetup{ $if(title-meta)$ @@ -59,24 +200,16 @@ $else$ $endif$ breaklinks=true} \urlstyle{same} % don't use monospace font for urls -\usepackage{ifxetex} -\ifxetex - \usepackage{fontspec} - \setmainfont[ - BoldFont={AvenirNextLTProBold}, - ]{Avenir LT Std} -\fi -\makeatletter -\setlength{\parskip}{1em} -\renewcommand{\@seccntformat}[1]{} -\makeatother - - -\usepackage{indentfirst} -\setlength{\parindent}{0pt} +$if(verbatim-in-note)$ +\VerbatimFootnotes % allows verbatim text in footnotes +$endif$ +$if(geometry)$ +\usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry} +$else$ \usepackage{geometry} +$endif$ \geometry{ - paper=$if(papersize)$$papersize$$else$a4$endif$paper, % Change to a4 + paper=$if(papersize)$$papersize$$else$a4paper$endif$, % Change to a4 top=3cm, % Top margin bottom=0cm, % Bottom margin left=2cm, % Left margin @@ -84,8 +217,31 @@ $endif$ includefoot %showframe, % Uncomment to show how the type block is set on the page } +$if(beamer)$ +\newif\ifbibliography +$endif$ +$if(listings)$ +\usepackage{listings} +\newcommand{\passthrough}[1]{#1} +$endif$ +$if(lhs)$ +\lstnewenvironment{code}{\lstset{language=Haskell,numbers=left,basicstyle=\small\ttfamily}}{} +$endif$ +$if(highlighting-macros)$ +$highlighting-macros$ +$endif$ $if(tables)$ \usepackage{longtable,booktabs} +$if(beamer)$ +\usepackage{caption} +% These lines are needed to make table captions work with longtable: +\makeatletter +\def\fnum@table{\tablename~\thetable} +\makeatother +$else$ +% Fix footnotes in tables (requires footnote package) +\IfFileExists{footnote.sty}{\usepackage{footnote}\makesavenoteenv{longtable}}{} +$endif$ $endif$ \usepackage{graphicx,grffile} \makeatletter @@ -96,16 +252,117 @@ $endif$ % margins by default, and it is still possible to overwrite the defaults % using explicit options in \includegraphics[width, height, ...]{} \setkeys{Gin}{width=\maxwidth,height=\maxheight,keepaspectratio} +$if(links-as-notes)$ +% Make links footnotes instead of hotlinks: +\DeclareRobustCommand{\href}[2]{#2\footnote{\url{#1}}} +$endif$ $if(strikeout)$ \usepackage[normalem]{ulem} % avoid problems with \sout in headers with hyperref: \pdfstringdefDisableCommands{\renewcommand{\sout}{}} $endif$ +\setlength{\emergencystretch}{3em} % prevent overfull lines +\providecommand{\tightlist}{% + \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} +$if(numbersections)$ +\setcounter{secnumdepth}{$if(secnumdepth)$$secnumdepth$$else$5$endif$} +$else$ +\setcounter{secnumdepth}{0} +$endif$ +$if(beamer)$ +$else$ +$if(subparagraph)$ +$else$ +% Redefines (sub)paragraphs to behave more like sections +\ifx\paragraph\undefined\else +\let\oldparagraph\paragraph +\renewcommand{\paragraph}[1]{\oldparagraph{#1}\mbox{}} +\fi +\ifx\subparagraph\undefined\else +\let\oldsubparagraph\subparagraph +\renewcommand{\subparagraph}[1]{\oldsubparagraph{#1}\mbox{}} +\fi +$endif$ +$endif$ +$if(pagestyle)$ +\pagestyle{$pagestyle$} +$endif$ % set default figure placement to htbp \makeatletter \def\fps@figure{htbp} \makeatother +$if(dont-wrap-code)$ +$else$ + \usepackage{fvextra} + \DefineVerbatimEnvironment{Highlighting}{Verbatim}{breaklines,breaksymbol=\indent,commandchars=\\\{\},numbers=left} +$endif$ +$for(header-includes)$ +$header-includes$ +$endfor$ +$if(lang)$ +\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex + \usepackage[shorthands=off,$for(babel-otherlangs)$$babel-otherlangs$,$endfor$main=$babel-lang$]{babel} +$if(babel-newcommands)$ + $babel-newcommands$ +$endif$ +\else + % load polyglossia as late as possible as it *could* call bidi if RTL lang (e.g. Hebrew or Arabic) + \usepackage{polyglossia} + \setmainlanguage[$polyglossia-lang.options$]{$polyglossia-lang.name$} +$for(polyglossia-otherlangs)$ + \setotherlanguage[$polyglossia-otherlangs.options$]{$polyglossia-otherlangs.name$} +$endfor$ +\fi +$endif$ +$if(dir)$ +\ifxetex + % load bidi as late as possible as it modifies e.g. graphicx + \usepackage{bidi} +\fi +\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex + \TeXXeTstate=1 + \newcommand{\RL}[1]{\beginR #1\endR} + \newcommand{\LR}[1]{\beginL #1\endL} + \newenvironment{RTL}{\beginR}{\endR} + \newenvironment{LTR}{\beginL}{\endL} +\fi +$endif$ +$if(natbib)$ +\usepackage[$natbiboptions$]{natbib} +\bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$} +$endif$ +$if(biblatex)$ +\usepackage[$if(biblio-style)$style=$biblio-style$,$endif$$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$]{biblatex} +$for(bibliography)$ +\addbibresource{$bibliography$} +$endfor$ +$endif$ + +$if(title)$ +\title{$title$$if(thanks)$\thanks{$thanks$}$endif$} +$endif$ +$if(subtitle)$ +\providecommand{\subtitle}[1]{} +\subtitle{$subtitle$} +$endif$ +$if(author)$ +\author{$for(author)$$author$$sep$ \and $endfor$} +$endif$ +$if(institute)$ +\providecommand{\institute}[1]{} +\institute{$for(institute)$$institute$$sep$ \and $endfor$} +$endif$ +\date{$date$} +$if(beamer)$ +$if(titlegraphic)$ +\titlegraphic{\includegraphics{$titlegraphic$}} +$endif$ +$if(logo)$ +\logo{\includegraphics{$logo$}} +$endif$ +$endif$ + % https://tex.stackexchange.com/questions/34040/graphics-logo-in-headers @@ -117,7 +374,7 @@ $endif$ \chead{} \renewcommand{\headrulewidth}{0pt} \setlength{\headheight}{80pt} % round to the point -\setlength{\footskip}{54pt} +\setlength{\footskip}{57pt} \addtolength{\topmargin}{-4\baselineskip} \addtolength{\textheight}{-96pt} @@ -158,6 +415,10 @@ $endif$ \righthyphenmin=5 \lefthyphenmin=5 + + + + \begin{document} $if(title)$ $if(beamer)$ @@ -168,7 +429,6 @@ $endif$ $if(abstract)$ \begin{abstract} $abstract$ - \end{abstract} $endif$ $endif$ @@ -178,8 +438,14 @@ $include-before$ $endfor$ $if(toc)$ +$if(toc-title)$ +\renewcommand*\contentsname{$toc-title$} +$endif$ $if(beamer)$ \begin{frame} +$if(toc-title)$ +\frametitle{$toc-title$} +$endif$ \tableofcontents[hideallsubsections] \end{frame} $else$ diff --git a/pandoc/templates/fellowship.latex.old b/pandoc/templates/fellowship.latex.old new file mode 100644 index 00000000..5d720c3b --- /dev/null +++ b/pandoc/templates/fellowship.latex.old @@ -0,0 +1,248 @@ +\PassOptionsToPackage{unicode=true}{hyperref} % options for packages loaded elsewhere +\PassOptionsToPackage{hyphens}{url} +$if(colorlinks)$ +\PassOptionsToPackage{dvipsnames,svgnames*,x11names*}{xcolor} +$endif$$if(dir)$$if(latex-dir-rtl)$ +\PassOptionsToPackage{RTLdocument}{bidi} +$endif$$endif$% +\documentclass[12pt,a4paper]{article} +\usepackage{amssymb,amsmath} +\usepackage{ifxetex,ifluatex} +\usepackage{fixltx2e} % provides \textsubscript +$if(colorlinks)$ +\usepackage{xcolor} +$endif$ +\providecommand{\tightlist}{% + \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} +\usepackage{xcolor} +\definecolor{fplgreen}{HTML}{769A8C} +\usepackage{sectsty} +\sectionfont{\color{fplgreen}} +\subsectionfont{\color{fplgreen}} +\subsubsectionfont{\color{fplgreen}} + +\makeatletter +\let\oldquote\quote +\def\quote{\@ifnextchar[\quote@i \quote@ii} +\def\quote@i[#1]{\oldquote[#1]\itshape} +\def\quote@ii{\oldquote\itshape} +\makeatother + + +%\usepackage[document]{ragged2e} +\usepackage{ragged2e} +\justifying + + +\usepackage{hyperref} +\hypersetup{ +$if(title-meta)$ + pdftitle={$title-meta$}, +$endif$ +$if(author-meta)$ + pdfauthor={$author-meta$}, +$endif$ +$if(subject)$ + pdfsubject={$subject$}, +$endif$ +$if(keywords)$ + pdfkeywords={$for(keywords)$$keywords$$sep$, $endfor$}, +$endif$ + pdfproducer={Fellowship PDF Creator}, +$if(colorlinks)$ + colorlinks=true, + linkcolor=$if(linkcolor)$$linkcolor$$else$fplgreen$endif$, + citecolor=$if(citecolor)$$citecolor$$else$fplgreen$endif$, + urlcolor=$if(urlcolor)$$urlcolor$$else$fplgreen$endif$, +$else$ + pdfborder={0 0 0}, +$endif$ + breaklinks=true} +\urlstyle{same} % don't use monospace font for urls +\usepackage{ifxetex} +\ifxetex + \usepackage{fontspec} + \setmainfont[ + BoldFont={AvenirNextLTProBold}, + ]{Avenir LT Std} +\fi +\makeatletter +\setlength{\parskip}{1em} +\renewcommand{\@seccntformat}[1]{} +\makeatother + +$if(listings)$ +\usepackage{listings} +\newcommand{\passthrough}[1]{#1} +$endif$ +$if(lhs)$ +\lstnewenvironment{code}{\lstset{language=Haskell,numbers=left,basicstyle=\small\ttfamily}}{} +$endif$ + +\usepackage{indentfirst} +\setlength{\parindent}{0pt} +\usepackage{geometry} +\geometry{ + paper=$if(papersize)$$papersize$$else$a4$endif$paper, % Change to a4 + top=3cm, % Top margin + bottom=0cm, % Bottom margin + left=2cm, % Left margin + right=2cm, % Right margin + includefoot + %showframe, % Uncomment to show how the type block is set on the page +} +$if(tables)$ +\usepackage{longtable,booktabs} +$endif$ +\usepackage{graphicx,grffile} +\makeatletter +\def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth\else\Gin@nat@width\fi} +\def\maxheight{\ifdim\Gin@nat@height>\textheight\textheight\else\Gin@nat@height\fi} +\makeatother +% Scale images if necessary, so that they will not overflow the page +% margins by default, and it is still possible to overwrite the defaults +% using explicit options in \includegraphics[width, height, ...]{} +\setkeys{Gin}{width=\maxwidth,height=\maxheight,keepaspectratio} +$if(strikeout)$ +\usepackage[normalem]{ulem} +% avoid problems with \sout in headers with hyperref: +\pdfstringdefDisableCommands{\renewcommand{\sout}{}} +$endif$ + +% set default figure placement to htbp +\makeatletter +\def\fps@figure{htbp} +\makeatother + + +% https://tex.stackexchange.com/questions/34040/graphics-logo-in-headers +\usepackage{fancyhdr} +\pagestyle{fancy} +\fancyhf{} +\lhead{\includegraphics{~/.dotfiles/pandoc/templates/assets/logo.jpg}} +\rhead{} +\chead{} +\renewcommand{\headrulewidth}{0pt} +\setlength{\headheight}{80pt} % round to the point +\setlength{\footskip}{54pt} +\addtolength{\topmargin}{-4\baselineskip} +\addtolength{\textheight}{-96pt} + +\fancyfoot{} +%\fancyheadoffset[LE, RO]{1cm} +%\fancyhead[c]{% +%This is a test} +%\fancyhead[L]{% +%\small\sffamily\sc \makebox[1cm]{\{\thepage\}}\leftmark} + +\usepackage{moresize} +\fancyfoot[C]{% + \vspace{3.5em} + \centerline{% + \colorbox{fplgreen}{\parbox[b][0.5cm][t]{\paperwidth}{~}}% + } +} +\fancyfoot[L]{% + {\vspace{0.5cm}\parbox{0.8\textwidth}{\tiny Registered Office: Greenwood House, Greenwood Court, Skyliner Way, Bury Saint Edmunds IP32 7GY\\[0.1cm] + Registered in England and Wales. Company Registration Number: 4479565}} +} +\fancyfoot[R]{% + \hspace{1cm}\parbox{0.3\textwidth}{% + \begin{center} + \scriptsize + \textcolor{fplgreen}{\textbf{Fellowship Productions Limited}}\\[0.1cm] + Fosters Barn\\ + Shimpling Road - Hartest\\ + Bury St Edmunds\\ + ***REMOVED*** IP29 4ET\\[0.1cm] + \textcolor{fplgreen}{\textbf{T:}} \href{tel:+441284830888}{\color{black}{01284 830888}}\\ + \textcolor{fplgreen}{\textbf{E:}} \href{mailto:info@fellowshipproductions.co.uk}{\color{black}{info@fellowshipproductions.co.uk}}\\ + \textcolor{fplgreen}{\textbf{W:}} \href{https://www.fellowshipproductions.co.uk}{\color{black}{www.fellowshipproductions.co.uk}}\\ + \end{center} + } +} + +\righthyphenmin=5 +\lefthyphenmin=5 + + \usepackage{fvextra} + \DefineVerbatimEnvironment{Highlighting}{Verbatim}{breaklines,breaksymbol=\indent,commandchars=\\\{\},numbers=left} + +\begin{document} +$if(title)$ +$if(beamer)$ +\frame{\titlepage} +$else$ +\maketitle +$endif$ +$if(abstract)$ +\begin{abstract} +$abstract$ + +\end{abstract} +$endif$ +$endif$ + +$for(include-before)$ +$include-before$ + +$endfor$ +$if(toc)$ +$if(beamer)$ +\begin{frame} +\tableofcontents[hideallsubsections] +\end{frame} +$else$ +{ +$if(colorlinks)$ +\hypersetup{linkcolor=$if(toccolor)$$toccolor$$else$$endif$} +$endif$ +\setcounter{tocdepth}{$toc-depth$} +\tableofcontents +} +$endif$ +$endif$ +$if(lot)$ +\listoftables +$endif$ +$if(lof)$ +\listoffigures +$endif$ +$body$ + +$if(natbib)$ +$if(bibliography)$ +$if(biblio-title)$ +$if(book-class)$ +\renewcommand\bibname{$biblio-title$} +$else$ +\renewcommand\refname{$biblio-title$} +$endif$ +$endif$ +$if(beamer)$ +\begin{frame}[allowframebreaks]{$biblio-title$} +\bibliographytrue +$endif$ +\bibliography{$for(bibliography)$$bibliography$$sep$,$endfor$} +$if(beamer)$ +\end{frame} +$endif$ + +$endif$ +$endif$ +$if(biblatex)$ +$if(beamer)$ +\begin{frame}[allowframebreaks]{$biblio-title$} +\bibliographytrue +\printbibliography[heading=none] +\end{frame} +$else$ +\printbibliography$if(biblio-title)$[title=$biblio-title$]$endif$ +$endif$ + +$endif$ +$for(include-after)$ +$include-after$ + +$endfor$ +\end{document} diff --git a/qutebrowser/config.py b/qutebrowser/config.py index b3fff290..8e527edd 100644 --- a/qutebrowser/config.py +++ b/qutebrowser/config.py @@ -23,6 +23,11 @@ config.bind(',m', 'spawn --detach mpv {url}') # ,M hints and oens choice with mpv config.bind(',M', 'hint links spawn --detach mpv {hint-url}') +config.bind(',z', 'hint links spawn --detach zathura {hint-url}') + +config.bind(',q', 'spawn --detach qrcode {url}') +config.bind(',Q', 'hint links spawn --detach qrcode {hint-url}') + # Position of the tab bar. # Type: Position # Valid values: diff --git a/shells/aliases b/shells/aliases index 963034cc..14f26c28 100644 --- a/shells/aliases +++ b/shells/aliases @@ -147,3 +147,7 @@ alias servermem='toilet -w 200 "VPS 01" && ssh shires free -h && toilet -w 200 " # Updates time using ntp alias updateTime="sudo ntpd -qg" + +# Keyboard - reset +# Sometimes, if I turn the screens off, the keyboard resets itself to defaults. Not sure why but this will put my keyboard back to how I like it +alias kb="xmodmap ~/.Xmodmap; xset r rate 200 70; xcape" diff --git a/shells/functions b/shells/functions index dbe024c1..b462fd77 100644 --- a/shells/functions +++ b/shells/functions @@ -81,7 +81,7 @@ function createFPLreport(){ newFile="$1" newFile="${newFile%.*}.pdf" fi - pandoc --template fellowship.latex --pdf-engine=xelatex $1 -o $newFile + pandoc --template fellowship.latex --listings --highlight-style=pygments --pdf-engine=xelatex $1 -o $newFile else echo "Oops. You need to suply a file" return 1 From 3203b24b794ca6d60ae35e57c7efa4d62f2ba35a Mon Sep 17 00:00:00 2001 From: Jonathan Hodgson Date: Tue, 8 Jan 2019 16:29:15 +0000 Subject: [PATCH 2/2] Adds some comments --- qutebrowser/config.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qutebrowser/config.py b/qutebrowser/config.py index 8e527edd..78bc4530 100644 --- a/qutebrowser/config.py +++ b/qutebrowser/config.py @@ -23,9 +23,12 @@ config.bind(',m', 'spawn --detach mpv {url}') # ,M hints and oens choice with mpv config.bind(',M', 'hint links spawn --detach mpv {hint-url}') +# Opens a url with zathura - this is only really useful if the url is a pdf config.bind(',z', 'hint links spawn --detach zathura {hint-url}') +# Shows QR code for current page config.bind(',q', 'spawn --detach qrcode {url}') +# Shows QR code for chosen link config.bind(',Q', 'hint links spawn --detach qrcode {hint-url}') # Position of the tab bar.