diff options
Diffstat (limited to 'modules/common')
-rw-r--r-- | modules/common/chromium.nix | 27 | ||||
-rw-r--r-- | modules/common/default.nix | 1 | ||||
-rw-r--r-- | modules/common/emacs/doom/config.el | 8 | ||||
-rw-r--r-- | modules/common/emacs/doom/init.el | 2 | ||||
-rw-r--r-- | modules/common/emacs/doom/packages.el | 8 | ||||
-rw-r--r-- | modules/common/mpv.nix | 2 | ||||
-rw-r--r-- | modules/common/profiles/headful.nix | 1 |
7 files changed, 13 insertions, 36 deletions
diff --git a/modules/common/chromium.nix b/modules/common/chromium.nix deleted file mode 100644 index 4f0ae12..0000000 --- a/modules/common/chromium.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -with lib; let - cfg = config.nixfiles.modules.chromium; -in { - options.nixfiles.modules.chromium.enable = mkEnableOption "Chromium"; - - config = mkIf cfg.enable { - hm = { - home.packages = with pkgs; [profile-cleaner]; - - programs.chromium = { - enable = true; - - package = pkgs.chromium; - - extensions = [ - {id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} # uBlock Origin - ]; - }; - }; - }; -} diff --git a/modules/common/default.nix b/modules/common/default.nix index b722cae..a159a87 100644 --- a/modules/common/default.nix +++ b/modules/common/default.nix @@ -3,7 +3,6 @@ _: { ./alacritty.nix ./aria2.nix ./bat.nix - ./chromium.nix ./common ./curl.nix ./direnv.nix diff --git a/modules/common/emacs/doom/config.el b/modules/common/emacs/doom/config.el index 589b993..d726406 100644 --- a/modules/common/emacs/doom/config.el +++ b/modules/common/emacs/doom/config.el @@ -122,10 +122,10 @@ (setq-hook! 'mu4e-main-mode-hook mu4e-update-interval 60) (setq-hook! 'mu4e-compose-mode-hook sendmail-program (executable-find "msmtp") - send-mail-function #'sendmail-send-it - message-send-mail-function #'message-send-mail-with-sendmail - message-sendmail-extra-arguments '("--read-envelope-from") - message-sendmail-f-is-evil t) + send-mail-function #'sendmail-send-it + message-send-mail-function #'message-send-mail-with-sendmail + message-sendmail-extra-arguments '("--read-envelope-from") + message-sendmail-f-is-evil t) ;; ;;; Circe diff --git a/modules/common/emacs/doom/init.el b/modules/common/emacs/doom/init.el index 764c25e..b0a7f4a 100644 --- a/modules/common/emacs/doom/init.el +++ b/modules/common/emacs/doom/init.el @@ -90,7 +90,7 @@ (kotlin +lsp +tree-sitter) (latex +lsp +tree-sittter) (markdown +lsp +tree-sitter) - (nix +lsp) + (nix +lsp +tree-sitter) (org +pandoc +roam2) plantuml (python +lsp +tree-sitter) diff --git a/modules/common/emacs/doom/packages.el b/modules/common/emacs/doom/packages.el index 5df21b6..a8e52eb 100644 --- a/modules/common/emacs/doom/packages.el +++ b/modules/common/emacs/doom/packages.el @@ -1,6 +1,5 @@ (disable-packages! writegood-mode) -(unpin! org-roam) (package! org-roam :recipe (:host github :repo "org-roam/org-roam" @@ -10,7 +9,12 @@ :repo "org-roam/org-roam-ui" :branch "main")) -;; (package! hledger-mode) +(package! tree-sitter + :recipe (:host github + :repo "azahi/elisp-tree-sitter" + :branch "master")) + +(package! hledger-mode) (package! kubernetes) (package! kubernetes-evil) diff --git a/modules/common/mpv.nix b/modules/common/mpv.nix index afab1dd..0421d62 100644 --- a/modules/common/mpv.nix +++ b/modules/common/mpv.nix @@ -46,7 +46,7 @@ in { }; config = let - lang = comcat [ + lang = concatStringsSep "," [ "Japanese" "japanese" "jp" diff --git a/modules/common/profiles/headful.nix b/modules/common/profiles/headful.nix index e5490b5..f51ecc8 100644 --- a/modules/common/profiles/headful.nix +++ b/modules/common/profiles/headful.nix @@ -36,6 +36,7 @@ in { ripgrep ripgrep-all sd + tldr ]; }; }; |