Compare commits

..

9 commits

3 changed files with 33 additions and 5 deletions

View file

@ -5,3 +5,5 @@
xfuncname = "^\\*+ +(.+)" xfuncname = "^\\*+ +(.+)"
[diff "lisp"] [diff "lisp"]
xfuncname = "^[[:space:]]*?\\(def\\w+? ((\\w|-|'|:|=|<|>)+)" xfuncname = "^[[:space:]]*?\\(def\\w+? ((\\w|-|'|:|=|<|>)+)"
[sendemail]
sendmailcmd = /usr/bin/msmtp -t

View file

@ -83,7 +83,8 @@
#:select (emacs-inkplate)) #:select (emacs-inkplate))
#:use-module ((oni packages emacs-config) #:use-module ((oni packages emacs-config)
#:select (emacs-oni-org-roam #:select (emacs-oni-org-roam
emacs-oni-vterm)) emacs-oni-vterm
emacs-oni-elisp))
#:use-module ((oni packages hlwm-run-or-raise) #:use-module ((oni packages hlwm-run-or-raise)
#:select (hlwm-run-or-raise)) #:select (hlwm-run-or-raise))
#:use-module ((oni packages inbox-size) #:use-module ((oni packages inbox-size)
@ -180,6 +181,7 @@
emacs-guix emacs-guix
emacs-oni-org-roam emacs-oni-org-roam
emacs-oni-vterm emacs-oni-vterm
emacs-oni-elisp
gforth gforth
;; Might be needed for certain icons? ;; Might be needed for certain icons?
hicolor-icon-theme hicolor-icon-theme
@ -210,7 +212,7 @@
(list (list
(channel (channel
(name 'oni) (name 'oni)
(url "https://git.sr.ht/~ryuslash/guix-packages") (url "https://code.ryuslash.org/ryuslash/guix-packages.git")
(introduction (introduction
(make-channel-introduction (make-channel-introduction
"646573578b7adfbff415645fed201269076cebf6" "646573578b7adfbff415645fed201269076cebf6"

View file

@ -16,13 +16,16 @@
(when (eq (sb-ext:process-status process) :exited) (when (eq (sb-ext:process-status process) :exited)
(run-hook *screen-unlocked-hook*))) (run-hook *screen-unlocked-hook*)))
(defun vpn-connected-p ()
(probe-file "/sys/class/net/vpn"))
(defcommand lock-screen () () (defcommand lock-screen () ()
"Lock the screen using i3lock. "Lock the screen using i3lock.
Run `*screen-locking-hook*' before locking it and run `*screen-unlocked-hook*' Run `*screen-locking-hook*' before locking it and run `*screen-unlocked-hook*'
after it has been unlocked." after it has been unlocked."
(run-hook *screen-locking-hook*) (run-hook *screen-locking-hook*)
(sb-ext:run-program (sb-ext:run-program
*shell-program* '("-c" "i3lock" "--nofork" "--color=000000") *shell-program* '("-c" "i3lock --nofork --color=000000")
:wait nil :wait nil
:status-hook #'run-screen-unlocked-hook)) :status-hook #'run-screen-unlocked-hook))
@ -42,14 +45,35 @@ after it has been unlocked."
(define-key *top-map* (kbd "s-b") "raise-browser") (define-key *top-map* (kbd "s-b") "raise-browser")
(define-key *top-map* (kbd "s-e") "raise-emacs") (define-key *top-map* (kbd "s-e") "raise-emacs")
(define-key *top-map* (kbd "s-t") "raise-terminal") (define-key *top-map* (kbd "s-t") "raise-terminal")
(define-key *top-map* (kbd "s-!") "exec rofi -show drun")
(define-key *top-map* (kbd "s-w") "exec rofi -show window")
(define-remapped-keys (define-remapped-keys
'(("teams-for-linux" '(("teams-for-linux"
("C-M-Break" . "C-S-m")))) ("C-M-Break" . "C-S-m"))))
(set-bg-color "#222424")
(set-border-color "#3f4242")
(set-fg-color "#bfbfbf")
(set-float-focus-color "#5b6161")
(set-float-unfocus-color "#3f4242")
(set-focus-color "#ff9800")
(set-unfocus-color "#3f4242")
(setf *mode-line-background-color* "#5b6161" (setf *mode-line-background-color* "#5b6161"
*mode-line-foreground-color* "#bfbfbf" *mode-line-foreground-color* "#bfbfbf")
*screen-mode-line-format* "[^B%n^b] %W^>%d") (setf *screen-mode-line-format*
(list " [^B%n^b] "
"^[^(:bg \"#f17272\")^(:fg \"#222424\") "
'(:eval
(or (ignore-errors (window-title (current-window)))
"Unknown"))
" ^]^>"
'(:eval
(if (vpn-connected-p)
"^*5^B[VPN]^b^n "
""))
"%d "))
(mode-line) (mode-line)
(restore-from-file "default") (restore-from-file "default")