diff options
| -rw-r--r-- | email/neomutt.nix | 5 | ||||
| -rw-r--r-- | home.nix | 13 | ||||
| -rw-r--r-- | home/packages.nix | 1 | ||||
| -rw-r--r-- | home/suckless.nix | 2 | ||||
| -rw-r--r-- | shell-scripts/maimpick | 18 |
5 files changed, 29 insertions, 10 deletions
diff --git a/email/neomutt.nix b/email/neomutt.nix index 6b4b354..4c3b366 100644 --- a/email/neomutt.nix +++ b/email/neomutt.nix @@ -27,7 +27,7 @@ programs.neomutt = { enable = true; sort = "reverse-date"; - sidebar = { + sidebar = { enable = true; }; extraConfig = '' @@ -147,7 +147,7 @@ color body red default "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]" ''; binds = [ - { map = ["index" "pager"]; key = "x"; action = "noop"; } + { map = ["index" "pager"]; key = "x"; action = "modify-labels"; } { map = ["index" "pager"]; key = "i"; action = "noop"; } { map = ["index" "pager"]; key = "g"; action = "noop"; } { map = ["index"]; key = "\\Cf"; action = "noop"; } @@ -188,6 +188,7 @@ macros = [ { map = ["index"]; key = "X"; action = "<save-message>=Spam<enter>y"; } { map = ["index"]; key = "A"; action = "<modify-labels-then-hide>+archive -unread -inbox<enter><mark-message>z<enter><change-folder>^<enter>'z"; } + { map = ["index"]; key = "h"; action = "<mark-message>z<enter><change-folder>^<enter>'z"; } { map = ["index"]; key = "D"; action = "<delete-message>"; } { map = ["index" "pager"]; key = "S"; action = "<sync-mailbox>!notmuch-hook &<enter>"; } { map = ["index"]; key = "c"; action = "<change-vfolder>?"; } @@ -48,11 +48,6 @@ programs.ssh = { enable = true; - matchBlocks = { - "*" = { - identityFile = "${config.home.homeDirectory}/.ssh/id_ed25519"; - }; - }; }; home.sessionVariables = { @@ -90,14 +85,18 @@ ''; }; + programs.emacs = { + enable = true; + }; + programs.tmux = { enable = true; extraConfig = '' set-option -g default-shell ${pkgs.bashInteractive}/bin/bash set -s set-clipboard on setw -g mouse on - set -g default-terminal "xterm-256color" - set -as terminal-overrides ',xterm*:RGB' + set -g default-terminal "st-256color" + set -ga terminal-overrides ",xterm-256color:Tc" set-option -g focus-events on set-option -sg escape-time 10 # unbind C-b diff --git a/home/packages.nix b/home/packages.nix index cc4fb91..1bb1147 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -28,6 +28,7 @@ iputils inetutils usbutils + maim calcurse profanity file diff --git a/home/suckless.nix b/home/suckless.nix index 9bf3d1d..d10414d 100644 --- a/home/suckless.nix +++ b/home/suckless.nix @@ -18,7 +18,7 @@ in { }; services.picom = { enable = true; - activeOpacity = 0.9; + activeOpacity = 0.99; inactiveOpacity = 0.7; opacityRules = [ "100:class_g = 'dwm'" diff --git a/shell-scripts/maimpick b/shell-scripts/maimpick new file mode 100644 index 0000000..5de26c1 --- /dev/null +++ b/shell-scripts/maimpick @@ -0,0 +1,18 @@ +#!/bin/sh + +# This is bound to Shift+PrintScreen by default, requires maim. It lets you +# choose the kind of screenshot to take, including copying the image or even +# highlighting an area to copy. scrotcucks on suicidewatch right now. + +# variables +output="$(date '+%y%m%d-%H%M-%S').png" +xclip_cmd="xclip -sel clip -t image/png" + +case "$(printf "a selected area\\ncurrent window\\nfull screen\\na selected area (copy)\\ncurrent window (copy)\\nfull screen (copy)" | dmenu -l 6 -i -p "Screenshot which area?")" in + "a selected area") maim -u -s pic-selected-"${output}" ;; + "current window") maim -q -d 0.2 -i "$(xdotool getactivewindow)" pic-window-"${output}" ;; + "full screen") maim -q -d 0.2 pic-full-"${output}" ;; + "a selected area (copy)") maim -u -s | ${xclip_cmd} ;; + "current window (copy)") maim -q -d 0.2 -i "$(xdotool getactivewindow)" | ${xclip_cmd} ;; + "full screen (copy)") maim -q -d 0.2 | ${xclip_cmd} ;; +esac |