From 3e74aa18d6ffaa4898d008c22c274c0abb2148fe Mon Sep 17 00:00:00 2001 From: Madeleine Sydney Date: Tue, 6 May 2025 11:35:47 -0600 Subject: [PATCH] wip: SPLIT ME --- hosts/sydpc/configuration.nix | 4 ++++ modules/home/discord.nix | 2 +- modules/home/users/crumb/discord.nix | 1 - .../crumb/emacs/modules/lang/syd-lang-c.el | 7 +++++++ .../home/users/crumb/emacs/modules/syd-org.el | 17 ++++++++++++++--- .../home/users/crumb/emacs/modules/syd-pdfs.el | 4 +++- .../users/crumb/emacs/modules/syd-projects.el | 5 ++--- .../home/users/crumb/emacs/transient/history.el | 1 - modules/home/users/crumb/niri.nix | 2 +- users/crumb/default.nix | 4 +++- users/crumb/files.nix | 1 + 11 files changed, 36 insertions(+), 12 deletions(-) create mode 100644 modules/home/users/crumb/emacs/modules/lang/syd-lang-c.el delete mode 100644 modules/home/users/crumb/emacs/transient/history.el diff --git a/hosts/sydpc/configuration.nix b/hosts/sydpc/configuration.nix index a688aeb..1b6325a 100644 --- a/hosts/sydpc/configuration.nix +++ b/hosts/sydpc/configuration.nix @@ -49,6 +49,8 @@ }; }; + services.xserver.desktopManager.plasma5.enable = true; + # Disable systemd-sleep. Let KDE or whatever dim the screen without # suspending the computer. systemd.sleep.extraConfig = '' @@ -112,6 +114,8 @@ # services.pulseaudio.package = pkgs.pulseaudioFull; + services.flatpak.enable = true; + # Usually we try to delegate declarations of globally-available packages to # separate modules. These are some exceptional essentials. environment.systemPackages = [ diff --git a/modules/home/discord.nix b/modules/home/discord.nix index 2ed5b60..75cfc0e 100644 --- a/modules/home/discord.nix +++ b/modules/home/discord.nix @@ -59,5 +59,5 @@ in { # else pkgs.vesktop; }; }; - }); + }); } diff --git a/modules/home/users/crumb/discord.nix b/modules/home/users/crumb/discord.nix index 2d4b76c..bbc0fb3 100644 --- a/modules/home/users/crumb/discord.nix +++ b/modules/home/users/crumb/discord.nix @@ -23,7 +23,6 @@ in { vesktop = { state.firstLaunch = false; settings = { - discordBranch = "canary"; minimizeToTray = false; arRPC = true; }; diff --git a/modules/home/users/crumb/emacs/modules/lang/syd-lang-c.el b/modules/home/users/crumb/emacs/modules/lang/syd-lang-c.el new file mode 100644 index 0000000..1b2b8d9 --- /dev/null +++ b/modules/home/users/crumb/emacs/modules/lang/syd-lang-c.el @@ -0,0 +1,7 @@ +;;; syd-lang-c.el -*- lexical-binding: t; -*- + +(with-eval-after-load 'cc-mode + (dolist (c '(?_)) + (modify-syntax-entry c "w" c-mode-syntax-table))) + +(provide 'syd-lang-c) diff --git a/modules/home/users/crumb/emacs/modules/syd-org.el b/modules/home/users/crumb/emacs/modules/syd-org.el index b885e1c..2917580 100755 --- a/modules/home/users/crumb/emacs/modules/syd-org.el +++ b/modules/home/users/crumb/emacs/modules/syd-org.el @@ -148,6 +148,7 @@ See https://lists.gnu.org/archive/html/emacs-orgmode/2019-07/msg00081.html." '(org-special-keyword ((t (:inherit (font-lock-comment-face fixed-pitch))))) `(org-block ((t (:inherit fixed-pitch ,@(funcall bg 'sumi-ink-2))))) + `(org-quote ((t (:inherit (variable-pitch org-block))))) '(org-code ((t (:inherit (shadow fixed-pitch)))))))) (evil-define-command syd-org-yank-link (register) @@ -361,9 +362,7 @@ See https://lists.gnu.org/archive/html/emacs-orgmode/2019-07/msg00081.html." '((t (:inherit (bold error org-todo)))) "")) :custom ((org-startup-folded 'content) (org-directory "~/org") - ;; Let the agenda be comfortably mutable by storing the list of - ;; agenda files in a file. - (org-agenda-files "~/org/agenda-files") + (org-agenda-files (list org-directory)) (org-agenda-deadline-faces '((1.001 . error) (1.0 . org-warning) (0.5 . org-upcoming-deadline) @@ -533,6 +532,11 @@ See https://lists.gnu.org/archive/html/emacs-orgmode/2019-07/msg00081.html." :target (file+head "%<%Y-%m-%d>.org" "#+title: %<%Y-%m-%d>") :empty-lines 1)))) :config + (add-to-list 'org-agenda-files org-roam-directory) + (with-eval-after-load 'org-roam-dailies + (add-to-list 'org-agenda-files + (file-name-concat org-roam-directory + org-roam-dailies-directory))) (defun syd-org-init-roam-h () "Setup `org-roam' but don't immediately initialize its database. Instead, initialize it when it will be actually needed." @@ -589,5 +593,12 @@ In case of failure, fail gracefully." (use-package org-noter :commands org-noter) +(use-package org-contrib) + +(use-package ox-extra + :after org-contrib + :config + (ox-extras-activate '(latex-header-blocks ignore-headlines))) + (provide 'syd-org) ;;; syd-org.el ends here diff --git a/modules/home/users/crumb/emacs/modules/syd-pdfs.el b/modules/home/users/crumb/emacs/modules/syd-pdfs.el index f62c590..fc60c2f 100644 --- a/modules/home/users/crumb/emacs/modules/syd-pdfs.el +++ b/modules/home/users/crumb/emacs/modules/syd-pdfs.el @@ -8,7 +8,9 @@ :magic ("%PDF" . pdf-view-mode) :general (:keymaps 'pdf-view-mode-map :states 'motion - "q" #'kill-current-buffer) + "q" #'kill-current-buffer + "d" #'pdf-view-scroll-up-or-next-page + "u" #'pdf-view-scroll-down-or-previous-page) :custom ((pdf-view-display-size 'fit-page)) :config ;; HACK: Fix "Symbol's function definition is void: diff --git a/modules/home/users/crumb/emacs/modules/syd-projects.el b/modules/home/users/crumb/emacs/modules/syd-projects.el index d6e6600..d3a9705 100755 --- a/modules/home/users/crumb/emacs/modules/syd-projects.el +++ b/modules/home/users/crumb/emacs/modules/syd-projects.el @@ -56,13 +56,12 @@ :straight (:type git :host github :repo "msyds/projection" - :files (:defaults "src/projection-multi/*.el")) + :files ("src/projection-multi/*.el")) :general (:keymaps 'syd-leader-project-map "M" #'projection-multi-compile) :after projection :config - (require 'projection-multi-bb) - (setq projection-multi-bb-executable (executable-find "bb"))) + (require 'projection-multi-bb)) ;; ;; Embark integration for projection-multi. ;; (use-package projection-multi-embark diff --git a/modules/home/users/crumb/emacs/transient/history.el b/modules/home/users/crumb/emacs/transient/history.el deleted file mode 100644 index 90b5a84..0000000 --- a/modules/home/users/crumb/emacs/transient/history.el +++ /dev/null @@ -1 +0,0 @@ -nil \ No newline at end of file diff --git a/modules/home/users/crumb/niri.nix b/modules/home/users/crumb/niri.nix index d86045d..074d6af 100644 --- a/modules/home/users/crumb/niri.nix +++ b/modules/home/users/crumb/niri.nix @@ -140,7 +140,7 @@ in { } { # Block private DMs from screencast... matches = [ - { title = "Element \\|"; } + { title = "Element.*\\|"; } { title = "Discord.*@"; } ]; excludes = [ diff --git a/users/crumb/default.nix b/users/crumb/default.nix index 6935d06..35401e4 100755 --- a/users/crumb/default.nix +++ b/users/crumb/default.nix @@ -3,7 +3,7 @@ isNormalUser = true; # TODO: Don't hard-code `persist`. Use # config.sydnix.impermanence.persistGroupName. - extraGroups = [ "wheel" "persist" ]; + extraGroups = [ "wheel" "persist" "input" ]; initialHashedPassword = "$y$j9T$aEFDDwdTZbAc6VQRXrkBJ0$K8wxTGTWDihyX1wxJ.ZMH//wmQFfrGGUkLkxIU0Lyq8"; @@ -21,6 +21,8 @@ xdg.enable = true; home.preferXdgDirectories = true; + home.packages = [ pkgs.sioyek ]; + sydnix = { gpg.enable = true; sops = { diff --git a/users/crumb/files.nix b/users/crumb/files.nix index 237aef3..7dd9cc8 100755 --- a/users/crumb/files.nix +++ b/users/crumb/files.nix @@ -31,6 +31,7 @@ in lib.mkMerge [ "Pictures" "Documents" "Videos" + "Games" "src" # My projects. "scratch" # My playgrounds. "etc" # Miscellaneous belongings.