From 5c92aab0c7dde0729484f8878a8ebf05e5fc79ab Mon Sep 17 00:00:00 2001 From: azahi Date: Mon, 21 Oct 2024 14:22:29 +0300 Subject: 2024-10-21 --- modules/emacs/default.nix | 17 ++++++++---- modules/emacs/doom/config.el | 8 +----- modules/emacs/doom/init.el | 21 +++++++++++--- modules/emacs/doom/packages.el | 10 ++++--- modules/firefox/addons.json | 3 ++ modules/firefox/addons.nix | 62 ++++++++++++++++++++++++++++++------------ modules/firefox/default.nix | 1 + modules/games/steam.nix | 2 +- modules/ipfs.nix | 5 ++++ modules/murmur.nix | 8 ++++++ 10 files changed, 98 insertions(+), 39 deletions(-) (limited to 'modules') diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix index a182d4c..455f710 100644 --- a/modules/emacs/default.nix +++ b/modules/emacs/default.nix @@ -61,11 +61,11 @@ in if [[ -x "$EMACSDIR/bin/doom" ]]; then if [[ ! -d "$EMACSDIR/.local" ]]; then PATH="''${PATH:-/bin}:${emacs.package}/bin:${git.package}/bin" \ - "$EMACSDIR/bin/doom" install --force --verbose + "$EMACSDIR/bin/doom" install --aot --force --verbose fi PATH="''${PATH:-/bin:}:${emacs.package}/bin:${git.package}/bin" \ - "$EMACSDIR/bin/doom" sync -e --gc --force --verbose + "$EMACSDIR/bin/doom" sync -e --gc --aot --force --verbose fi ''; } @@ -166,17 +166,24 @@ in (setq exec-path (append exec-path '(${concatMapStringsSep " " (x: ''"${x}/bin"'') extraBins}))) (setenv "PATH" (concat (getenv "PATH") ":${concatMapStringsSep ":" (x: "${x}/bin") extraBins}")) + (appendq! auth-sources '(("${config.secrets.authinfo.path}"))) + ;; HACK Explicitly load specific Emacs packages from Nixpkgs. ;; For some reason providing them as "extraPackages" doesn't ;; work. (add-to-list 'load-path "${pkgs.mu.mu4e}/share/emacs/site-lisp/mu4e") (add-to-list 'load-path "${pkgs.emacsPackages.vterm}/share/emacs/site-lisp/elpa/vterm-${pkgs.emacsPackages.vterm.version}") - - (appendq! auth-sources '(("${config.secrets.authinfo.path}"))) + (load "${ + pkgs.fetchurl { + name = "tvl.el"; + url = "https://code.tvl.fyi/plain/tools/emacs-pkgs/tvl/tvl.el?id=84a82f6f41b422f7f76e44e3705ee509b6c6eaf6"; + hash = "sha256-vJsV7w4aMV9Y9zbXLHMIR53xAsXdUVBIXrxUTjdvty0="; + } + }") ;; :input japanese (setq migemo-dictionary "${pkgs.cmigemo}/share/migemo/utf-8/migemo-dict" - skk-large-jisyo "${pkgs.skk-dicts}/share/SKK-JISYO.L") + skk-large-jisyo "${pkgs.skkDictionaries.l}/share/skk/SKK-JISYO.L") ;; :editor parinfer (setq parinfer-rust-library "${pkgs.parinfer-rust-emacs}/lib/libparinfer_rust.so") diff --git a/modules/emacs/doom/config.el b/modules/emacs/doom/config.el index fe3b5b4..85fe4a9 100644 --- a/modules/emacs/doom/config.el +++ b/modules/emacs/doom/config.el @@ -32,12 +32,6 @@ doom-modeline-total-line-number t doom-modeline-height 30) -;; -;;; TVL -;; - -(use-package! tvl) - ;; ;;; Editorconfig ;; @@ -87,7 +81,7 @@ ;;; Org ;; -(setq org-directory "~/doc/org/") +(setq! org-directory "~/doc/org/") ;; For some reason only using `after!' work here. `setq-hook!' and etc doesn't ;; produce expected results. diff --git a/modules/emacs/doom/init.el b/modules/emacs/doom/init.el index b031880..8575c3f 100644 --- a/modules/emacs/doom/init.el +++ b/modules/emacs/doom/init.el @@ -2,10 +2,12 @@ japanese :completion - company + ;; company + (corfu +icons +orderless +dabbrev) vertico :ui + deft doom (emoji +unicode) hl-todo @@ -23,14 +25,19 @@ (evil +everywhere) file-templates fold - format + (format +onsave) + lispy + ;; multiple-cursors + ;; objed parinfer + ;; rotate-text snippets word-wrap :emacs dired electric + eww ibuffer undo vc @@ -41,7 +48,7 @@ :checkers syntax - (spell +aspell +everywhere) + (spell +everywhere +icons) grammar :tools @@ -57,12 +64,12 @@ make (pass +auth) pdf + prodigy (terraform +lsp) tree-sitter upload :os - (:if (featurep :system 'macos) macos) tty :lang @@ -70,6 +77,7 @@ data emacs-lisp (go +lsp +tree-sitter) + (graphql +lsp +tree-sitter) (haskell +lsp +tree-sitter) javascript (json +lsp +tree-sitter) @@ -78,8 +86,12 @@ (nix +lsp +tree-sitter) (org +pandoc +roam2) plantuml + graphviz (python +poetry +pyright +lsp +tree-sitter) + ;; (racket +lsp +tree-sitter +xp +hash-lang) + rest (rust +lsp +tree-sitter) + ;; (scheme +chicken +guile +racket) (sh +lsp +tree-sitter) web (yaml +lsp +tree-sitter) @@ -89,6 +101,7 @@ :app calendar + emms irc (rss +org) diff --git a/modules/emacs/doom/packages.el b/modules/emacs/doom/packages.el index 0f908df..fb521bc 100644 --- a/modules/emacs/doom/packages.el +++ b/modules/emacs/doom/packages.el @@ -2,6 +2,8 @@ (unpin! (:editor parinfer)) +(unpin! evil-collection) + (package! xclip) (package! org-roam-ui) @@ -19,7 +21,7 @@ :recipe (:host gitlab :repo "emacs-ansible/emacs-ansible")) -(package! tvl - :recipe (:host nil - :repo "https://code.tvl.fyi/depot.git:/tools/emacs-pkgs/tvl.git" - :build nil)) +;; (package! tvl +;; :recipe (:host nil +;; :repo "https://code.tvl.fyi/depot.git:/tools/emacs-pkgs/tvl.git" +;; :build nil)) diff --git a/modules/firefox/addons.json b/modules/firefox/addons.json index c1ea3fa..5c6a090 100644 --- a/modules/firefox/addons.json +++ b/modules/firefox/addons.json @@ -40,5 +40,8 @@ }, { "slug": "violentmonkey" + }, + { + "slug": "switchyomega" } ] diff --git a/modules/firefox/addons.nix b/modules/firefox/addons.nix index 753a413..e416a3f 100644 --- a/modules/firefox/addons.nix +++ b/modules/firefox/addons.nix @@ -5,10 +5,10 @@ { "bitwarden" = buildFirefoxXpiAddon { pname = "bitwarden"; - version = "2024.9.0"; + version = "2024.10.0"; addonId = "{446900e4-71c2-419f-a6a7-df9c091e268b}"; - url = "https://addons.mozilla.org/firefox/downloads/file/4350677/bitwarden_password_manager-2024.9.0.xpi"; - sha256 = "8c8b97b445fe65cbdd91eda4bd07e8946d6c1b21ac89c771205a3b9225e2ef12"; + url = "https://addons.mozilla.org/firefox/downloads/file/4363548/bitwarden_password_manager-2024.10.0.xpi"; + sha256 = "9ea9428444870a74ae1999d77eb12d97a45275c85e83d6afdcbc4597fa3eccfb"; meta = with lib; { homepage = "https://bitwarden.com"; description = "At home, at work, or on the go, Bitwarden easily secures all your passwords, passkeys, and sensitive information."; @@ -35,10 +35,10 @@ }; "consent-o-matic" = buildFirefoxXpiAddon { pname = "consent-o-matic"; - version = "1.1.0"; + version = "1.1.3"; addonId = "gdpr@cavi.au.dk"; - url = "https://addons.mozilla.org/firefox/downloads/file/4298698/consent_o_matic-1.1.0.xpi"; - sha256 = "c23631cdf746fcf2896e99ba0dbc6192bd92c24275d05b0802dc7d7038b4815a"; + url = "https://addons.mozilla.org/firefox/downloads/file/4362793/consent_o_matic-1.1.3.xpi"; + sha256 = "a3ca5c64ac50376366beb4cce610d0af80e687c8c6a8c21a107c6118059896f8"; meta = with lib; { homepage = "https://consentomatic.au.dk/"; description = "Automatic handling of GDPR consent forms"; @@ -54,10 +54,10 @@ }; "darkreader" = buildFirefoxXpiAddon { pname = "darkreader"; - version = "4.9.92"; + version = "4.9.94"; addonId = "addon@darkreader.org"; - url = "https://addons.mozilla.org/firefox/downloads/file/4351387/darkreader-4.9.92.xpi"; - sha256 = "be55b3ea5bab95743d43823d9290fa820035b89c4d07943b568111d837a98226"; + url = "https://addons.mozilla.org/firefox/downloads/file/4359254/darkreader-4.9.94.xpi"; + sha256 = "251c4e7d0a30c0cab006803600e59ab92dcc0c606429740d42677846d4c9ccd6"; meta = with lib; { homepage = "https://darkreader.org/"; description = "Dark mode for every website. Take care of your eyes, use dark theme for night and daily browsing."; @@ -187,10 +187,10 @@ }; "rikaichamp" = buildFirefoxXpiAddon { pname = "rikaichamp"; - version = "1.20.0"; + version = "1.21.1"; addonId = "{59812185-ea92-4cca-8ab7-cfcacee81281}"; - url = "https://addons.mozilla.org/firefox/downloads/file/4325631/10ten_ja_reader-1.20.0.xpi"; - sha256 = "25215fe0211f2e01b5f7b75a3311214eb647999e48e4a77268e36e5ccc4efbd2"; + url = "https://addons.mozilla.org/firefox/downloads/file/4355635/10ten_ja_reader-1.21.1.xpi"; + sha256 = "81d85cfdc03cb0c921cac84547e7a7a539af11ff9a81dd901b3f3bfa67ba45f1"; meta = with lib; { homepage = "https://github.com/birchill/10ten-ja-reader/"; description = "Quickly translate Japanese by hovering over words. Formerly released as Rikaichamp."; @@ -230,12 +230,38 @@ platforms = platforms.all; }; }; + "switchyomega" = buildFirefoxXpiAddon { + pname = "switchyomega"; + version = "2.5.10"; + addonId = "switchyomega@feliscatus.addons.mozilla.org"; + url = "https://addons.mozilla.org/firefox/downloads/file/848109/switchyomega-2.5.10.xpi"; + sha256 = "dfefc2da59eeb2e92a32fc75fb05426feeea4c39ee01b7a797395ed29ed7cf77"; + meta = with lib; { + homepage = "https://github.com/FelisCatus/SwitchyOmega"; + description = "Manage and switch between multiple proxies quickly & easily."; + license = licenses.gpl3; + mozPermissions = [ + "proxy" + "tabs" + "alarms" + "storage" + "webRequest" + "downloads" + "webRequestBlocking" + "contextMenus" + "http://*/*" + "https://*/*" + "" + ]; + platforms = platforms.all; + }; + }; "ublock-origin" = buildFirefoxXpiAddon { pname = "ublock-origin"; - version = "1.59.0"; + version = "1.60.0"; addonId = "uBlock0@raymondhill.net"; - url = "https://addons.mozilla.org/firefox/downloads/file/4328681/ublock_origin-1.59.0.xpi"; - sha256 = "1db9c676a07d141f8d36dbbc24f9e3d64a6cc2340dbfc6c848bc4395f96cfb14"; + url = "https://addons.mozilla.org/firefox/downloads/file/4359936/ublock_origin-1.60.0.xpi"; + sha256 = "e2cda9b2a1b0a7f6e5ef0da9f87f28df52f8560587ba2e51a3003121cfb81600"; meta = with lib; { homepage = "https://github.com/gorhill/uBlock#ublock-origin"; description = "Finally, an efficient wide-spectrum content blocker. Easy on CPU and memory."; @@ -292,10 +318,10 @@ }; "violentmonkey" = buildFirefoxXpiAddon { pname = "violentmonkey"; - version = "2.23.0"; + version = "2.26.0"; addonId = "{aecec67f-0d10-4fa7-b7c7-609a2db280cf}"; - url = "https://addons.mozilla.org/firefox/downloads/file/4352761/violentmonkey-2.23.0.xpi"; - sha256 = "b3eadf855b6093376590aa63ae05933c5812e9515c9acf558550a4f2c78ab49b"; + url = "https://addons.mozilla.org/firefox/downloads/file/4362578/violentmonkey-2.26.0.xpi"; + sha256 = "47b61fd463602a38bf67591ab94c60d3f1a02ad4f81b9a8a3de97d5461b2e12e"; meta = with lib; { homepage = "https://violentmonkey.github.io/"; description = "Userscript support for browsers, open source."; diff --git a/modules/firefox/default.nix b/modules/firefox/default.nix index c694a7f..b7e47b6 100644 --- a/modules/firefox/default.nix +++ b/modules/firefox/default.nix @@ -131,6 +131,7 @@ in redirector rikaichamp skip-redirect + switchyomega ublock-origin user-agent-switcher violentmonkey diff --git a/modules/games/steam.nix b/modules/games/steam.nix index 23b4f14..d1da8ee 100644 --- a/modules/games/steam.nix +++ b/modules/games/steam.nix @@ -15,8 +15,8 @@ in nixfiles.modules = { common.nix.allowedUnfreePackages = [ "steam" - "steam-original" "steam-run" + "steam-unwrapped" ]; games = { diff --git a/modules/ipfs.nix b/modules/ipfs.nix index 1e1d23f..25f7fce 100644 --- a/modules/ipfs.nix +++ b/modules/ipfs.nix @@ -144,6 +144,11 @@ in allowedUDPPorts = allowedTCPPorts; }; + boot.kernel.sysctl = { + "net.core.rmem_max" = 7500000; + "net.core.wmem_max" = 7500000; + }; + topology = with cfg; { nodes.${this.hostname}.services.ipfs-kubo = { name = "IPFS Kubo"; diff --git a/modules/murmur.nix b/modules/murmur.nix index 7621c9e..d334015 100644 --- a/modules/murmur.nix +++ b/modules/murmur.nix @@ -22,10 +22,18 @@ in services.murmur = { enable = true; + openFirewall = true; + logDays = -1; + registerName = mkDefault my.domain.shire; + registerHostname = mkDefault my.domain.shire; + + bandwidth = 256000; + password = "$MURMUR_PASSWORD"; + environmentFile = config.secrets."murmur-environment".path; }; }; -- cgit 1.4.1