From fb6fd4d62606f56f156544083d90e1b3ad65c5df Mon Sep 17 00:00:00 2001 From: Patryk Niedźwiedziński Date: Mon, 5 Jul 2021 13:23:04 +0200 Subject: Updates --- home.nix | 2 +- machines/x220/configuration.nix | 6 +++++- modules/internet.nix | 2 +- modules/larbs.nix | 12 +++++++++++- pkgs/dwm/default.nix | 2 +- pkgs/nvim.nix | 1 - pkgs/st.config.h | 10 +++++----- programs/duckling-proxy.nix | 4 ++++ programs/qutebrowser.nix | 2 +- users/pn.nix | 1 + 10 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 programs/duckling-proxy.nix diff --git a/home.nix b/home.nix index da44d51..8dc1a36 100644 --- a/home.nix +++ b/home.nix @@ -36,7 +36,7 @@ in ./programs/git.nix ./programs/mpv.nix ./programs/sent - ./programs/qutebrowser.nix + # ./programs/qutebrowser.nix ] ++ platformSetup; home.packages = with pkgs; [ diff --git a/machines/x220/configuration.nix b/machines/x220/configuration.nix index 28110b6..a4c2c07 100644 --- a/machines/x220/configuration.nix +++ b/machines/x220/configuration.nix @@ -14,8 +14,11 @@ let in { + virtualisation.virtualbox.host.enable = true; + users.extraGroups.vboxusers.members = [ "pn" ]; + services.yggdrasil = { - enable = true; + enable = false; persistentKeys = true; config = { Peers = [ @@ -96,6 +99,7 @@ in ]; fonts.fonts = with pkgs; [ + liberation_ttf roboto-slab ]; diff --git a/modules/internet.nix b/modules/internet.nix index c24b112..45a2255 100644 --- a/modules/internet.nix +++ b/modules/internet.nix @@ -4,8 +4,8 @@ let blocklist = pkgs.writeText "hosts" '' 0.0.0.0 netflix.com 0.0.0.0 hbogo.com - 0.0.0.0 www.facebook.com ''; + # 0.0.0.0 www.facebook.com in { # networking.nameservers = lib.mkForce [ diff --git a/modules/larbs.nix b/modules/larbs.nix index 070f263..0420b46 100755 --- a/modules/larbs.nix +++ b/modules/larbs.nix @@ -11,7 +11,7 @@ let larbs-packages = with pkgs.nur.repos.pn; [ pnvim larbs-mail - larbs-news + # larbs-news (larbs-music.override { musicDir = "~/music"; }) dmenu pndwm @@ -19,6 +19,14 @@ let larbs-scripts (st.override { conf = ../pkgs/st.config.h; } ) ]; + + grap = pkgs.symlinkJoin { + name = "grap"; + paths = [ pkgs.plan9port ]; + postBuild = '' + ln -s ${pkgs.plan9port}/plan9/bin/grap $out/bin/grap + ''; + }; in { imports = [ @@ -36,6 +44,7 @@ in environment.systemPackages = with pkgs; [ ## Scripts utils #TODO: move to larbs-scripts + newsboat maim xclip xdotool @@ -48,6 +57,7 @@ in cmus + grap nur.repos.pn.groff hicolor-icon-theme diff --git a/pkgs/dwm/default.nix b/pkgs/dwm/default.nix index d075e08..5af25fe 100644 --- a/pkgs/dwm/default.nix +++ b/pkgs/dwm/default.nix @@ -5,7 +5,7 @@ pkgs: ./dwm-center.diff ./dwm-autostart.diff ./dwm-mediakeys.diff # Patch for slock mediakeys - # ./dwm-rounded.diff - Resize dont work + # ./dwm-rounded.diff # Resize dont work ]; header_config_file = ./config.h; } diff --git a/pkgs/nvim.nix b/pkgs/nvim.nix index 9dbf07d..037ba05 100755 --- a/pkgs/nvim.nix +++ b/pkgs/nvim.nix @@ -144,7 +144,6 @@ pkgs.neovim.override { start = [ vim-surround vim-fugitive - nerdtree goyo-vim # vimagit vimwiki diff --git a/pkgs/st.config.h b/pkgs/st.config.h index 67b3dc1..fa4322b 100644 --- a/pkgs/st.config.h +++ b/pkgs/st.config.h @@ -224,7 +224,7 @@ static MouseShortcut mshortcuts[] = { /* Internal keyboard shortcuts. */ #define MODKEY (Mod1Mask|ControlMask) -#define TERMMOD (Mod1Mask|ControlMask|ShiftMask) +#define TERMMOD (ControlMask|ShiftMask) MouseKey mkeys[] = { /* button mask function argument */ @@ -234,7 +234,7 @@ MouseKey mkeys[] = { { Button5, TERMMOD, zoom, {.f = -1} }, }; -static char *openurlcmd[] = { "/bin/sh", "-c", "st-urlhandler", "externalpipe", NULL }; +static char *openurlcmd[] = { "/bin/sh", "-c", "st-urlhandler -o", "externalpipe", NULL }; static char *copyurlcmd[] = { "/bin/sh", "-c", "tmp=$(sed 's/.*│//g' | tr -d '\n' | grep -aEo '(((http|https|gopher|gemini|ftp|ftps|git)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./@$&%?$#=_-~]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)' | uniq | sed 's/^www./http:\\/\\/www\\./g' ); IFS=; [ ! -z $tmp ] && echo $tmp | dmenu -i -p 'Copy which url?' -l 10 | tr -d '\n' | xclip -selection clipboard", @@ -275,9 +275,9 @@ static Shortcut shortcuts[] = { { TERMMOD, XK_J, zoom, {.f = -1} }, { TERMMOD, XK_U, zoom, {.f = +2} }, { TERMMOD, XK_D, zoom, {.f = -2} }, - { TERMMOD, XK_l, externalpipe, {.v = openurlcmd } }, - { TERMMOD, XK_y, externalpipe, {.v = copyurlcmd } }, - { TERMMOD, XK_o, externalpipe, {.v = copyoutput } }, + { TERMMOD, XK_L, externalpipe, {.v = openurlcmd } }, + { TERMMOD, XK_Y, externalpipe, {.v = copyurlcmd } }, + { TERMMOD, XK_O, externalpipe, {.v = copyoutput } }, }; /* diff --git a/programs/duckling-proxy.nix b/programs/duckling-proxy.nix new file mode 100644 index 0000000..248325c --- /dev/null +++ b/programs/duckling-proxy.nix @@ -0,0 +1,4 @@ +{ pkgs, ... }: +{ + home.packages = [ pkgs.nur.repos.pn.duckling-proxy ]; +} diff --git a/programs/qutebrowser.nix b/programs/qutebrowser.nix index 6c60534..e8afb70 100644 --- a/programs/qutebrowser.nix +++ b/programs/qutebrowser.nix @@ -11,7 +11,7 @@ c.statusbar.show = "in-mode" c.downloads.location.directory = "~/down" c.content.pdfjs = True - c.content.javascript.enabled = False + c.content.javascript.enabled = True config.load_autoconfig() import subprocess diff --git a/users/pn.nix b/users/pn.nix index a73716a..7a01354 100755 --- a/users/pn.nix +++ b/users/pn.nix @@ -54,6 +54,7 @@ in $(grep '^Exec' $app | sed 's/^Exec=//') & done sleep .5 && screen-orient & + duckling-proxy --serverCert $HOME/.config/duckling-proxy/ca.crt --serverKey $HOME/.config/duckling-proxy/ca.key & ''; scriptPath = ".xinitrc"; }; -- cgit 1.4.1