diff --git a/awesome/init.fnl b/awesome/init.fnl index ed3b4b4..6ee2480 100644 --- a/awesome/init.fnl +++ b/awesome/init.fnl @@ -445,7 +445,7 @@ :right (dpi 5)}) (set s.cputext (awful.widget.watch "cpu" 5)) - (set s.cpuicon (wibox.widget.textbox " ")) + ;; (set s.cpuicon (wibox.widget.textbox " ")) (set s.cpuspace (wibox.widget.textbox " ")) (set s.cpuwidget { 1 { 1 { 1 (wibox.widget { @@ -464,7 +464,7 @@ :right (dpi 5)}) (set s.memtext (awful.widget.watch "mem" 2)) - (set s.memicon (wibox.widget.textbox " ")) + ;; (set s.memicon (wibox.widget.textbox " ")) (set s.memspace (wibox.widget.textbox " ")) (set s.memwidget { 1 { 1 { 1 (wibox.widget { @@ -502,7 +502,7 @@ :right (dpi 5)}) (set s.mailtext (awful.widget.watch "muunread" 360)) - (set s.mailicon (wibox.widget.textbox " ")) + ;; (set s.mailicon (wibox.widget.textbox " ")) (set s.mailspace (wibox.widget.textbox " ")) (set s.mailwidget { 1 { 1 { 1 (wibox.widget { diff --git a/flake.lock b/flake.lock index 8475af3..0fe1a96 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1678097883, - "narHash": "sha256-IG/v/syRMm0OLjT7F/naRjqN6bvAQEhlIlnS4U5y5EQ=", + "lastModified": 1679307033, + "narHash": "sha256-D8SzlqiLApDCPDPDkRETRfqfB6pzSeRsckBOTIyn4EE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3f8a6436e158849050e711574a97126a6d3fec02", + "rev": "e016fab49d5bb9f4db4e0dfdf925395750d6b8bc", "type": "github" }, "original": { @@ -68,11 +68,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1672946489, - "narHash": "sha256-IliWerC9qk4MxYNRoe/8uuQZkqjPJPsph46fmVBvo9U=", + "lastModified": 1678303550, + "narHash": "sha256-JlpoMXL+QIO0DUIyAcGRJte2G/jF/rSeO/zze5W7S/s=", "owner": "elkowar", "repo": "eww", - "rev": "6a64a286291456984011c4fb160def106ee55dff", + "rev": "45154bbf5962cad9c4e6c76f75d57dd8d740d307", "type": "github" }, "original": { @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1671802034, - "narHash": "sha256-mkv2u5nQJEV3KlWiopkt/gMz0OM4nmEXSfzkSw6welQ=", + "lastModified": 1673201375, + "narHash": "sha256-qlDIl1j6m3hrwbp993/1ncxyKfFRjt32zc3IHq6CeIk=", "owner": "erikarvstedt", "repo": "extra-container", - "rev": "e34f0cca15f6f0f2e598dad0b329196d0dab6d4f", + "rev": "8448f0d65bb436550c2a6eece0dd1b43c8b33462", "type": "github" }, "original": { @@ -200,11 +200,11 @@ }, "flake-utils_5": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "type": "github" }, "original": { @@ -221,11 +221,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1678109311, - "narHash": "sha256-Q64FoCH5rp3XHoC8u1+KyjLEFGTY7kX9YaIaYfugvfY=", + "lastModified": 1679265143, + "narHash": "sha256-5RDMW+O4owjdPz7t4K4YxH2fOHCNOcyVmSiKRUikiv0=", "owner": "nix-community", "repo": "home-manager", - "rev": "04d6cad67557512452decbfe888c68fa11338a96", + "rev": "1b8bf5c3270386a1b6850bd77d79dbdbaf0d7a7c", "type": "github" }, "original": { @@ -243,11 +243,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1678093429, - "narHash": "sha256-TDegkSVDSTwOi9j1tc84xiIctxYwgt4kBLfKu88cjlQ=", + "lastModified": 1679277046, + "narHash": "sha256-5E/Cd1PdYwN0bfR3dyyTQ2Wu5ADK3pg/Z+viAtfaP70=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "4f647a8e8be78d3817f126e41940bef49e81232e", + "rev": "d23bbd1687a5413fb7f2c08b67692d4e64f8efef", "type": "github" }, "original": { @@ -284,11 +284,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1678074139, - "narHash": "sha256-A8Yd/fxIwy+sV+/ewNOYg2qrbyRSUua2inu702PNiw4=", + "lastModified": 1678822843, + "narHash": "sha256-fsLQzwqzTwhdPjmrYzEh3jwefvwEzNv/0ZCAK/mDo28=", "owner": "chriscochrun", "repo": "church-presenter", - "rev": "fa427c31bb8a517e2ef0d8a82907ff3581dd0cd3", + "rev": "3809e697e8e688b5323c7add4dfc643a9afdf135", "type": "gitlab" }, "original": { @@ -305,11 +305,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1675430516, - "narHash": "sha256-ufVc6eJGlmk8J80ZCeSp2wwv4NvX6JzlfO2wNKp20Ls=", + "lastModified": 1678712159, + "narHash": "sha256-NVGsO1cw2U9FMgve0SJ1OpwgcfsEjPKtVjHwCNgFt9Q=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "479e21a122169a979ce63934f9f30a3ce1e39acb", + "rev": "282c45b7466c1028aa2c4287e4bb675e01caeb03", "type": "github" }, "original": { @@ -352,11 +352,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1678072060, - "narHash": "sha256-6a9Tbjhir5HxDx4uw0u6Z+LHUfYf7tsT9QxF9FN/32w=", + "lastModified": 1679224734, + "narHash": "sha256-1Ab3xY7Wgo1h1TNwRt6fp2XjV+KUo+hP1Bolh0KiDJs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "47c003416297e4d59a5e3e7a8b15cdbdf5110560", + "rev": "eac7da7b519a5aefe92c33c90b4450a24ebe0ab3", "type": "github" }, "original": { @@ -368,11 +368,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1674487464, - "narHash": "sha256-Jgq50e4S4JVCYpWLqrabBzDp/1mfaxHCh8/OOorHTy0=", + "lastModified": 1678116888, + "narHash": "sha256-/Y4RTkPq+RVJjkoM/mYyCREFLZhvtISc/rLcgM1vLvo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3954218cf613eba8e0dcefa9abe337d26bc48fd0", + "rev": "49596eb4e50b18337aad3b73317371bcd4e3b047", "type": "github" }, "original": { @@ -416,11 +416,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1674407282, - "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", + "lastModified": 1678072060, + "narHash": "sha256-6a9Tbjhir5HxDx4uw0u6Z+LHUfYf7tsT9QxF9FN/32w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ab1254087f4cdf4af74b552d7fc95175d9bdbb49", + "rev": "47c003416297e4d59a5e3e7a8b15cdbdf5110560", "type": "github" }, "original": { @@ -432,11 +432,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1677932085, - "narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=", + "lastModified": 1679172431, + "narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89", + "rev": "1603d11595a232205f03d46e635d919d1e1ec5b9", "type": "github" }, "original": { diff --git a/modules/emacs.nix b/modules/emacs.nix index 9dbe611..6dd32e9 100644 --- a/modules/emacs.nix +++ b/modules/emacs.nix @@ -12,6 +12,7 @@ with lib; consult-eglot org org-roam + org-ql denote denote-refs command-log-mode diff --git a/nyxt/init.lisp b/nyxt/init.lisp index 38bd2d6..e161ef8 100644 --- a/nyxt/init.lisp +++ b/nyxt/init.lisp @@ -53,8 +53,7 @@ ;; here we take that string and pipe it into mpv (mpv url))) :annotate-visible-only-p - nyxt/web-mode::annotate-visible-only-p) - (nyxt/) ) + nyxt/web-mode::annotate-visible-only-p)) ;; Let's create a function to hint videos, convert the url to a sting, and download with ytdl (define-command hint-ytdl (&key nyxt/web-mode::annotate-visible-only-p) @@ -239,7 +238,7 @@ (in-package #:nyxt-user) ; While implicit, this allows SLY to know which package we are in. -(load "~/quicklisp/setup.lisp") +;; (load "~/quicklisp/setup.lisp") ;; (ql:quickload :slynk) ;; (define-command-global start-slynk (&optional (slynk-port *swank-port*)) diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index c728eea..75ca3cd 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -24,6 +24,10 @@ with lib; krename kwallet-pam nm-tray + nyxt + sbcl + lispPackages.drakma + lispPackages.lquery # pantalaimon plasma5Packages.kwallet sierra-breeze-enhanced @@ -109,7 +113,7 @@ with lib; picom-jonaburg pamixer playerctl - jellyfin-mpv-shim + #jellyfin-mpv-shim pfetch macchina gimp diff --git a/scripts/cpu b/scripts/cpu index 2d49f20..e8b1d8a 100755 --- a/scripts/cpu +++ b/scripts/cpu @@ -4,4 +4,5 @@ # echo 100 - $(mpstat | rg all | cut -d \ -f43) | bc cpu="$(mpstat 1 1 | rg Average | awk '{print $3+$4+$5}' | sed 's/\(.*\)/\1%/g')" -echo $cpu +# echo $cpu +echo " $cpu" diff --git a/scripts/cpu-plasma.2s.sh b/scripts/cpu-plasma.2s.sh index cf201e1..c080f50 100755 --- a/scripts/cpu-plasma.2s.sh +++ b/scripts/cpu-plasma.2s.sh @@ -4,5 +4,5 @@ # echo 100 - $(mpstat | rg all | cut -d \ -f43) | bc cpu="$(mpstat 1 1 | rg Average | awk '{print $3+$4+$5}' | sed 's/\(.*\)/\1%/g')" -echo " $cpu" -# echo " $cpu | color=#D75F00 font='VictorMono Nerd Font' size=11" +# echo " $cpu" +echo " $cpu | bash='alacritty -e btop --class btop' color=#D75F00 font='VictorMono Nerd Font' size=11 iconname=cpu-symbolic" diff --git a/scripts/emacslof b/scripts/emacslof index ef57b38..912661c 100755 --- a/scripts/emacslof +++ b/scripts/emacslof @@ -18,7 +18,7 @@ if [ $(pgrep -c emacsclient) -gt 0 ]; then fi else if [ "$KDE_FULL_SESSION" = "true" ]; then - exec /home/chris/bin/ww -fa Emacs -c emacsclient + exec /home/chris/bin/ww -f emacs -c emacsclient exit else echo WAYLAND diff --git a/scripts/lfgimg.lisp b/scripts/lfgimg.lisp index 638c859..ed1d579 100755 --- a/scripts/lfgimg.lisp +++ b/scripts/lfgimg.lisp @@ -1,7 +1,7 @@ -#!/usr/bin/sbcl --script +;; #!/run/current-system/sw/bin/sbcl --script -(load "~/quicklisp/setup.lisp") -(ql:quickload '(drakma lquery)) +;; (load "~/quicklisp/setup.lisp") +;; (ql:quickload '(drakma lquery)) (defun get-images () (loop for i from 748 to 1489 do diff --git a/scripts/mem b/scripts/mem index e1ea2a4..ff98293 100755 --- a/scripts/mem +++ b/scripts/mem @@ -8,4 +8,5 @@ mem=$(awk -v u=$used -v t=$total -v p=$percent 'BEGIN {printf "%sMi/%sMi %.1f% " memperc=$(echo $mem | awk '{print $2}') -echo $memperc +# echo $memperc +echo " $memperc " diff --git a/scripts/mem-plasma.2s.sh b/scripts/mem-plasma.2s.sh index e655605..c0ffaa9 100755 --- a/scripts/mem-plasma.2s.sh +++ b/scripts/mem-plasma.2s.sh @@ -7,6 +7,6 @@ percent=$(bc -l <<< "100 * $total / $used") mem=$(awk -v u=$used -v t=$total -v p=$percent 'BEGIN {printf "%sMi/%sMi %.1f% ", t, u, p}'| awk '{printf $2}') -echo " $mem " -# echo " $mem | color=#9aedfe font='VictorMono Nerd Font' size=11" +# echo " $mem " +echo " $mem | bash='alacritty -e btop --class btop' color=#9aedfe font='VictorMono Nerd Font' size=11 iconname=memory-symbolic" # echo " $mem | color=#007687 font='VictorMono Nerd Font' size=11" diff --git a/scripts/muunread b/scripts/muunread index 458f1c3..e3a14ff 100755 --- a/scripts/muunread +++ b/scripts/muunread @@ -1,2 +1,4 @@ #!/bin/sh -mu find flag:unread AND NOT flag:trashed AND NOT maildir:\"/outlook/Junk\" AND NOT maildir:\"/office/Junk Email\" AND NOT maildir:\"/outlook/Deleted\" AND NOT maildir:\"/office/Deleted Items\" AND NOT maildir:\"/office/Archive\" AND NOT maildir:\"/outlook/Archive\" AND NOT maildir:\"/cochrun/Archive\" | wc -l +muunread="$(mu find flag:unread AND NOT flag:trashed AND NOT maildir:\"/outlook/Junk\" AND NOT maildir:\"/office/Junk Email\" AND NOT maildir:\"/outlook/Deleted\" AND NOT maildir:\"/office/Deleted Items\" AND NOT maildir:\"/office/Archive\" AND NOT maildir:\"/outlook/Archive\" AND NOT maildir:\"/cochrun/Archive\" | wc -l)" + +echo " $muunread " diff --git a/scripts/muunread-plasma.2s.sh b/scripts/muunread-plasma.2s.sh deleted file mode 100755 index 1a04a8f..0000000 --- a/scripts/muunread-plasma.2s.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env sh -muunread="$(mu find flag:unread AND NOT flag:trashed AND NOT maildir:\"/outlook/Junk\" AND NOT maildir:\"/office/Junk Email\" AND NOT maildir:\"/outlook/Deleted\" AND NOT maildir:\"/office/Deleted Items\" AND NOT maildir:\"/office/Archive\" AND NOT maildir:\"/outlook/Archive\" AND NOT maildir:\"/cochrun/Archive\" | wc -l)" - -echo " $muunread " -# echo " $muunread | color=#f3f99d font='VictorMono Nerd Font' size=11" -# echo " $muunread | color=#AF8700 font='VictorMono Nerd Font' size=11" diff --git a/user/home.nix b/user/home.nix index 30ad1d1..6fae7ee 100644 --- a/user/home.nix +++ b/user/home.nix @@ -97,7 +97,7 @@ IMAPAccount cochrun Host mail.cochrun.xyz User chris@cochrun.xyz - PassCmd "rbw get 'Office 365'" + PassCmd "${pkgs.rbw}/bin/rbw get 'Office 365'" AuthMechs LOGIN SSLType IMAPS # SSLVersions SSLv3