From 4d1c411870df9af85037aaabc1ce141469ee62e3 Mon Sep 17 00:00:00 2001 From: Ezri Brimhall Date: Fri, 28 Mar 2025 10:53:56 -0600 Subject: [PATCH] Updates prior to system reset --- ...alacritty.toml##default => alacritty.toml} | 8 ++++---- .config/eww/scripts/system.py | 2 +- .config/ssh/90-internet.conf | 7 ++++--- .../workspaces.json##hostname.gathering-storm | 8 ++++---- .config/systemd/user/emacs.service | 20 ------------------- .config/voidshell/config.yml | 4 +++- .config/zsh/utils.zsh | 2 +- .emacs.d/settings.org | 14 ++++++++++++- 8 files changed, 30 insertions(+), 35 deletions(-) rename .config/alacritty/{alacritty.toml##default => alacritty.toml} (86%) delete mode 100644 .config/systemd/user/emacs.service diff --git a/.config/alacritty/alacritty.toml##default b/.config/alacritty/alacritty.toml similarity index 86% rename from .config/alacritty/alacritty.toml##default rename to .config/alacritty/alacritty.toml index 0df2ef1..f88043a 100644 --- a/.config/alacritty/alacritty.toml##default +++ b/.config/alacritty/alacritty.toml @@ -43,19 +43,19 @@ render_timer = false size = 9 [font.bold] -family = "JetBrainsMono Nerd Font" +family = "JetBrains Mono" style = "Bold" [font.bold_italic] -family = "JetBrainsMono Nerd Font" +family = "JetBrains Mono" style = "Semibold Italic" [font.italic] -family = "JetBrainsMono Nerd Font" +family = "JetBrains Mono" style = "Italic" [font.normal] -family = "JetBrainsMono Nerd Font" +family = "JetBrains Mono" style = "Regular" [window] diff --git a/.config/eww/scripts/system.py b/.config/eww/scripts/system.py index 71c2834..ad31d8c 100755 --- a/.config/eww/scripts/system.py +++ b/.config/eww/scripts/system.py @@ -100,7 +100,7 @@ while True: "sensors": {chip: sensor(chip) for chip in sensor_list}, "memory": memory(), "swap": swap(), - "reboot": reboot(), +# "reboot": reboot(), "hostname": machine_info.get("PRETTY_HOSTNAME"), } print(json.dumps(result), flush=True) diff --git a/.config/ssh/90-internet.conf b/.config/ssh/90-internet.conf index c87be09..ce1e24d 100644 --- a/.config/ssh/90-internet.conf +++ b/.config/ssh/90-internet.conf @@ -5,8 +5,9 @@ Host gitea Hostname git.ezri.dev User git + ControlPersist no Host github - Hostname github.com - User git - ControlPersist no + Hostname github.com + User git + ControlPersist no diff --git a/.config/sway/workspaces.json##hostname.gathering-storm b/.config/sway/workspaces.json##hostname.gathering-storm index 41a12d4..6843240 100644 --- a/.config/sway/workspaces.json##hostname.gathering-storm +++ b/.config/sway/workspaces.json##hostname.gathering-storm @@ -16,7 +16,7 @@ }, { "index": 3, - "name": "documentation", + "name": "internet", "exec": "firefox", "args": ["--new-window"], "environ": {}, @@ -295,15 +295,15 @@ "reverse": false }, "left": { - "workspaces": [6, 2, 3, 4, 5], + "workspaces": [6, 2, 3, 18, 5], "reverse": true }, "center": { - "workspaces": [1, 7, 8, 9, 10, 11, 12, 13, 14, 15], + "workspaces": [1, 7, 8, 9, 10, 11, 12, 4, 14, 15], "reverse": false }, "right": { - "workspaces": [16, 17, 19, 18, 20, 13], + "workspaces": [16, 17, 19, 13, 20], "reverse": false } } diff --git a/.config/systemd/user/emacs.service b/.config/systemd/user/emacs.service deleted file mode 100644 index 056cba3..0000000 --- a/.config/systemd/user/emacs.service +++ /dev/null @@ -1,20 +0,0 @@ -[Unit] -Description=Emacs text editor -Documentation=info:emacs man:emacs(1) https://gnu.org/software/emacs/ -PartOf=graphical-session.target - -[Service] -Type=forking -ExecStart=/usr/bin/emacs --daemon -ExecStop=/usr/bin/emacsclient --eval "(kill-emacs)" -Environment=SSH_AUTH_SOCK=/run/user/1000/gnupg/S.gpg-agent.ssh -Environment=ASDF_DATA_DIR=/home/ezri/.local/share/asdf-vm -Restart=on-failure -Slice=session.slice -MemoryAccounting=yes -# Tide eats memory like crazy, so lets put it on a diet. -MemoryHigh=8G -MemoryMax=10G - -[Install] -WantedBy=graphical-session.target diff --git a/.config/voidshell/config.yml b/.config/voidshell/config.yml index c0af6c0..5a9fac0 100644 --- a/.config/voidshell/config.yml +++ b/.config/voidshell/config.yml @@ -1,5 +1,7 @@ -config: +vars: battery: BAT1 + slack: + team: E080NNY25MX import: - local.yml - outputs.yml diff --git a/.config/zsh/utils.zsh b/.config/zsh/utils.zsh index 74841db..f786970 100644 --- a/.config/zsh/utils.zsh +++ b/.config/zsh/utils.zsh @@ -16,7 +16,7 @@ function docker() { # Wrapper for docker command that executes it inside the systemd-nspawn docker container # This container has our home directory bound, so we should cd to the current directory before running this command - ssh -t dockerbox "cd $(pwd); /usr/bin/docker $*" + ssh -t dockerbox "env ORIGINALWD=\"$(pwd)\" ~/.local/bin/dockerbox.sh $*" } function random-xkcd() { diff --git a/.emacs.d/settings.org b/.emacs.d/settings.org index c42a7bb..223d3c0 100644 --- a/.emacs.d/settings.org +++ b/.emacs.d/settings.org @@ -131,6 +131,18 @@ Indent using tabs, render with tab-width of 2. ;; make buffer read-only (read-only-mode))) #+END_SRC +** IRC + +*** Default Configuration + +#+BEGIN_SRC emacs-lisp + (setopt rcirc-default-nick "netsorc") + (setopt rcirc-default-full-name "Networking Sorceress") + + (setopt rcirc-authinfo + `(("irc.libera.chat" nickserv "netsorc" ,(secrets-get-secret "Default keyring" "libera.chat")))) +#+END_SRC + * Theming ** Highlight current line #+BEGIN_SRC emacs-lisp @@ -566,7 +578,7 @@ Indent using tabs, render with tab-width of 2. * Development ** Copilot -#+BEGIN_SRC emacs-lisp +#+BEGIN_SRC disabled ;; Ensure dependencies are installed (use-package editorconfig :ensure t)