Change hyperv-gpg workflow, mod emacs etc. pp

This commit is contained in:
David Holland 2022-09-27 10:24:57 +02:00
parent 0dc52132d1
commit 6a27888b87
Signed by: DustVoice
GPG key ID: 47068995A14EDCA9
11 changed files with 198 additions and 53 deletions

View file

@ -48,6 +48,7 @@ bspc config presel_feedback_color "#6272a4"
bspc rule -a Screenkey manage=off bspc rule -a Screenkey manage=off
bspc rule -a Zathura state=tiled manage=on bspc rule -a Zathura state=tiled manage=on
bspc rule -a Emacs state=tiled
if [ -x "$(command -v feh)" ]; then if [ -x "$(command -v feh)" ]; then
feh --bg-fill "$HOME/Wallpapers/arch_dracula.png" feh --bg-fill "$HOME/Wallpapers/arch_dracula.png"

View file

@ -1,6 +1,6 @@
function hyperv-gpg-agent function hyperv-gpg-agent
set socket_path "$HOME/.gnupg/S.gpg-agent" set socket_path "$HOME/.gnupg/S.gpg-agent"
set host_ip $(ip route show 0.0.0.0/0 dev eth0 | cut -d\ -f3) set host_ip $(hyperv-host-ip)
if test -e $socket_path if test -e $socket_path
rm $socket_path rm $socket_path
@ -11,7 +11,7 @@ end
function hyperv-ssh-agent function hyperv-ssh-agent
set socket_path "$HOME/.gnupg/S.gpg-agent.ssh" set socket_path "$HOME/.gnupg/S.gpg-agent.ssh"
set host_ip $(ip route show 0.0.0.0/0 dev eth0 | cut -d\ -f3) set host_ip $(hyperv-host-ip)
if test -e $socket_path if test -e $socket_path
rm $socket_path rm $socket_path

View file

@ -0,0 +1,3 @@
function hyperv-host-ip
ip route show 0.0.0.0/0 dev eth0 | cut -d\ -f3
end

View file

@ -0,0 +1,3 @@
function secure-gpg --wraps='gpg --homedir /dev/shm/gpg/.gnupg' --description 'gpg --homedir /dev/shm/gpg/.gnupg'
gpg --homedir /dev/shm/gpg/.gnupg $argv;
end

View file

@ -0,0 +1,25 @@
function secure-hyperv-gpg-agent
set socket_path "/dev/shm/gpg/.gnupg/S.gpg-agent"
set host_ip $(hyperv-host-ip)
if test -e $socket_path
rm $socket_path
end
screen -dmS gpg-socat socat UNIX-LISTEN:$socket_path,fork tcp-connect:$host_ip:59545
end
function secure-hyperv-ssh-agent
set socket_path "/dev/shm/gpg/.gnupg/S.gpg-agent.ssh"
set host_ip $(hyperv-host-ip)
if test -e $socket_path
rm $socket_path
end
screen -dmS ssh-socat socat UNIX-LISTEN:$socket_path,fork tcp-connect:$host_ip:59546
end
function secure-hyperv-forward --description 'Setup secure hyperv-agent forwarding'
secure-hyperv-gpg-agent
secure-hyperv-ssh-agent
end

View file

@ -0,0 +1,70 @@
function usbip-man --description "Interactive usbip helper"
set vhci_required
echo ">> Is the vhci-hcd module already loaded?"
echo ">> [(y)es] / (n)o"
read vhci_required
if test "$vhci_required" = "n"
sudo modprobe vhci-hcd
end
set action
echo ">> What do you want to do?"
echo ">> (a)ttach / (d)etach"
read action
if test "$action" = "a"
set host
set host_type
set bus_id
echo ">> What kind of setup is it?"
echo ">> [(h)yperv]"
read host_type
if test "$host_type" = "h" || test "$host_type" = ""
set host $(hyperv-host-ip)
else
echo ">> No valid option chosen. Exiting ..."
return -1
end
echo ">> Listing available devices ..."
sudo usbip list -r "$host"
echo ">> Select bus-id to attach"
read bus_id
echo ">> Attaching device ..."
sudo usbip attach -r "$host" -b "$bus_id"
set usbip_status $status
echo ">> Exiting ..."
return $usbip_status
else if [ "$action" = "d" ]
set port
echo ">> Listing imported devices ..."
sudo usbip port
echo ">> Select port to detach"
read port
echo ">> Detaching device ..."
sudo usbip detach -p "$port"
set usbip_status $status
echo ">> Exiting ..."
return $usbip_status
else
echo ">> No valid option chosen. Exiting ..."
return -1
end
end

View file

@ -77,3 +77,29 @@
;; ;;
;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how ;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
;; they are implemented. ;; they are implemented.
;; This should of course be grammmatically correct
;; Not working with hyperv-forward atm
;;(setq epg-gpg-program "/usr/bin/gpg2")
;;(setq epg-user-id "7A9CA430D426100E")
;;(pinentry-start)
;;(setq epg-agent-file "~/.gnupg/S.gpg-agent")
(remove-hook 'doom-first-input-hook #'evil-snipe-mode)
;;(define-key evil-normal-state-map (kbd "gj") 'evil-next-visual-line)
;;(define-key evil-normal-state-map (kbd "gk") 'evil-previous-visual-line)
;;(add-hook 'org-mode-hook #'org-modern-mode)
;;(after! flycheck (flycheck-grammarly-setup))
(setq-default lsp-rust-analyzer-proc-macro-enable t)
(with-eval-after-load 'ox-latex
(add-to-list 'org-latex-classes
'("dustdoc" "\\documentclass[10pt]{dustdoc}"
("\\chapter{%s}" . "\\chapter*{%s}")
("\\section{%s}" . "\\section*{%s}")
("\\subsection{%s}" . "\\subsection*{%s}")
("\\subsubsection{%s}" . "\\subsubsection*{%s}"))))

View file

@ -21,41 +21,43 @@
;;layout ; auie,ctsrnm is the superior home row ;;layout ; auie,ctsrnm is the superior home row
:completion :completion
company ; the ultimate code completion backend company ; the ultimate code completion backend
;;helm ; the *other* search engine for love and life ;;helm ; the *other* search engine for love and life
;;ido ; the other *other* search engine... ;;ido ; the other *other* search engine...
;;ivy ; a search engine for love and life ;;ivy ; a search engine for love and life
vertico ; the search engine of the future vertico ; the search engine of the future
:ui :ui
;;deft ; notational velocity for Emacs ;;deft ; notational velocity for Emacs
doom ; what makes DOOM look the way it does doom ; what makes DOOM look the way it does
doom-dashboard ; a nifty splash screen for Emacs doom-dashboard ; a nifty splash screen for Emacs
;;doom-quit ; DOOM quit-message prompts when you quit Emacs ;;doom-quit ; DOOM quit-message prompts when you quit Emacs
;;(emoji +unicode) ; 🙂 ;;(emoji +unicode) ; 🙂
hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
;;hydra ;;hydra
;;indent-guides ; highlighted indent columns ;;indent-guides ; highlighted indent columns
;;ligatures ; ligatures and symbols to make your code pretty again (ligatures
;;minimap ; show a map of the code on the side +extra
modeline ; snazzy, Atom-inspired modeline, plus API +fira) ; ligatures and symbols to make your code pretty again
;;nav-flash ; blink cursor line after big motions minimap ; show a map of the code on the side
;;neotree ; a project drawer, like NERDTree for vim modeline ; snazzy, Atom-inspired modeline, plus API
ophints ; highlight the region an operation acts on nav-flash ; blink cursor line after big motions
neotree ; a project drawer, like NERDTree for vim
ophints ; highlight the region an operation acts on
(popup +defaults) ; tame sudden yet inevitable temporary windows (popup +defaults) ; tame sudden yet inevitable temporary windows
;;tabs ; a tab bar for Emacs ;;tabs ; a tab bar for Emacs
;;treemacs ; a project drawer, like neotree but cooler ;;treemacs ; a project drawer, like neotree but cooler
;;unicode ; extended unicode support for various languages unicode ; extended unicode support for various languages
(vc-gutter +pretty) ; vcs diff in the fringe (vc-gutter +pretty) ; vcs diff in the fringe
vi-tilde-fringe ; fringe tildes to mark beyond EOB vi-tilde-fringe ; fringe tildes to mark beyond EOB
;;window-select ; visually switch windows ;;window-select ; visually switch windows
workspaces ; tab emulation, persistence & separate workspaces workspaces ; tab emulation, persistence & separate workspaces
;;zen ; distraction-free coding or writing ;;zen ; distraction-free coding or writing
:editor :editor
(evil +everywhere); come to the dark side, we have cookies (evil +everywhere) ; come to the dark side, we have cookies
file-templates ; auto-snippets for empty files file-templates ; auto-snippets for empty files
fold ; (nigh) universal code folding fold ; (nigh) universal code folding
;;(format +onsave) ; automated prettiness ;;(format +onsave) ; automated prettiness
;;god ; run Emacs commands without modifier keys ;;god ; run Emacs commands without modifier keys
;;lispy ; vim for lisp, for people who don't like vim ;;lispy ; vim for lisp, for people who don't like vim
@ -63,25 +65,25 @@
;;objed ; text object editing for the innocent ;;objed ; text object editing for the innocent
;;parinfer ; turn lisp into python, sort of ;;parinfer ; turn lisp into python, sort of
;;rotate-text ; cycle region at point between text candidates ;;rotate-text ; cycle region at point between text candidates
snippets ; my elves. They type so I don't have to snippets ; my elves. They type so I don't have to
;;word-wrap ; soft wrapping with language-aware indent ;;word-wrap ; soft wrapping with language-aware indent
:emacs :emacs
dired ; making dired pretty [functional] dired ; making dired pretty [functional]
electric ; smarter, keyword-based electric-indent electric ; smarter, keyword-based electric-indent
;;ibuffer ; interactive buffer management ibuffer ; interactive buffer management
undo ; persistent, smarter undo for your inevitable mistakes undo ; persistent, smarter undo for your inevitable mistakes
vc ; version-control and Emacs, sitting in a tree vc ; version-control and Emacs, sitting in a tree
:term :term
;;eshell ; the elisp shell that works everywhere eshell ; the elisp shell that works everywhere
;;shell ; simple shell REPL for Emacs ;;shell ; simple shell REPL for Emacs
;;term ; basic terminal emulator for Emacs ;;term ; basic terminal emulator for Emacs
;;vterm ; the best terminal emulation in Emacs vterm ; the best terminal emulation in Emacs
:checkers :checkers
syntax ; tasing you for every semicolon you forget syntax ; tasing you for every semicolon you forget
;;(spell +flyspell) ; tasing you for misspelling mispelling (spell +flyspell) ; tasing you for misspelling mispelling
;;grammar ; tasing grammar mistake every you make ;;grammar ; tasing grammar mistake every you make
:tools :tools
@ -95,17 +97,17 @@
(eval +overlay) ; run code, run (also, repls) (eval +overlay) ; run code, run (also, repls)
;;gist ; interacting with github gists ;;gist ; interacting with github gists
lookup ; navigate your code and its documentation lookup ; navigate your code and its documentation
;;lsp ; M-x vscode lsp ; M-x vscode
magit ; a git porcelain for Emacs magit ; a git porcelain for Emacs
;;make ; run make tasks from Emacs make ; run make tasks from Emacs
;;pass ; password manager for nerds pass ; password manager for nerds
;;pdf ; pdf enhancements pdf ; pdf enhancements
;;prodigy ; FIXME managing external services & code builders ;;prodigy ; FIXME managing external services & code builders
;;rgb ; creating color strings ;;rgb ; creating color strings
;;taskrunner ; taskrunner for all your projects ;;taskrunner ; taskrunner for all your projects
;;terraform ; infrastructure as code ;;terraform ; infrastructure as code
;;tmux ; an API for interacting with tmux ;;tmux ; an API for interacting with tmux
;;tree-sitter ; syntax and parsing, sitting in a tree... tree-sitter ; syntax and parsing, sitting in a tree...
;;upload ; map local to remote projects via ssh/ftp ;;upload ; map local to remote projects via ssh/ftp
:os :os
@ -120,13 +122,13 @@
;;common-lisp ; if you've seen one lisp, you've seen them all ;;common-lisp ; if you've seen one lisp, you've seen them all
;;coq ; proofs-as-programs ;;coq ; proofs-as-programs
;;crystal ; ruby at the speed of c ;;crystal ; ruby at the speed of c
;;csharp ; unity, .NET, and mono shenanigans csharp ; unity, .NET, and mono shenanigans
;;data ; config/data formats ;;data ; config/data formats
;;(dart +flutter) ; paint ui and not much else ;;(dart +flutter) ; paint ui and not much else
;;dhall ;;dhall
;;elixir ; erlang done right ;;elixir ; erlang done right
;;elm ; care for a cup of TEA? ;;elm ; care for a cup of TEA?
emacs-lisp ; drown in parentheses emacs-lisp ; drown in parentheses
;;erlang ; an elegant language for a more civilized age ;;erlang ; an elegant language for a more civilized age
;;ess ; emacs speaks statistics ;;ess ; emacs speaks statistics
;;factor ;;factor
@ -137,55 +139,55 @@
;;gdscript ; the language you waited for ;;gdscript ; the language you waited for
;;(go +lsp) ; the hipster dialect ;;(go +lsp) ; the hipster dialect
;;(graphql +lsp) ; Give queries a REST ;;(graphql +lsp) ; Give queries a REST
;;(haskell +lsp) ; a language that's lazier than I am (haskell +lsp) ; a language that's lazier than I am
;;hy ; readability of scheme w/ speed of python ;;hy ; readability of scheme w/ speed of python
;;idris ; a language you can depend on ;;idris ; a language you can depend on
json ; At least it ain't XML json ; At least it ain't XML
;;(java +lsp) ; the poster child for carpal tunnel syndrome (java +lsp) ; the poster child for carpal tunnel syndrome
;;javascript ; all(hope(abandon(ye(who(enter(here)))))) javascript ; all(hope(abandon(ye(who(enter(here))))))
;;julia ; a better, faster MATLAB julia ; a better, faster MATLAB
;;kotlin ; a better, slicker Java(Script) ;;kotlin ; a better, slicker Java(Script)
latex ; writing papers in Emacs has never been so fun latex ; writing papers in Emacs has never been so fun
;;lean ; for folks with too much to prove ;;lean ; for folks with too much to prove
;;ledger ; be audit you can be ;;ledger ; be audit you can be
lua ; one-based indices? one-based indices lua ; one-based indices? one-based indices
markdown ; writing docs for people to ignore markdown ; writing docs for people to ignore
;;nim ; python + lisp at the speed of c ;;nim ; python + lisp at the speed of c
;;nix ; I hereby declare "nix geht mehr!" ;;nix ; I hereby declare "nix geht mehr!"
;;ocaml ; an objective camel ;;ocaml ; an objective camel
org ; organize your plain life in plain text (org +roam2) ; organize your plain life in plain text
;;php ; perl's insecure younger brother ;;php ; perl's insecure younger brother
;;plantuml ; diagrams for confusing people more ;;plantuml ; diagrams for confusing people more
;;purescript ; javascript, but functional ;;purescript ; javascript, but functional
python ; beautiful is better than ugly python ; beautiful is better than ugly
;;qt ; the 'cutest' gui framework ever ;;qt ; the 'cutest' gui framework ever
;;racket ; a DSL for DSLs ;;racket ; a DSL for DSLs
;;raku ; the artist formerly known as perl6 ;;raku ; the artist formerly known as perl6
;;rest ; Emacs as a REST client ;;rest ; Emacs as a REST client
;;rst ; ReST in peace ;;rst ; ReST in peace
;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
(rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() (rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
;;scala ; java, but good ;;scala ; java, but good
;;(scheme +guile) ; a fully conniving family of lisps ;;(scheme +guile) ; a fully conniving family of lisps
sh ; she sells {ba,z,fi}sh shells on the C xor sh ; she sells {ba,z,fi}sh shells on the C xor
;;sml ;;sml
;;solidity ; do you need a blockchain? No. ;;solidity ; do you need a blockchain? No.
;;swift ; who asked for emoji variables? ;;swift ; who asked for emoji variables?
;;terra ; Earth and Moon in alignment for performance. ;;terra ; Earth and Moon in alignment for performance.
;;web ; the tubes web ; the tubes
yaml ; JSON, but readable yaml ; JSON, but readable
;;zig ; C, but simpler ;;zig ; C, but simpler
:email :email
;;(mu4e +org +gmail) ;;(mu4e +org +gmail)
;;notmuch notmuch
;;(wanderlust +gmail) ;;(wanderlust +gmail)
:app :app
;;calendar ;;calendar
;;emms ;;emms
;;everywhere ; *leave* Emacs!? You must be joking ;;everywhere ; *leave* Emacs!? You must be joking
;;irc ; how neckbeards socialize irc ; how neckbeards socialize
;;(rss +org) ; emacs as an RSS reader ;;(rss +org) ; emacs as an RSS reader
;;twitter ; twitter client https://twitter.com/vnought ;;twitter ; twitter client https://twitter.com/vnought

View file

@ -48,3 +48,17 @@
;(unpin! pinned-package another-pinned-package) ;(unpin! pinned-package another-pinned-package)
;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) ;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
;(unpin! t) ;(unpin! t)
(package! pinentry)
(package! fish-mode)
(package! flycheck-grammarly
:recipe (:host github :repo "emacs-grammarly/flycheck-grammarly"))
(package! evil-escape
:disable t)
(package! git-modes
:recipe (:host github :repo "magit/git-modes"))
(package! org-modern)

@ -1 +1 @@
Subproject commit e9ef904eeef28c31ca07055f0cce8c5eafeb4179 Subproject commit 95bdc3b566b72169f4bed41ea51f0d0b941fa2de

View file

@ -6,3 +6,4 @@ default-cache-ttl-ssh 300
max-cache-ttl 1200 max-cache-ttl 1200
max-cache-ttl-ssh 1200 max-cache-ttl-ssh 1200
enable-ssh-support enable-ssh-support
allow-emacs-pinentry