diff --git a/.config/guix/manifests/desktop.scm b/.config/guix/manifests/desktop.scm index ad3643b..c4bc655 100644 --- a/.config/guix/manifests/desktop.scm +++ b/.config/guix/manifests/desktop.scm @@ -37,6 +37,7 @@ "bind:utils" "polybar" "i3-gaps" + "xinput" "xgamma" "xrandr" "xsettingsd" diff --git a/.config/guix/manifests/dev.scm b/.config/guix/manifests/dev.scm index 5712d42..863bbfb 100644 --- a/.config/guix/manifests/dev.scm +++ b/.config/guix/manifests/dev.scm @@ -1,5 +1,7 @@ (specifications->manifest '( + "node" + "git-filter-repo" "virt-manager" "postgresql" "docker-compose" diff --git a/.mailcap b/.mailcap index b34eedc..6d616ce 100644 --- a/.mailcap +++ b/.mailcap @@ -6,4 +6,4 @@ application/msword; /usr/bin/xdg-open %s application/pdf; zathura %s application/postscript ; zathura %s -text/html; /usr/bin/xdg-open %s +text/html; firefox %s diff --git a/Desktop.org b/Desktop.org index a5fe1f2..da816b4 100644 --- a/Desktop.org +++ b/Desktop.org @@ -208,11 +208,12 @@ Xft/Antialias 1 Xft/Hinting 0 Xft/HintStyle "hintnone" #+end_src -** Screen settings +** Device-specific settings | Guix dependency | Description | |-----------------+--------------------------------------------| | xrandr | X11 CLI to RandR | | xgamma | A tool to alter monitor's gamma correction | +| xinput | Configure input devices | Set screen layout & other params depending on hostname #+begin_src sh :tangle ~/bin/scripts/screen-layout @@ -2097,6 +2098,8 @@ This section generates manifests for various desktop software that I'm using. | dev | docker-compose | | dev | postgresql | | dev | virt-manager | +| dev | git-filter-repo | +| dev | node | ** Manifests #+NAME: packages #+begin_src emacs-lisp :tangle no :var category="" diff --git a/Guix.org b/Guix.org index 89e890d..e1f905e 100644 --- a/Guix.org +++ b/Guix.org @@ -569,9 +569,14 @@ As of now, CyberGhost doesn't provide ipv6, so we have to disable it. #+begin_src bash :tangle ~/bin/scripts/vpn-start CONN=$(nmcli -f NAME con show --active | grep -Ev "(.*docker.*|NAME|br-.*|veth.*|tun.*)" | sed 's/ *$//g') +if [ -z "$CONN" ]; then + echo "No connection!" + exit +fi + echo "Connection: $CONN" -nmcli con modify "$CONN" ipv6.method ignore +sudo nmcli con modify "$CONN" ipv6.method ignore nmcli connection up "$CONN" sudo openvpn --config ~/.vpn/openvpn.ovpn #+end_src @@ -583,7 +588,7 @@ Also a script to reverse the changes. CONN=$(nmcli -f NAME con show --active | grep -Ev "(.*docker.*|NAME|br-.*|veth.*|tun.*)" | sed 's/ *$//g') echo "Connection: $CONN" -nmcli con modify "$CONN" ipv6.method auto +sudo nmcli con modify "$CONN" ipv6.method auto nmcli connection up "$CONN" #+end_src ** flatpak diff --git a/Mail.org b/Mail.org index 00917ff..90772bc 100644 --- a/Mail.org +++ b/Mail.org @@ -237,7 +237,7 @@ application/msword; /usr/bin/xdg-open %s application/pdf; zathura %s application/postscript ; zathura %s -text/html; /usr/bin/xdg-open %s +text/html; firefox %s #+end_src * Guix settings #+NAME: packages diff --git a/README.org b/README.org index 9409398..59e6bd2 100644 --- a/README.org +++ b/README.org @@ -88,4 +88,6 @@ Mail/progin6304/.credentials.gmailieer.json secrets/* .emacs.d/dired-bookmarks.el .emacs.d/elfeed.org +.emacs.d/prodigy.org +.emacs.d/prodigy-config.el #+end_src diff --git a/bin/scripts/vpn-start b/bin/scripts/vpn-start index de0b86d..137d2fc 100755 --- a/bin/scripts/vpn-start +++ b/bin/scripts/vpn-start @@ -2,6 +2,11 @@ # [[file:../../Guix.org::*vpn-start][vpn-start:1]] CONN=$(nmcli -f NAME con show --active | grep -Ev "(.*docker.*|NAME|br-.*|veth.*|tun.*)" | sed 's/ *$//g') +if [ -z "$CONN" ]; then + echo "No connection!" + exit +fi + echo "Connection: $CONN" sudo nmcli con modify "$CONN" ipv6.method ignore