From 6ce1eda75a75a394a93ed9d7a5bc75477be41f45 Mon Sep 17 00:00:00 2001 From: Frieder Schlesier Date: Sat, 7 Nov 2020 19:05:22 +0100 Subject: [PATCH] updates --- .i3/config | 21 ++++++++++++++------- .i3/status.conf | 4 ++-- .i3/status_small.conf | 6 ++++-- .path | 2 +- .spacemacs | 3 +++ scripts/install.sh | 15 ++++++++++++++- 6 files changed, 38 insertions(+), 13 deletions(-) diff --git a/.i3/config b/.i3/config index 2278a9e..add8b13 100755 --- a/.i3/config +++ b/.i3/config @@ -111,16 +111,22 @@ assign [class=".*ee.*ass.*"] $WS8 # https://faq.i3wm.org/question/3726/workspace-output-multiple-values/index.html%3Fanswer=3731.html#post-id-3731 set $LAPTOP LVDS-1 -set $CENTER VGA-1 -#set $CENTER HDMI-1 -#set $CENTER DP-1 +set $CENTER HDMI-1 +set $RIGHT VGA-1 # monitor settings bindsym $mod+m mode "monitor" mode "monitor" { + # only laptop bindsym 1 exec xrandr --output $LAPTOP --auto --primary --output $CENTER --off $RIGHT --off - bindsym 2 exec xrandr --output $CENTER --primary --auto --output $LAPTOP --auto --left-of $CENTER - #bindsym 3 exec xrandr --output $CENTER --primary --auto --output $LAPTOP --auto --left-of $CENTER --output $RIGHT --auto --right-of $CENTER + # HDMI main, laptop secondary + bindsym 2 exec xrandr --output $CENTER --primary --auto --output $LAPTOP --auto --left-of $CENTER --output $RIGHT --off + # HDMI main, laptop left, VGA right, *not* supported on X230 + bindsym 3 exec xrandr --output $CENTER --primary --auto --output $LAPTOP --auto --left-of $CENTER --output $RIGHT --auto --right-of $CENTER + # VGA main, laptop left, HDMI off + bindsym 8 exec xrandr --output $RIGHT --primary --auto --output $LAPTOP --auto --left-of $RIGHT --output $CENTER --off + # HDMI main, VGA right, laptop off + bindsym 9 exec xrandr --output $CENTER --primary --auto --output $RIGHT --auto --right-of $CENTER --output $LAPTOP --off # back to normal: Enter or Escape bindsym Return mode "default" @@ -224,8 +230,7 @@ bar { bar { output $CENTER - output DP-1 - output HDMI-1 + output $RIGHT status_command i3status --config ~/.i3/status_small.conf tray_output $LAPTOP } @@ -240,6 +245,7 @@ bar { #exec xrdb -merge /home/jessie/.Xresources #exec xrdb -merge /home/jessie/.Xdefaults + # startup programs exec amixer set Master 1+ off exec amixer set Master 54 @@ -253,3 +259,4 @@ exec --no-startup-id i3-msg 'exec thunderbird' exec --no-startup-id i3-msg 'exec keepassxc' # exec --no-startup-id i3-msg 'exec nextcloud' exec --no-startup-id i3-msg 'workspace $WS3; exec urxvt;' + diff --git a/.i3/status.conf b/.i3/status.conf index 22abeb0..ab05014 100755 --- a/.i3/status.conf +++ b/.i3/status.conf @@ -25,7 +25,7 @@ order += "path_exists VPN" #order += "ipv6" order += "wireless wlp3s0" order += "ethernet enp0s25" -order += "volume master" +order += "volume Master" order += "battery 0" #order += "cpu_temperature 0" order += "load" @@ -112,7 +112,7 @@ disk "/media/driveBay" { format = "/ %avail" } -volume master { +volume Master { format = " %volume" format_muted = " %volume" device = "default" diff --git a/.i3/status_small.conf b/.i3/status_small.conf index eef626d..aba9800 100755 --- a/.i3/status_small.conf +++ b/.i3/status_small.conf @@ -21,7 +21,8 @@ order += "run_watch Docker" order += "run_watch DHCP" order += "path_exists VPN" order += "wireless wlp3s0" -order += "ethernet eth0" +# order += "ethernet eth0" +order += "ethernet enp0s25" order += "volume master" order += "battery 0" order += "load" @@ -43,7 +44,8 @@ wireless wlp3s0 { format_down = " -" } -ethernet eth0 { +# ethernet eth0 { +ethernet enp0s25 { # if you use %speed, i3status requires root privileges format_up = "E: up" format_down = "E: down" diff --git a/.path b/.path index f0c0a3f..1a39d5b 100644 --- a/.path +++ b/.path @@ -1,4 +1,4 @@ #export GOROOT=/usr/local/go/bin # export GOPATH=/home/fschl/projects/go_projects -export PATH=${PATH}:/usr/local/go/bin:${GOPATH}/bin \ No newline at end of file +export PATH=${PATH}:/usr/local/go/bin:/home/fschl/go/bin \ No newline at end of file diff --git a/.spacemacs b/.spacemacs index ed5436f..63dc41f 100644 --- a/.spacemacs +++ b/.spacemacs @@ -327,6 +327,9 @@ you should place your code here." rustauto-completion :variables auto-completion-enable-snippets-in-popup t auto-completion-enable-help-tooltip t))) + (setq org-ref-default-bibliography '("~/Documents/WHZ/MA/latex/references.bib") + org-ref-pdf-directory "~/Documents/WHZ/MA/references/" + org-ref-bibliography-notes "~/Documents/WHZ/MA/notes.org") ) ;; Do not write anything past this comment. This is where Emacs will diff --git a/scripts/install.sh b/scripts/install.sh index e2fdd90..213addb 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -167,11 +167,14 @@ install_latex() { evince \ texlive \ texlive-bibtex-extra \ + texlive-fonts-extra \ + texlive-fonts-recommended \ texlive-lang-english \ texlive-lang-german \ texlive-latex-extra \ texlive-latex-recommended \ texlive-pictures \ + zathura \ --no-install-recommends } @@ -242,6 +245,16 @@ install_i3() { xorg \ --no-install-recommends + # install Syncthing via apt + # Add the release PGP keys: + curl -s https://syncthing.net/release-key.txt | sudo apt-key add - + + # Add the "stable" channel to your APT sources: + echo "deb https://apt.syncthing.net/ syncthing stable" | sudo tee /etc/apt/sources.list.d/syncthing.list + + # Update and install syncthing: + sudo apt-get update + sudo apt-get install syncthing echo "... DONE... cleaning up\n\n" apt autoremove apt autoclean @@ -385,7 +398,7 @@ get_dotfiles() { # install/update golang from source install_golang() { - export GO_VERSION=1.13.0 + export GO_VERSION=1.15.0 export GO_SRC=/usr/local/go # if we are passing the version