From 2dff9d2b61244fed49136028d0e0f6ae3ae759cf Mon Sep 17 00:00:00 2001 From: Preston Pan Date: Thu, 16 Jan 2025 00:13:06 -0800 Subject: modules about done --- config/doom.org | 664 -------- config/emacs.el | 18 +- config/emacs.org | 18 +- config/fish.org | 55 - config/nix.org | 2990 +++++++++++++++++++-------------- nix/modules/configuration.nix | 300 ++++ nix/modules/default.nix | 182 +- nix/modules/home/emacs.nix | 85 + nix/modules/home/firefox.nix | 260 +++ nix/modules/home/gammastep.nix | 18 + nix/modules/home/git.nix | 22 + nix/modules/home/home.nix | 15 + nix/modules/home/hyprland.nix | 132 ++ nix/modules/home/kitty.nix | 51 + nix/modules/home/mako.nix | 13 + nix/modules/home/mbsync.nix | 31 + nix/modules/home/mpd.nix | 27 + nix/modules/home/msmtp.nix | 25 + nix/modules/home/secrets.nix | 29 +- nix/modules/home/user.nix | 127 ++ nix/modules/home/waybar.nix | 272 +++ nix/modules/home/wofi.nix | 186 ++ nix/modules/home/yt-dlp.nix | 11 + nix/modules/home/zsh.nix | 41 + nix/modules/pipewire.nix | 30 + nix/modules/sda-simple.nix | 36 + nix/modules/secure-boot.nix | 20 - nix/modules/ssh.nix | 10 + nix/modules/tor.nix | 18 + nix/modules/vars.nix | 82 +- nix/modules/xserver.nix | 26 + nix/systems/desktop/configuration.nix | 8 +- nix/systems/desktop/home.nix | 2 +- nix/systems/desktop/user.nix | 20 +- nix/systems/installer/commits.nix | 2 +- nix/systems/installer/iso.nix | 29 +- 36 files changed, 3760 insertions(+), 2095 deletions(-) delete mode 100644 config/doom.org delete mode 100644 config/fish.org create mode 100644 nix/modules/configuration.nix create mode 100644 nix/modules/home/emacs.nix create mode 100644 nix/modules/home/firefox.nix create mode 100644 nix/modules/home/gammastep.nix create mode 100644 nix/modules/home/git.nix create mode 100644 nix/modules/home/home.nix create mode 100644 nix/modules/home/hyprland.nix create mode 100644 nix/modules/home/kitty.nix create mode 100644 nix/modules/home/mako.nix create mode 100644 nix/modules/home/mbsync.nix create mode 100644 nix/modules/home/mpd.nix create mode 100644 nix/modules/home/msmtp.nix create mode 100644 nix/modules/home/user.nix create mode 100644 nix/modules/home/waybar.nix create mode 100644 nix/modules/home/wofi.nix create mode 100644 nix/modules/home/yt-dlp.nix create mode 100644 nix/modules/home/zsh.nix create mode 100644 nix/modules/pipewire.nix create mode 100644 nix/modules/sda-simple.nix delete mode 100644 nix/modules/secure-boot.nix create mode 100644 nix/modules/ssh.nix create mode 100644 nix/modules/tor.nix create mode 100644 nix/modules/xserver.nix diff --git a/config/doom.org b/config/doom.org deleted file mode 100644 index c8dda21..0000000 --- a/config/doom.org +++ /dev/null @@ -1,664 +0,0 @@ -#+title: Doom Literate Config -#+author: Preston Pan -#+date: <2023-06-09 Fri> -#+description: My doom emacs configuration -#+html_head: - -* config.el Configuration -This is a doom emacs configuration. If you are not using doom emacs, do not use this document. -** Basic Information -My name, and the org mode directory on my computer, as well as basic editor configuration options. -Below is the old documentation. -#+begin_src emacs-lisp :tangle yes -(setq user-full-name "Preston Pan" - user-mail-address "preston@nullring.xyz") -(setq display-line-numbers-type t) -(setq x-select-enable-clipboard t) -(setq save-interprogram-paste-before-kill t) -(setq yank-pop-change-selection t) -(setq org-directory "~/org/") -(setq warning-minimum-level :emergency) -#+end_src -- `load!' for loading external *.el files relative to this one -- `add-load-path!' for adding directories to the `load-path', relative to - this file. Emacs searches the `load-path' when you load packages with - `require' or `use-package'. -** Modeline -In order to display the time in the modeline: -#+begin_src emacs-lisp :tangle yes -(display-time-mode 1) -#+end_src -To display the battery percentage: -#+begin_src emacs-lisp :tangle yes -(display-battery-mode 1) -#+end_src -** Transparency -Let's make emacs transparent. -#+begin_src emacs-lisp :tangle yes -(set-frame-parameter nil 'alpha-background 90) - -(add-to-list 'default-frame-alist '(alpha-background . 90)) -#+end_src -** EXWM -First we load our packages: -#+begin_src emacs-lisp :tangle yes -;; (use-package! exwm) -;; (use-package! exwm-config) -;; (exwm-config-example) -#+end_src -Now, we set our keybindings: -#+begin_src emacs-lisp :tangle yes -;; (setq exwm-input-global-keys -;; `( -;; ([?\s-r] . exwm-reset) -;; ([?\s-w] . exwm-workspace-switch) -;; ,@(mapcar (lambda (i) -;; `(,(kbd (format "s-%d" i)) . -;; (lambda () -;; (interactive) -;; (exwm-workspace-switch-create ,i)))) -;; (number-sequence 0 9)) -;; ([?\s-&] . (lambda (command) -;; (interactive (list (read-shell-command "$ "))) -;; (start-process-shell-command command nil command))) - -;; ([?\s-d] . (lambda () -;; (interactive) -;; (dired default-directory))) - -;; ([?\s-f] . (lambda () -;; (interactive) -;; (exwm-layout-toggle-mode-line) -;; (exwm-workspace-toggle-minibuffer))) - -;; ([?\s-b] . exwm-workspace-switch-to-buffer) - - -;; ([?\s-w] . (lambda () -;; (interactive) -;; (start-process "" nil "qutebrowser"))) -;; ([?\s-n] . (lambda () -;; (interactive) -;; (start-process "" nil "nyxt"))) -;; ([?\s-k] . (lambda () -;; (interactive) -;; (start-process "" nil "krita"))) -;; ([?\s-g] . (lambda () -;; (interactive) -;; (start-process "" nil "gimp"))) -;; ([?\s-b] . (lambda () -;; (interactive) -;; (start-process "" nil "blender"))) -;; ([?\s-c] . (lambda () -;; (interactive) -;; (start-process "" nil "chromium"))) -;; ([s-f2] . (lambda () -;; (interactive) -;; (start-process "" nil "/usr/bin/slock"))))) - -#+end_src -And we also need to set up our media keys: -#+begin_src emacs-lisp :tangle yes -;; (exwm-input-set-key (kbd "") 'emms-next) -;; (exwm-input-set-key (kbd "") 'emms-previous) -;; (exwm-input-set-key (kbd "") 'emms-pause) -;; (exwm-input-set-key -;; (kbd "") -;; (lambda () -;; (interactive) (start-process-shell-command -;; "pactl" nil "pactl set-sink-volume 0 +5% && pactl set-sink-volume 1 +5%"))) -;; (exwm-input-set-key -;; (kbd "") -;; (lambda () -;; (interactive) (start-process-shell-command -;; "pactl" nil "pactl set-sink-volume 0 -5% && pactl set-sink-volume 1 -5%"))) -;; (exwm-input-set-key -;; (kbd "") -;; (lambda () -;; (interactive) (start-process-shell-command -;; "pactl" nil "pactl set-sink-mute 0 tog -;; gle && pactl set-sink-mute 1 toggle"))) -;; Things to implement in exwm: -;;Key([], 'XF86MonBrightnessUp', lazy.spawn("light -A 10")), -;;Key([], 'XF86MonBrightnessDown', lazy.spawn("light -U 10")), -;;Key([], "Print", lazy.spawn("scrot '%Y-%m-%d-%s_screenshot_$wx$h.jpg' -e 'mv $f ~/img/scrot")), -#+end_src -** Font -Now we configure fonts: -#+begin_src emacs-lisp :tangle yes -(setq doom-font (font-spec :family "Hack" :size 16 :weight 'semi-light) - doom-variable-pitch-font (font-spec :family "Fira Sans" :size 16) - doom-unicode-font (font-spec :family "Symbola" :size 16) - doom-serif-font (font-spec :family "Fira Sans" :size 16) - doom-big-font (font-spec :family "Hack" :size 28)) -#+end_src -** Color Scheme -I'm experimenting with many themes right now. One of these themes is the city-lights theme, another one of them -is the catppuccin theme. -#+begin_src emacs-lisp :tangle yes -;; (setq doom-theme 'doom-ayu-light) -(setq doom-theme 'doom-gruvbox) -;; (setq catppuccin-flavor 'mocha) -;; (load-theme 'catppuccin) -#+end_src -** Doom Module and Programs Configuration -*** Agenda -Now we add these two files to our agenda search path: -#+begin_src emacs-lisp :tangle yes -(require 'org-habit) -(setq org-agenda-files (list "~/org/agenda.org" - "~/org/contacts.org" - "~/org/notes.org")) -(setq org-default-notes-file (concat org-directory "/notes.org")) -#+end_src -And we also want to set up org-habit to start graphing our habits as soon as possible: -#+begin_src emacs-lisp :tangle yes -(setq org-habit-preceding-days 1) -#+end_src -*** IRC -Set up circe to connect to my bouncer: -#+begin_src emacs-lisp :tangle yes -;; (after! circe -;; (set-irc-server! "nullring.xyz" -;; `(:tls t -;; :port 4095 -;; :nick "LiCoO2/AndreiNet" -;; :user "LiCoO2/AndreiNet" -;; :pass ,(+pass-get-secret "ZNC")))) -#+end_src -And another to connect to libera: -#+begin_src emacs-lisp :tangle yes -(after! circe (set-irc-server! "irc.libera.chat" - `(:tls t - :port 6697 - :nick "ret2pop" - :sasl-username "ret2pop" - :sasl-password (lambda (&rest _) (+pass-get-secret "libera.chat")) - :channels ("#emacs" "#rwx")))) -#+end_src -#+begin_src emacs-lisp :tangle yes -(after! circe (set-irc-server! "nullring.xyz" - `(:tls t - :port 6697 - :nick "LiCoO2"))) -#+end_src -*** Email -In order to use this configuration, you must install and configure mu and mbsync. -#+begin_src emacs-lisp :tangle yes - -;; (setq send-mail-function 'smtpmail-send-it) -;; (setq smtpmail-default-smtp-server "mail.nullring.xyz") -;; (setq smtpmail-smtp-server "mail.nullring.xyz") -;; (setq smtpmail-smtp-service 465) -;; (setq smtpmail-stream-type 'starttls) - -(require 'smtpmail) -(setq send-mail-function 'smtpmail-send-it) -(setq smtpmail-smtp-server "mail.nullring.xyz") -(setq smtpmail-default-smtp-server "mail.nullring.xyz") -(setq smtpmail-smtp-service 465) -(setq smtpmail-smtp-user "preston@nullring.xyz") -(setq smtpmail-stream-type 'ssl) -(setq smtpmail-debug-info t) -(setq smtpmail-auth-credentials '(("mail.nullring.xyz" 465 "preston@nullring.xyz" "lO7Y`\"-si\n#+html_head: \n#+html_head: \n#+options: broken-links:t") - (`weekly "#+TITLE: Weekly Journal\n#+STARTUP: folded") - (`monthly "#+TITLE: Monthly Journal\n#+STARTUP: folded") - (`yearly "#+TITLE: Yearly Journal\n#+STARTUP: folded")))) - -(setq org-journal-file-header 'org-journal-file-header-func) -(setq org-journal-file-format "%Y%m%d.org") -#+end_src -To add everything to the agenda search path, we toggle: -#+begin_src emacs-lisp :tangle yes -(setq org-journal-enable-agenda-integration t) -#+end_src -*** Brain -I don't use this anymore, but it's good to have. -#+begin_src emacs-lisp :tangle yes -(setq org-brain-path "~/org/website/brain/") -#+end_src -*** Roam -This is the configuration for my mindmap. -#+begin_src emacs-lisp :tangle yes -(setq org-roam-graph-viewer "qutebrowser") -(setq org-roam-directory (file-truename "~/org/website/mindmap")) -(setq org-roam-capture-templates '(("d" "default" plain "%?" - :target (file+head "${title}.org" - "#+title: ${title}\n#+author: Preston Pan\n#+html_head: \n#+html_head: \n#+html_head: \n#+options: broken-links:t") - :unnarrowed t))) -#+end_src -*** Publishing -In order to publish my website, we need to configure emacs to publish it somewhere and with diferrent parameters: -#+begin_src emacs-lisp :tangle yes -(require 'ox-publish) -(setq org-publish-project-alist - '(("website-org" - :base-directory "~/org/website" - :base-extension "org" - :publishing-directory "~/website_html" - :recursive t - :publishing-function org-html-publish-to-html - :headline-levels 4 - :html-preamble t - :html-preamble-format (("en" "

home | section main page

"))) - ("website-static" - :base-directory "~/org/website" - :base-extension "css\\|js\\|png\\|jpg\\|gif\\|pdf\\|mp3\\|ogg\\|swf\\|ico" - :publishing-directory "~/website_html/" - :recursive t - :publishing-function org-publish-attachment) - ("website" :auto-sitemap t :components ("website-org" "website-static")))) -;; (setq org-export-html-postamble-format '(("en" "

previous page | home

"))) -(setq org-html-postamble "Copyright © 2024 Preston Pan") -#+end_src -*** Contacts -Now we configure org-contacts, which allows me to store contacts in an org mode file: -#+begin_src emacs-lisp :tangle yes -(setq org-contacts-files '("~/org/contacts.org")) -#+end_src -And then we need to add some templates with org-capture in order to add entries to the contacts easier: -#+begin_src emacs-lisp :tangle yes -(defvar my/org-contacts-template "* %^{name} -:PROPERTIES: -:ADDRESS: %^{289 Cleveland St. Brooklyn, 11206 NY, USA} -:BIRTHDAY: %^{yyyy-mm-dd} -:EMAIL: %^{Email} -:NOTE: %^{NOTE} -:END:" "Template for org-contacts.") - -(setq org-capture-templates - `(("c" "Contact" entry (file+headline "~/org/contacts.org" "Friends"), my/org-contacts-template - :empty-lines 1))) -#+end_src -*** Org Timer -Sometimes I want a timer to help me keep track of the time. -#+begin_src emacs-lisp :tangle yes -(setq org-clock-sound "~/audio/ding.wav") -#+end_src -** External Packages -we want to include some packages that don't come with doom emacs. -*** KBD-Mode -kbd-mode allows us to edit kmonad kbd files with syntax highlighting: -#+begin_src emacs-lisp :tangle yes -(use-package! kbd-mode) -#+end_src -*** Pinentry -We now set up pinentry for the pass program. We need to set the mode to loopback -in order to enable emacs to start itself as a pinentry program, and we need to allow -loopbacks in gpg-agent.conf. -#+begin_src emacs-lisp :tangle yes -(use-package! pinentry - :init (setq epa-pinentry-mode `loopback) - (pinentry-start)) -#+end_src -*** Rainbow Mode -This is not used currently but might in the future. -#+begin_src emacs-lisp :tangle yes -(define-globalized-minor-mode global-rainbow-mode rainbow-mode - (lambda () - (when (not (memq major-mode - (list 'org-agenda-mode))) - (rainbow-mode 1)))) -#+end_src -*** Automatically tangle -Tangling manually every single time is kind of painful. Instead, we allow ourselves to set a flag -in org that allows org to know we should tangle on save: -#+begin_src emacs-lisp :tangle yes -(use-package! org-auto-tangle - :hook (org-mode . org-auto-tangle-mode)) -#+end_src -*** Notifications -We use ednc to manage notifications. -#+begin_src emacs-lisp :tangle yes -(ednc-mode 1) - -(defun show-notification-in-buffer (old new) - (let ((name (format "Notification %d" (ednc-notification-id (or old new))))) - (with-current-buffer (get-buffer-create name) - (if new (let ((inhibit-read-only t)) - (if old (erase-buffer) (ednc-view-mode)) - (insert (ednc-format-notification new t)) - (pop-to-buffer (current-buffer))) - (kill-buffer))))) - -(add-hook 'ednc-notification-presentation-functions - #'show-notification-in-buffer) - -(evil-define-key 'normal ednc-view-mode-map - (kbd "d") 'ednc-dismiss-notification - (kbd "RET") 'ednc-invoke-action - (kbd "e") 'ednc-toggle-expanded-view) -#+end_src -*** Playing Video -#+begin_src emacs-lisp :tangle yes -(setq empv-invidious-instance "https://yewtu.be/api/v1") -#+end_src -*** Mastodon -#+begin_src emacs-lisp :tangle yes -(setq mastodon-instance-url "https://types.pl") -(setq mastodon-active-user "ret2pop") -#+end_src -*** Ement -#+begin_src emacs-lisp :tangle yes -;; (ement-connect :uri-prefix "http://localhost:8009") -#+end_src -*** Stem -I wrote a [[https://github.com/ret2pop/stem-mode][major mode]] for my programming language [[https://github.com/ret2pop/stem][stem]]. -#+begin_src emacs-lisp :tangle yes -(use-package stem-mode) -(add-to-list 'auto-mode-alist '("\\.stem\\'" . stem-mode)) -#+end_src -*** Tufte -Our website uses the tufte css styling and we must therefore tell emacs to generate html that is compliant with this html: -#+begin_src emacs-lisp -(use-package! ox-tufte) -(use-package! plan9-theme) -#+end_src -*** This is supposed to work -but it doesn't -#+begin_src emacs-lisp -(setq org-export-with-section-numbers nil) -#+end_src - -* packages.el Configuration -These are some external packages that I use that are not provided by doom modules. -#+begin_src emacs-lisp :tangle packages.el -(unpin! evil-collection) -(package! evil-collection - :recipe (:repo "kepi/evil-collection" :branch "mu4e-development")) - -(package! pinentry) -(package! kbd-mode - :recipe (:host github - :repo "kmonad/kbd-mode")) -(package! nasm-mode) -(package! org-contrib) -(package! exwm) -(package! org-auto-tangle) -(package! rainbow-mode) -(package! ednc) -(package! mentor) -(package! request) ;; dependency for lemmy client -(package! plz) ;; dependency for lemmy client; either request or plz is idk what to use -(package! curl-to-elisp) -(package! empv) -(package! elpher) -(package! ement) -(package! mastodon) -(package! go-translate) -(package! ts) -(package! chess) -(package! ox-tufte) -(package! plan9-theme) -#+end_src - -* init.el Configuration -This installs all the doom modules that we are going to be configuring: -#+begin_src emacs-lisp :tangle init.el -(doom! :input - ;;bidi ; (tfel ot) thgir etirw uoy gnipleh - chinese - japanese - ;;layout ; auie,ctsrnm is the superior home row - - :completion - company - ;;helm ; the *other* search engine for love and life - ;;ido ; the other *other* search engine... - (ivy +icons +fuzzy) - ;; vertico - - :ui - ;;deft ; notational velocity for Emacs - doom - doom-dashboard - doom-quit - (emoji +unicode) - hl-todo - hydra - indent-guides - (ligatures +extra +fira) - minimap - modeline - ;;nav-flash ; blink cursor line after big motions - ;;neotree ; a project drawer, like NERDTree for vim - ophints - (popup +defaults) - ;; tabs - treemacs - unicode - (vc-gutter +pretty) - vi-tilde-fringe - window-select - workspaces - zen - - :editor - (evil +everywhere) - file-templates - fold - (format +onsave) - ;;god ; run Emacs commands without modifier keys - lispy - ;;multiple-cursors ; editing in many places at once - ;;objed ; text object editing for the innocent - parinfer - ;;rotate-text ; cycle region at point between text candidates - snippets - word-wrap - - :emacs - dired - electric - (ibuffer +icons) - undo - vc - - :term - eshell ; the elisp shell that works everywhere - ;;shell ; simple shell REPL for Emacs - ;; term ; basic terminal emulator for Emacs - vterm - - :checkers - syntax - (spell +flyspell) - grammar - - :tools - ;;ansible - ;;biblio ; Writes a PhD for you (citation needed) - (debugger +lsp) - ;;direnv - ;;docker - editorconfig - ein - (eval +overlay) - gist - (lookup +dictionary +offline) - lsp - magit - make - pass - pdf - ;;prodigy ; FIXME managing external services & code builders - rgb - ;;taskrunner ; taskrunner for all your projects - ;;terraform ; infrastructure as code - tmux - tree-sitter - ;;upload ; map local to remote projects via ssh/ftp - - :os - (:if IS-MAC macos) - tty - - :lang - ;;agda ; types of types of types of types... - ;;beancount ; mind the GAAP - (cc +lsp) - ;;clojure ; java with a lisp - common-lisp - ;;coq ; proofs-as-programs - ;;crystal ; ruby at the speed of c - ;;csharp ; unity, .NET, and mono shenanigans - data - ;;(dart +flutter) ; paint ui and not much else - ;;dhall - ;;elixir ; erlang done right - ;;elm ; care for a cup of TEA? - emacs-lisp - ;;erlang ; an elegant language for a more civilized age - ess - ;;factor - ;;faust ; dsp, but you get to keep your soul - ;;fortran ; in FORTRAN, GOD is REAL (unless declared INTEGER) - ;;fsharp ; ML stands for Microsoft's Language - ;;fstar ; (dependent) types and (monadic) effects and Z3 - ;;gdscript ; the language you waited for - (go +lsp) - ;;(graphql +lsp) ; Give queries a REST - (haskell +lsp) ; a language that's lazier than I am - ;;hy ; readability of scheme w/ speed of python - ;;idris ; a language you can depend on - (json +lsp) - ;;(java +lsp) ; the poster child for carpal tunnel syndrome - (javascript +lsp) - ;;julia ; a better, faster MATLAB - ;;kotlin ; a better, slicker Java(Script) - (latex +lsp +fold +cdlatex) - ;;lean ; for folks with too much to prove - ;;ledger ; be audit you can be - ;;lua ; one-based indices? one-based indices - (markdown +grip) - ;;nim ; python + lisp at the speed of c - nix - ;;ocaml ; an objective camel - (org +journal +jupyter +gnuplot +brain +pretty +roam2) - ;;php ; perl's insecure younger brother - ;;plantuml ; diagrams for confusing people more - ;;purescript ; javascript, but functional - (python +lsp +tree-sitter) - ;;qt ; the 'cutest' gui framework ever - ;;racket ; a DSL for DSLs - ;;raku ; the artist formerly known as perl6 - ;;rest ; Emacs as a REST client - ;;rst ; ReST in peace - ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} - (rust +lsp) - ;;scala ; java, but good - (scheme +guile) - (sh +fish +lsp) - ;;sml - solidity ; do you need a blockchain? No. - ;;swift ; who asked for emoji variables? - ;;terra ; Earth and Moon in alignment for performance. - (web +lsp) - (yaml +lsp) - ;;zig ; C, but simpler - - :email - (mu4e +org) - ;;notmuch - ;;(wanderlust +gmail) - - :app - calendar - emms - everywhere - irc - (rss +org) - ;;twitter ; twitter client https://twitter.com/vnought - - :config - literate - (default +bindings +smartparens)) -#+end_src diff --git a/config/emacs.el b/config/emacs.el index 57dda45..daedce3 100644 --- a/config/emacs.el +++ b/config/emacs.el @@ -116,13 +116,13 @@ org-hide-emphasis-markers t org-startup-with-inline-images t org-image-actual-width '(300)) - (setq org-agenda-files (list "~/org/agenda.org" + (setq org-agenda-files (list "~/monorepo/agenda.org" "~/org/notes.org" - "~/org/website/agenda.org")) + "~/org/agenda.org")) (setq org-default-notes-file (concat org-directory "/notes.org")) (setq org-publish-project-alist '(("website-org" - :base-directory "~/org/website" + :base-directory "~/monorepo" :base-extension "org" :publishing-directory "~/website_html" :recursive t @@ -131,7 +131,7 @@ :html-preamble t :html-preamble-format (("en" "

home | section main page

"))) ("website-static" - :base-directory "~/org/website" + :base-directory "~/monorepo" :base-extension "css\\|js\\|png\\|jpg\\|gif\\|pdf\\|mp3\\|ogg\\|swf\\|ico\\|asc\\|pub\\|webmanifest\\|xml" :publishing-directory "~/website_html/" :recursive t @@ -165,7 +165,7 @@ (use-package yasnippet :config - (add-to-list 'yas-snippet-dirs "~/org/website/yasnippet/") + (add-to-list 'yas-snippet-dirs "~/monorepo/yasnippet/") (yas-global-mode 1) :hook (org-mode . (lambda () (yas-minor-mode) (yas-activate-extra-mode 'latex-mode)))) @@ -228,7 +228,7 @@ (use-package org-journal :after (org) :init - (setq org-journal-dir "~/org/website/journal/") + (setq org-journal-dir "~/monorepo/journal/") (setq org-journal-date-format "%A, %d %B %Y") (defun org-journal-file-header-func (time) @@ -411,7 +411,7 @@ "w r" '(writeroom-mode :wk "focus mode for writing") "y n s" '(yas-new-snippet :wk "Create new snippet") "u w" '((lambda () (interactive) (shell-command "rsync -azvP ~/website_html/ root@nullring.xyz:/usr/share/nginx/ret2pop/")) :wk "rsync website update") - "h r r" '(lambda () (interactive) (org-babel-load-file (expand-file-name "~/org/website/config/emacs.org"))))) + "h r r" '(lambda () (interactive) (org-babel-load-file (expand-file-name "~/monorepo/config/emacs.org"))))) (use-package ellama :init @@ -429,7 +429,7 @@ (use-package elfeed-org :init - (setq rmh-elfeed-org-files '("~/org/website/config/elfeed.org")) + (setq rmh-elfeed-org-files '("~/monorepo/config/elfeed.org")) :config (elfeed-org)) @@ -482,7 +482,7 @@ :init (setq org-roam-db-update-on-save t) (setq org-roam-graph-viewer "chromium") - (setq org-roam-directory (file-truename "~/org/website/mindmap")) + (setq org-roam-directory (file-truename "~/monorepo/mindmap")) (setq org-roam-capture-templates '(("d" "default" plain "%?" :target (file+head "${title}.org" "#+title: ${title}\n#+author: Preston Pan\n#+html_head: \n#+html_head: \n#+html_head: \n#+options: broken-links:t") diff --git a/config/emacs.org b/config/emacs.org index 71c56ef..c56f9fa 100644 --- a/config/emacs.org +++ b/config/emacs.org @@ -133,13 +133,13 @@ Change these variables: org-hide-emphasis-markers t org-startup-with-inline-images t org-image-actual-width '(300)) - (setq org-agenda-files (list "~/org/agenda.org" + (setq org-agenda-files (list "~/monorepo/agenda.org" "~/org/notes.org" - "~/org/website/agenda.org")) + "~/org/agenda.org")) (setq org-default-notes-file (concat org-directory "/notes.org")) (setq org-publish-project-alist '(("website-org" - :base-directory "~/org/website" + :base-directory "~/monorepo" :base-extension "org" :publishing-directory "~/website_html" :recursive t @@ -148,7 +148,7 @@ Change these variables: :html-preamble t :html-preamble-format (("en" "

home | section main page

"))) ("website-static" - :base-directory "~/org/website" + :base-directory "~/monorepo" :base-extension "css\\|js\\|png\\|jpg\\|gif\\|pdf\\|mp3\\|ogg\\|swf\\|ico\\|asc\\|pub\\|webmanifest\\|xml" :publishing-directory "~/website_html/" :recursive t @@ -194,7 +194,7 @@ what electric-pair does based on the mode. #+begin_src emacs-lisp (use-package yasnippet :config - (add-to-list 'yas-snippet-dirs "~/org/website/yasnippet/") + (add-to-list 'yas-snippet-dirs "~/monorepo/yasnippet/") (yas-global-mode 1) :hook (org-mode . (lambda () (yas-minor-mode) (yas-activate-extra-mode 'latex-mode)))) #+end_src @@ -268,7 +268,7 @@ I use org-journal to journal about my life, and it's a part of my website: (use-package org-journal :after (org) :init - (setq org-journal-dir "~/org/website/journal/") + (setq org-journal-dir "~/monorepo/journal/") (setq org-journal-date-format "%A, %d %B %Y") (defun org-journal-file-header-func (time) @@ -483,7 +483,7 @@ Ivy is a pretty cool general program for displaying stuff: "w r" '(writeroom-mode :wk "focus mode for writing") "y n s" '(yas-new-snippet :wk "Create new snippet") "u w" '((lambda () (interactive) (shell-command "rsync -azvP ~/website_html/ root@nullring.xyz:/usr/share/nginx/ret2pop/")) :wk "rsync website update") - "h r r" '(lambda () (interactive) (org-babel-load-file (expand-file-name "~/org/website/config/emacs.org"))))) + "h r r" '(lambda () (interactive) (org-babel-load-file (expand-file-name "~/monorepo/config/emacs.org"))))) #+end_src ** LLM I use LLMs in order to help me come up with ideas. I use a local LLM so that I can have a @@ -509,7 +509,7 @@ elfeed to fetch feeds found on my website: (use-package elfeed-org :init - (setq rmh-elfeed-org-files '("~/org/website/config/elfeed.org")) + (setq rmh-elfeed-org-files '("~/monorepo/config/elfeed.org")) :config (elfeed-org)) #+end_src @@ -574,7 +574,7 @@ For all my mathematics and programming notes: :init (setq org-roam-db-update-on-save t) (setq org-roam-graph-viewer "chromium") - (setq org-roam-directory (file-truename "~/org/website/mindmap")) + (setq org-roam-directory (file-truename "~/monorepo/mindmap")) (setq org-roam-capture-templates '(("d" "default" plain "%?" :target (file+head "${title}.org" "#+title: ${title}\n#+author: Preston Pan\n#+html_head: \n#+html_head: \n#+html_head: \n#+options: broken-links:t") diff --git a/config/fish.org b/config/fish.org deleted file mode 100644 index cb6e0af..0000000 --- a/config/fish.org +++ /dev/null @@ -1,55 +0,0 @@ -#+title: Fish RC File -#+author: Preston Pan -#+date: <2023-06-09 Fri> -#+description: My fish shell configuration. - -#+html_head: - -* Configuration -** Environment Variables -We define our path and also some environment variables. Since -I use guix as one of my package managers, I set GUIX_LOCPATH. -Also, I have a ~/.local/bin directory where I keep my scripts. -#+begin_src fish :tangle config.fish -fish_add_path -m ~/.local/bin -fish_add_path -m ~/gems/bin -fish_add_path -m ~/.local/share/gem/ruby/3.0.0/bin -set -x GUIX_LOCPATH $HOME/.guix-profile/lib/locale -set -x GEM_HOME "~/gems" -#+end_src -** Aliases -Now we define some aliases: -*** Git -We want to define aliases only if we call fish as an interactive shell. -We also define some common aliases for git commands: -#+begin_src fish :tangle config.fish -if status is-interactive - alias gcl="git clone" - alias gp="git push" - alias gpu="git pull" - alias gcm="git commit" -#+end_src -*** Pacman -Now we define aliases for commonly used pacman commands in the form -of the paru aur helper: -#+begin_src fish :tangle config.fish - alias p="paru -S" - alias pq="paru -sS" - alias pd="paru -Rncs" - alias syncweb="rsync -uvrP --delete-after website_html/ root@nullring.xyz:/var/www/ret2pop/" -#+end_src -*** Misc. -These are generally useful commands. Since I use mbsync, I wrote an alias -for it. -#+begin_src fish :tangle config.fish - alias c="clear" - alias l="ls -a" - alias mkdir="mkdir -pv" - alias syncmail="mbsync -c ~/.config/doom/mbsyncrc prestonpan" -#+end_src -** Vi Mode -Now we want to use vi mode because it is better. -#+begin_src fish :tangle config.fish - fish_vi_key_bindings -end -#+end_src diff --git a/config/nix.org b/config/nix.org index 0b725c9..a01a03a 100644 --- a/config/nix.org +++ b/config/nix.org @@ -1,1305 +1,1809 @@ #+title: NixOS Configuration #+AUTHOR: Preston Pan -#+Description: My NixOS configuration in full +#+DESCRIPTION: My NixOS system, written entirely in a literate configuration #+html_head: -* Configuration -#+begin_src nix :tangle t - # Edit this configuration file to define what should be installed on - # your system. Help is available in the configuration.nix(5) man page - # and in the NixOS manual (accessible by running ‘nixos-help’). +* Home +** User +#+begin_src nix :tangle ../nix/systems/desktop/user.nix +{ lib, config, pkgs, wallpapers, scripts, ... }: +let + vars = import ./vars.nix; +in +{ + sops = { + defaultSopsFile = ../../secrets/secrets.yaml; + age = { + keyFile = "/home/${vars.userName}/.ssh/keys.txt"; + }; + secrets.mail = { + format = "yaml"; + path = "${config.sops.defaultSymlinkPath}/mail"; + }; + secrets.digikey = { + format = "yaml"; + path = "${config.sops.defaultSymlinkPath}/digikey"; + }; - { config, pkgs, ... }: + defaultSymlinkPath = "/run/user/1000/secrets"; + defaultSecretsMountPoint = "/run/user/1000/secrets.d"; + }; + + home = { + activation.startup-files = lib.hm.dag.entryAfter [ "installPackages" ] '' + if [ ! -d "/home/${vars.userName}/src/publish-org-roam-ui" ]; then + mkdir -p /home/${vars.userName}/src + ${pkgs.git}/bin/git clone https://git.${vars.remoteHost}/publish-org-roam-ui.git /home/${vars.userName}/src/publish-org-roam-ui + fi + if [ ! -d "/home/${vars.userName}/email/ret2pop/" ]; then + mkdir -p /home/${vars.userName}/email/ret2pop/ + fi + if [ ! -d "/home/${vars.userName}/music" ]; then + mkdir -p /home/${vars.userName}/music + fi + if [ ! -d "/home/${vars.userName}/sounds" ]; then + mkdir -p /home/${vars.userName}/sounds + fi + touch /home/${vars.userName}/org/agenda.org + touch /home/${vars.userName}/org/notes.org + if [ ! -f "/home/${vars.userName}/.toughnix" ]; then + echo "Don't delete this file. Autogen by home manager" > "/home/${vars.userName}/.toughnix" + fi + ''; + + enableNixpkgsReleaseCheck = false; + username = vars.userName; + homeDirectory = "/home/${vars.userName}"; + stateVersion = "24.11"; + + packages = with pkgs; [ + age + acpilight + alsa-utils + autobuild + bash-language-server + bear + bitcoin + bun + cargo + clang + clang-tools + curl + electrum + ffmpeg + fira-code + font-awesome_6 + fswebcam + gdb + ghostscript + git + gnumake + gnupg + graphviz + grim + gum + (writeShellScriptBin "post-install" '' +cd $HOME +ping -q -c1 google.com &>/dev/null && echo "online! Proceeding with the post-install..." || nmtui +sudo chown -R "$(whoami)":users ./monorepo + +sudo nixos-rebuild switch --flake ./monorepo/nix#continuity +echo "Post install done! Now install your ssh and gpg keys. Log in again." +sleep 3 +exit +'') + helvum + imagemagick + inkscape + jq + krita + libnotify + miniserve + monero-cli + monero-gui + mpc-cli + mu + nil + nixd + nixfmt-rfc-style + nodejs + noto-fonts + noto-fonts-cjk-sans + noto-fonts-emoji + octaveFull + openscad + openscad-lsp + pandoc + passExtensions.pass-otp + pavucontrol + pfetch + pinentry + poetry + python3 + python312Packages.jedi + rsync + rust-analyzer + rustfmt + solc + sops + sox + swww + texliveFull + tor-browser + torsocks + typescript + vesktop + vim + vscode-langservers-extracted + x11_ssh_askpass + xdg-utils + yarn + (aspellWithDicts + (dicts: with dicts; [ en en-computers en-science ])) + (nerdfonts.override { fonts = [ "Iosevka" ]; }) + (pass.withExtensions (ext: with ext; [ + pass-otp + pass-import + pass-genphrase + pass-update + pass-tomb + ])) + ]; + }; - { - imports = - [ - # Include the results of the hardware scan. - ./hardware-configuration.nix - - ]; + services = { + mako = { + enable = true; + backgroundColor = "#11111bf8"; + textColor = "#cdd6f4"; + borderColor = "#89b4faff"; + borderRadius = 1; + font = "Fira Code 10"; + defaultTimeout = 3000; + extraConfig = '' +on-notify=exec mpv /home/${vars.userName}/sounds/notification.wav --no-config --no-video +''; + }; - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + gpg-agent = { + pinentryPackage = pkgs.pinentry-emacs; + enable = true; + extraConfig = '' + allow-emacs-pinentry + allow-loopback-pinentry + ''; + }; - networking.hostName = "continuity"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + gammastep = { + enable = true; + provider = "manual"; + latitude = 49.282730; + longitude = -123.120735; + + temperature = { + day = 5000; + night = 3000; + }; + + settings = { + general = { + adjustment-method = "wayland"; + }; + }; + }; + + mpd = { + enable = true; + dbFile = "/home/${vars.userName}/.config/mpd/db"; + dataDir = "/home/${vars.userName}/.config/mpd/"; + network.port = 6600; + musicDirectory = "/home/${vars.userName}/music"; + playlistDirectory = "/home/${vars.userName}/.config/mpd/playlists"; + network.listenAddress = "0.0.0.0"; + extraConfig = '' + audio_output { + type "pipewire" + name "pipewire output" + } + audio_output { + type "httpd" + name "My HTTP Stream" + encoder "opus" # optional + port "8000" + # quality "5.0" # do not define if bitrate is defined + bitrate "128000" # do not define if quality is defined + format "48000:16:1" + always_on "yes" # prevent MPD from disconnecting all listeners when playback is stopped. + tags "yes" # httpd supports sending tags to listening streams. + } + ''; + }; + }; - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + programs = { + chromium = { + package = pkgs.chromium; + enable = true; + extensions = [ + "ddkjiahejlhfcafbddmgiahcphecmpfh" # ublock-origin lite + "dbepggeogbaibhgnhhndojpepiihcmeb" # vimium + "eimadpbcbfnmbkopoojfekhnkhdbieeh" # dark reader + "oicakdoenlelpjnkoljnaakdofplkgnd" # tree style tabs + "nkbihfbeogaeaoehlefnkodbefgpgknn" # metamask + ]; + }; - # Enable networking - networking.networkmanager.enable = true; + mpv = { + enable = true; + config = { + profile = "gpu-hq"; + force-window = true; + ytdl-format = "bestvideo+bestaudio"; + cache-default = 4000000; + }; + }; - # Set your time zone. - time.timeZone = "America/Vancouver"; + yt-dlp = { + enable = true; + settings = { + embed-thumbnail = true; + embed-subs = true; + sub-langs = "all"; + downloader = "aria2c"; + downloader-args = "aria2c:'-c -x8 -s8 -k1M'"; + }; + }; - # Select internationalisation properties. - i18n.defaultLocale = "en_CA.UTF-8"; + wofi = { + enable = true; + settings = { + location = "bottom-right"; + allow_markup = true; + show = "drun"; + width = 750; + height = 400; + always_parse_args = true; + show_all = false; + term = "kitty"; + hide_scroll = true; + print_command = true; + insensitive = true; + prompt = "Run what, Commander?"; + columns = 2; + }; - # Enable the X11 windowing system. - services.xserver.enable = true; - services.xserver.displayManager.startx.enable = true; + style = '' + @define-color rosewater #f5e0dc; + @define-color rosewater-rgb rgb(245, 224, 220); + @define-color flamingo #f2cdcd; + @define-color flamingo-rgb rgb(242, 205, 205); + @define-color pink #f5c2e7; + @define-color pink-rgb rgb(245, 194, 231); + @define-color mauve #cba6f7; + @define-color mauve-rgb rgb(203, 166, 247); + @define-color red #f38ba8; + @define-color red-rgb rgb(243, 139, 168); + @define-color maroon #eba0ac; + @define-color maroon-rgb rgb(235, 160, 172); + @define-color peach #fab387; + @define-color peach-rgb rgb(250, 179, 135); + @define-color yellow #f9e2af; + @define-color yellow-rgb rgb(249, 226, 175); + @define-color green #a6e3a1; + @define-color green-rgb rgb(166, 227, 161); + @define-color teal #94e2d5; + @define-color teal-rgb rgb(148, 226, 213); + @define-color sky #89dceb; + @define-color sky-rgb rgb(137, 220, 235); + @define-color sapphire #74c7ec; + @define-color sapphire-rgb rgb(116, 199, 236); + @define-color blue #89b4fa; + @define-color blue-rgb rgb(137, 180, 250); + @define-color lavender #b4befe; + @define-color lavender-rgb rgb(180, 190, 254); + @define-color text #cdd6f4; + @define-color text-rgb rgb(205, 214, 244); + @define-color subtext1 #bac2de; + @define-color subtext1-rgb rgb(186, 194, 222); + @define-color subtext0 #a6adc8; + @define-color subtext0-rgb rgb(166, 173, 200); + @define-color overlay2 #9399b2; + @define-color overlay2-rgb rgb(147, 153, 178); + @define-color overlay1 #7f849c; + @define-color overlay1-rgb rgb(127, 132, 156); + @define-color overlay0 #6c7086; + @define-color overlay0-rgb rgb(108, 112, 134); + @define-color surface2 #585b70; + @define-color surface2-rgb rgb(88, 91, 112); + @define-color surface1 #45475a; + @define-color surface1-rgb rgb(69, 71, 90); + @define-color surface0 #313244; + @define-color surface0-rgb rgb(49, 50, 68); + @define-color base #1e1e2e; + @define-color base-rgb rgb(30, 30, 46); + @define-color mantle #181825; + @define-color mantle-rgb rgb(24, 24, 37); + @define-color crust #11111b; + @define-color crust-rgb rgb(17, 17, 27); + + * { + font-family: 'Iosevka Nerd Font', monospace; + font-size: 14px; + } + + /* Window */ + window { + margin: 0px; + padding: 10px; + border: 0.16em solid @lavender; + border-radius: 0.1em; + background-color: @base; + animation: slideIn 0.5s ease-in-out both; + } + + /* Slide In */ + @keyframes slideIn { + 0% { + opacity: 0; + } + + 100% { + opacity: 1; + } + } + + /* Inner Box */ + #inner-box { + margin: 5px; + padding: 10px; + border: none; + background-color: @base; + animation: fadeIn 0.5s ease-in-out both; + } + + /* Fade In */ + @keyframes fadeIn { + 0% { + opacity: 0; + } + + 100% { + opacity: 1; + } + } + + /* Outer Box */ + #outer-box { + margin: 5px; + padding: 10px; + border: none; + background-color: @base; + } + + /* Scroll */ + #scroll { + margin: 0px; + padding: 10px; + border: none; + background-color: @base; + } + + /* Input */ + #input { + margin: 5px 20px; + padding: 10px; + border: none; + border-radius: 0.1em; + color: @text; + background-color: @base; + animation: fadeIn 0.5s ease-in-out both; + } + + #input image { + border: none; + color: @red; + } + + #input * { + outline: 4px solid @red!important; + } + + /* Text */ + #text { + margin: 5px; + border: none; + color: @text; + animation: fadeIn 0.5s ease-in-out both; + } + + #entry { + background-color: @base; + } + + #entry arrow { + border: none; + color: @lavender; + } + + /* Selected Entry */ + #entry:selected { + border: 0.11em solid @lavender; + } + + #entry:selected #text { + color: @mauve; + } + + #entry:drop(active) { + background-color: @lavender!important; + } + ''; + }; - # Configure keymap in X11 - services.xserver = { - layout = "us"; - xkbVariant = ""; - xkbOptions = "caps:escape"; + kitty = { + enable = true; + settings = { + enable_audio_bell = false; + font_family = "Iosevka Nerd Font"; + font_size = 14; + confirm_os_window_close = 0; + background_opacity = "0.9"; + # Catppuccin theme + foreground = "#cdd6f4"; + background = "#1e1e2e"; + selection_foreground = "#1e1e2e"; + selection_background = "#f5e0dc"; + cursor = "#f5e0dc"; + cursor_text_color = "#1e1e2e"; + url_color = "#f5e0dc"; + active_border_color = "#B4BEFE"; + inactive_border_color = "#6C7086"; + bell_border_color = "#F9E2AF"; + wayland_titlebar_color = "#1E1E2E"; + macos_titlebar_color = "#1E1E2E"; + active_tab_foreground = "#11111B"; + active_tab_background = "#CBA6F7"; + inactive_tab_foreground = "#CDD6F4"; + inactive_tab_background = "#181825"; + tab_bar_background = "#11111B"; + mark1_foreground = "#1E1E2E"; + mark1_background = "#B4BEFE"; + mark2_foreground = "#1E1E2E"; + mark2_background = "#CBA6F7"; + mark3_foreground = "#1E1E2E"; + mark3_background = "#74C7EC"; + color0 = "#45475A"; + color8 = "#585B70"; + color1 = "#F38BA8"; + color9 = "#F38BA8"; + color2 = "#A6E3A1"; + color10 = "#A6E3A1"; + color3 = "#F9E2AF"; + color11 = "#F9E2AF"; + color4 = "#89B4FA"; + color12 = "#89B4FA"; + color5 = "#F5C2E7"; + color13 = "#F5C2E7"; + color6 = "#94E2D5"; + color14 = "#94E2D5"; + color7 = "#BAC2DE"; + color15 = "#A6ADC8"; + }; }; - # Enable CUPS to print documents. - services.printing.enable = true; + firefox = { + policies = { + EnableTrackingProtection = true; + OfferToSaveLogins = false; + }; - # Enable sound with pipewire. - sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { + package = pkgs.firefox-wayland; enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - # If you want to use JACK applications, uncomment this - #jack.enable = true; - # use the example session manager (no others are packaged yet so this is enabled by default, - # no need to redefine it in your config for now) - #media-session.enable = true; + profiles = { + default = { + id = 0; + name = "default"; + isDefault = true; + + extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + ublock-origin + tree-style-tab + firefox-color + vimium + metamask + ]; + + settings = { + media = { + memory_cache_max_size = 65536; + cache_readahead_limit = 7200; + cache_resume_threshold = 3600; + peerconnection.ice = { + proxy_only_if_behind_proxy = true; + default_address_only = true; + }; + }; + + gfx = { + content.skia-font-cache-size = 20; + canvas.accelerated = { + cache-items = 4096; + cache-size = 512; + }; + }; + + network = { + http = { + max-connections = 1800; + max-persistent-connections-per-server = 10; + max-urgent-start-excessive-connections-per-host = 5; + referer.XOriginTrimmingPolicy = 2; + }; + + buffer.cache = { + size = 262144; + count = 128; + }; + + dns = { + max_high_priority_threads = 8; + disablePrefetch = true; + }; + + pacing.requests.enabled = false; + dnsCacheExpiration = 3600; + ssl_tokens_cache_capacity = 10240; + prefetch-next = false; + predictor.enabled = false; + cookie.sameSite.noneRequiresSecure = true; + IDN_show_punycode = true; + auth.subresource-http-auth-allow = 1; + captive-portal-service.enabled = false; + connectivity-service.enabled = false; + }; + + browser = { + download = { + always_ask_before_handling_new_types = true; + manager.addToRecentDocs = false; + open_pdf_attachments_inline = true; + start_downloads_in_tmp_dir = true; + }; + + urlbar = { + suggest.quicksuggest.sponsored = false; + suggest.quicksuggest.nonsponsored = false; + suggest.calculator = true; + update2.engineAliasRefresh = true; + unitConversion.enabled = true; + trending.featureGate = false; + }; + + search = { + separatePrivateDefault.ui.enabled = true; + suggest.enabled = false; + }; + + newtabpage.activity-stream = { + feeds = { + topsites = false; + section.topstories = false; + telemetry = false; + }; + asrouter.userprefs.cfr = { + addons = false; + features = false; + }; + telemetry = false; + }; + + privatebrowsing = { + vpnpromourl = ""; + forceMediaMemoryCache = true; + }; + + display = { + focus_ring_on_anything = true; + focus_ring_style = 0; + focus_ring_width = 0; + }; + + cache.jsbc_compression_level = 3; + helperApps.deleteTempFileOnExit = true; + uitour.enabled = false; + sessionstore.interval = 60000; + formfill.enable = false; + xul.error_pages.expert_bad_cert = true; + contentblocking.category = "strict"; + ping-centre.telemetry = false; + discovery.enabled = false; + shell.checkDefaultBrowser = false; + preferences.moreFromMozilla = false; + tabs.tabmanager.enabled = false; + aboutConfig.showWarning = false; + aboutwelcome.enabled = false; + bookmarks.openInTabClosesMenu = false; + menu.showViewImageInfo = true; + compactmode.show = true; + safebrowsing.downloads.remote.enabled = false; + tabs.crashReporting.sendReport = false; + crashReports.unsubmittedCheck.autoSubmit2 = false; + privateWindowSeparation.enabled = false; + }; + + security = { + mixed_content = { + block_display_content = true; + upgrade_display_content = true; + }; + insecure_connection_text = { + enabled = true; + pbmode.enabled = true; + }; + OCSP.enabled = 0; + remote_settings.crlite_filters.enabled = true; + pki.crlite_mode = 2; + ssl.treat_unsafe_negotiation_as_broken = true; + tls.enable_0rtt_data = false; + }; + + toolkit = { + telemetry = { + unified = false; + enabled = false; + server = "data:,"; + archive.enabled = false; + newProfilePing.enabled = false; + shutdownPingSender.enabled = false; + updatePing.enabled = false; + bhrPing.enabled = false; + firstShutdownPing.enabled = false; + coverage.opt-out = true; + }; + coverage = { + opt-out = true; + endpoint.base = ""; + }; + legacyUserProfileCustomizations.stylesheets = true; + }; + + dom = { + security = { + https_first = true; + https_first_schemeless = true; + sanitizer.enabled = true; + }; + enable_web_task_scheduling = true; + }; + + layout = { + css = { + grid-template-masonry-value.enabled = true; + has-selector.enabled = true; + prefers-color-scheme.content-override = 2; + }; + word_select.eat_space_to_next_word = false; + }; + + urlclassifier = { + trackingSkipURLs = "*.reddit.com, *.twitter.com, *.twimg.com, *.tiktok.com"; + features.socialtracking.skipURLs = "*.instagram.com, *.twitter.com, *.twimg.com"; + }; + + privacy = { + globalprivacycontrol.enabled = true; + history.custom = true; + userContext.ui.enabled = true; + }; + + full-screen-api = { + transition-duration = { + enter = "0 0"; + leave = "0 0"; + }; + warning = { + delay = -1; + timeout = 0; + }; + }; + + permissions.default = { + desktop-notification = 2; + geo = 2; + }; + + signon = { + formlessCapture.enabled = false; + privateBrowsingCapture.enabled = false; + }; + + datareporting = { + policy.dataSubmissionEnabled = false; + healthreport.uploadEnabled = false; + }; + + extensions = { + pocket.enabled = false; + getAddons.showPane = false; + htmlaboutaddons.recommendations.enabled = false; + postDownloadThirdPartyPrompt = false; + }; + + app = { + shield.optoutstudies.enabled = false; + normandy.enabled = false; + normandy.api_url = ""; + }; + + image.mem.decode_bytes_at_a_time = 32768; + editor.truncate_user_pastes = false; + pdfjs.enableScripting = false; + geo.provider.network.url = "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"; + permissions.manager.defaultsUrl = ""; + webchannel.allowObject.urlWhitelist = ""; + breakpad.reportURL = ""; + captivedetect.canonicalURL = ""; + cookiebanners.service.mode = 1; + findbar.highlightAll = true; + content.notify.interval = 100000; + }; + }; + }; + }; + + waybar = { + enable = true; + style = '' + * { + border: none; + border-radius: 0px; + font-family: Iosevka Nerd Font, FontAwesome, Noto Sans CJK; + font-size: 14px; + font-style: normal; + min-height: 0; + } + + window#waybar { + background: rgba(30, 30, 46, 0.5); + border-bottom: 1px solid #45475a; + color: #cdd6f4; + } + + #workspaces { + background: #45475a; + margin: 5px 5px 5px 5px; + padding: 0px 5px 0px 5px; + border-radius: 16px; + border: solid 0px #f4d9e1; + font-weight: normal; + font-style: normal; + } + #workspaces button { + padding: 0px 5px; + border-radius: 16px; + color: #a6adc8; + } + + #workspaces button.active { + color: #f4d9e1; + background-color: transparent; + border-radius: 16px; + } + + #workspaces button:hover { + background-color: #cdd6f4; + color: black; + border-radius: 16px; + } + + #custom-date, #clock, #battery, #pulseaudio, #network, #custom-randwall, #custom-launcher { + background: transparent; + padding: 5px 5px 5px 5px; + margin: 5px 5px 5px 5px; + border-radius: 8px; + border: solid 0px #f4d9e1; + } + + #custom-date { + color: #D3869B; + } + + #custom-power { + color: #24283b; + background-color: #db4b4b; + border-radius: 5px; + margin-right: 10px; + margin-top: 5px; + margin-bottom: 5px; + margin-left: 0px; + padding: 5px 10px; + } + + #tray { + background: #45475a; + margin: 5px 5px 5px 5px; + border-radius: 16px; + padding: 0px 5px; + /*border-right: solid 1px #282738;*/ + } + + #clock { + color: #cdd6f4; + background-color: #45475a; + border-radius: 0px 0px 0px 24px; + padding-left: 13px; + padding-right: 15px; + margin-right: 0px; + margin-left: 10px; + margin-top: 0px; + margin-bottom: 0px; + font-weight: bold; + /*border-left: solid 1px #282738;*/ + } + + #battery { + color: #89b4fa; + } + + #battery.charging { + color: #a6e3a1; + } + + #battery.warning:not(.charging) { + background-color: #f7768e; + color: #f38ba8; + border-radius: 5px 5px 5px 5px; + } + + #backlight { + background-color: #24283b; + color: #db4b4b; + border-radius: 0px 0px 0px 0px; + margin: 5px; + margin-left: 0px; + margin-right: 0px; + padding: 0px 0px; + } + + #network { + color: #f4d9e1; + border-radius: 8px; + margin-right: 5px; + } + + #pulseaudio { + color: #f4d9e1; + border-radius: 8px; + margin-left: 0px; + } + + #pulseaudio.muted { + background: transparent; + color: #928374; + border-radius: 8px; + margin-left: 0px; + } + + #custom-randwall { + color: #f4d9e1; + border-radius: 8px; + margin-right: 0px; + } + + #custom-launcher { + color: #e5809e; + background-color: #45475a; + border-radius: 0px 24px 0px 0px; + margin: 0px 0px 0px 0px; + padding: 0 20px 0 13px; + /*border-right: solid 1px #282738;*/ + font-size: 20px; + } + + #custom-launcher button:hover { + background-color: #FB4934; + color: transparent; + border-radius: 8px; + margin-right: -5px; + margin-left: 10px; +